Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add #if CHIP_HAVE_CONFIG around *BuildConfig headers #21196

Merged
merged 1 commit into from
Jul 26, 2022
Merged

Add #if CHIP_HAVE_CONFIG around *BuildConfig headers #21196

merged 1 commit into from
Jul 26, 2022

Conversation

woody-apple
Copy link
Contributor

find ./ -name ".h" -o -name ".cpp" -exec sed -i "s/(#include <app/AppBuildConfig.h>)/#if CHIP_HAVE_CONFIG_H\n\1\n#endif/g" {} +

Manually for a few instances of CHIPDeviceBuildConfig.h and
CHIPAdditionalDataPayloadBuildConfig.h

@dnicoara @restyled-commits @web-flow
Add #if CHIP_HAVE_CONFIG around *BuildConfig headers (#21169)
d100fd1 
* Add #if CHIP_HAVE_CONFIG around *BuildConfig headers

find ./ -name "*.h" -o -name "*.cpp" -exec sed -i "s/\(#include <app\/AppBuildConfig\.h>\)/#if CHIP_HAVE_CONFIG_H\n\1\n#endif/g" {} +

Manually for a few instances of CHIPDeviceBuildConfig.h and
CHIPAdditionalDataPayloadBuildConfig.h

* Add AppConfig.h and move build config check in there

Reverted #if CHIP_HAVE_CONFIG and replaced includes:
find ./ -name "*.h" -o -name "*.cpp" -exec sed -i "s/\(#include <app\/AppBuildConfig\.h>\)/#include <app\/AppConfig\.h>/g" {} +

* Restyled by gn

Co-authored-by: Restyled.io <[email protected]>
@github-actions
Copy link

github-actions bot commented Jul 26, 2022 •
edited
Loading

PR #21196: Size comparison from 94a8ead to d100fd1

Increases (4 builds for cc13x2_26x2, esp32, nrfconnect)
platform target config section 94a8ead d100fd1 change % change
cc13x2_26x2 lock-mtd LP_CC2652R7 (read/write) 183688 183696 8 0.0
esp32 all-clusters-app c3devkit (read only) 1022034 1022038 4 0.0
.flash.text 1022034 1022038 4 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 text 812604 812608 4 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 text 801916 801920 4 0.0
Decreases (4 builds for bl602, cc13x2_26x2, telink)
platform target config section 94a8ead d100fd1 change % change
bl602 lighting-app bl602+rpc (read/write) 1425898 1425890 -8 -0.0
.text 1082280 1082276 -4 -0.0
cc13x2_26x2 lock-mtd LP_CC2652R7 (read only) 653519 653511 -8 -0.0
.text 551880 551872 -8 -0.0
telink light-switch-app tlsr9518adk80d text 567080 567078 -2 -0.0
lighting-app tlsr9518adk80d text 583620 583618 -2 -0.0
Full report (43 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 94a8ead d100fd1 change % change
bl602 lighting-app bl602 (read/write) 1380458 1380458 0 0.0
.bss 117474 117474 0 0.0
.data 4480 4480 0 0.0
.text 1050596 1050596 0 0.0
bl602+rpc (read/write) 1425898 1425890 -8 -0.0
.bss 124922 124922 0 0.0
.data 4600 4600 0 0.0
.text 1082280 1082276 -4 -0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 668223 668223 0 0.0
(read/write) 183120 183120 0 0.0
.bss 74236 74236 0 0.0
.data 3356 3356 0 0.0
.rodata 88335 88335 0 0.0
.text 579572 579572 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 633815 633815 0 0.0
(read/write) 157804 157804 0 0.0
.bss 73532 73532 0 0.0
.data 3356 3356 0 0.0
.rodata 77559 77559 0 0.0
.text 555932 555932 0 0.0
lock-ftd LP_CC2652R7 (read only) 671219 671219 0 0.0
(read/write) 170300 170300 0 0.0
.bss 71300 71300 0 0.0
.data 3280 3280 0 0.0
.rodata 76419 76419 0 0.0
.text 594320 594320 0 0.0
lock-mtd LP_CC2652R7 (read only) 653519 653511 -8 -0.0
(read/write) 183688 183696 8 0.0
.bss 66988 66988 0 0.0
.data 3280 3280 0 0.0
.rodata 101159 101159 0 0.0
.text 551880 551872 -8 -0.0
pump-app LP_CC2652R7 (read only) 680743 680743 0 0.0
(read/write) 161632 161632 0 0.0
.bss 71388 71388 0 0.0
.data 3280 3280 0 0.0
.rodata 89039 89039 0 0.0
.text 591220 591220 0 0.0
pump-controller-app LP_CC2652R7 (read only) 666495 666495 0 0.0
(read/write) 176000 176000 0 0.0
.bss 71508 71508 0 0.0
.data 3276 3276 0 0.0
.rodata 84871 84871 0 0.0
.text 581144 581144 0 0.0
shell LP_CC2652R7 (read only) 660706 660706 0 0.0
(read/write) 186140 186140 0 0.0
.bss 76540 76540 0 0.0
.data 3360 3360 0 0.0
.rodata 85114 85114 0 0.0
.text 575276 575276 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 582946 582946 0 0.0
.app_xip_area 460288 460288 0 0.0
.bss 65596 65596 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 588854 588854 0 0.0
.app_xip_area 461468 461468 0 0.0
.bss 70324 70324 0 0.0
.data 720 720 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 587158 587158 0 0.0
.app_xip_area 465348 465348 0 0.0
.bss 64804 64804 0 0.0
.data 660 660 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1087344 1087344 0 0.0
.bss 133220 133220 0 0.0
.data 2048 2048 0 0.0
.text 952056 952056 0 0.0
BRD4161A+rpc (read/write) 1141668 1141668 0 0.0
.bss 149892 149892 0 0.0
.data 2260 2260 0 0.0
.text 989492 989492 0 0.0
BRD4161A+rs911x (read/write) 972524 972524 0 0.0
.bss 161664 161664 0 0.0
.data 2048 2048 0 0.0
.text 808792 808792 0 0.0
lock-app BRD4161A+wf200 (read/write) 1127904 1127904 0 0.0
.bss 144304 144304 0 0.0
.data 2056 2056 0 0.0
.text 981524 981524 0 0.0
window-app BRD4161A (read/write) 1080828 1080828 0 0.0
.bss 134692 134692 0 0.0
.data 2076 2076 0 0.0
.text 944040 944040 0 0.0
esp32 all-clusters-app c3devkit (read only) 1022034 1022038 4 0.0
(read/write) 1486362 1486362 0 0.0
.dram0.bss 70224 70224 0 0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 216104 216104 0 0.0
.flash.text 1022034 1022038 4 0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1075667 1075667 0 0.0
(read/write) 488392 488392 0 0.0
.dram0.bss 75744 75744 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 246508 246508 0 0.0
.flash.text 1070283 1070283 0 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w0+release (read/write) 641408 641408 0 0.0
.bss 69696 69696 0 0.0
.data 2028 2028 0 0.0
.text 566956 566956 0 0.0
lock k32w0+release (read/write) 698520 698520 0 0.0
.bss 70144 70144 0 0.0
.data 2036 2036 0 0.0
.text 623612 623612 0 0.0
linux all-clusters-app debug (read only) 2980617 2980617 0 0.0
(read/write) 155344 155344 0 0.0
.bss 61792 61792 0 0.0
.data 2064 2064 0 0.0
.data.rel.ro 85224 85224 0 0.0
.dynamic 608 608 0 0.0
.got 4568 4568 0 0.0
.init 27 27 0 0.0
.init_array 1064 1064 0 0.0
.rodata 265931 265931 0 0.0
.text 2536546 2536546 0 0.0
all-clusters-minimal-app debug (read only) 2826545 2826545 0 0.0
(read/write) 147016 147016 0 0.0
.bss 60992 60992 0 0.0
.data 2064 2064 0 0.0
.data.rel.ro 77784 77784 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 1056 1056 0 0.0
.rodata 266827 266827 0 0.0
.text 2384258 2384258 0 0.0
bridge-app debug+rpc (read only) 2340865 2340865 0 0.0
(read/write) 126920 126920 0 0.0
.bss 50080 50080 0 0.0
.data 3824 3824 0 0.0
.data.rel.ro 67240 67240 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 736 736 0 0.0
.rodata 199240 199240 0 0.0
.text 1979314 1979314 0 0.0
chip-tool debug (read only) 10364329 10364329 0 0.0
(read/write) 632872 632872 0 0.0
.bss 24760 24760 0 0.0
.data 3266 3266 0 0.0
.data.rel.ro 598440 598440 0 0.0
.dynamic 608 608 0 0.0
.got 5088 5088 0 0.0
.init 27 27 0 0.0
.init_array 648 648 0 0.0
.rodata 522645 522645 0 0.0
.text 8385860 8385860 0 0.0
chip-tool-ipv6only arm64 (read only) 9792972 9792972 0 0.0
(read/write) 680401 680401 0 0.0
.bss 32833 32833 0 0.0
.data 3272 3272 0 0.0
.data.rel.ro 625776 625776 0 0.0
.dynamic 560 560 0 0.0
.got 13560 13560 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 458412 458412 0 0.0
.text 7747908 7747908 0 0.0
lighting-app debug+rpc (read only) 2564001 2564001 0 0.0
(read/write) 129888 129888 0 0.0
.bss 49632 49632 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 72296 72296 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 824 824 0 0.0
.rodata 214832 214832 0 0.0
.text 2178770 2178770 0 0.0
lock-app debug (read only) 2529041 2529041 0 0.0
(read/write) 124872 124872 0 0.0
.bss 48032 48032 0 0.0
.data 1712 1712 0 0.0
.data.rel.ro 69272 69272 0 0.0
.dynamic 608 608 0 0.0
.got 4424 4424 0 0.0
.init 27 27 0 0.0
.init_array 800 800 0 0.0
.rodata 229904 229904 0 0.0
.text 2133538 2133538 0 0.0
ota-provider-app debug (read only) 2332657 2332657 0 0.0
(read/write) 118672 118672 0 0.0
.bss 47680 47680 0 0.0
.data 1936 1936 0 0.0
.data.rel.ro 63256 63256 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 680 680 0 0.0
.rodata 204728 204728 0 0.0
.text 1964722 1964722 0 0.0
ota-requestor-app debug (read only) 2451081 2451081 0 0.0
(read/write) 125576 125576 0 0.0
.bss 50016 50016 0 0.0
.data 2240 2240 0 0.0
.data.rel.ro 67480 67480 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 736 736 0 0.0
.rodata 208416 208416 0 0.0
.text 2071058 2071058 0 0.0
shell debug (read only) 2567273 2567273 0 0.0
(read/write) 141400 141400 0 0.0
.bss 57608 57608 0 0.0
.data 1248 1248 0 0.0
.data.rel.ro 76856 76856 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 936 936 0 0.0
.rodata 229266 229266 0 0.0
.text 2180450 2180450 0 0.0
thermostat-no-ble arm64 (read only) 2340764 2340764 0 0.0
(read/write) 141249 141249 0 0.0
.bss 55233 55233 0 0.0
.data 1672 1672 0 0.0
.data.rel.ro 75592 75592 0 0.0
.dynamic 560 560 0 0.0
.got 4984 4984 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 139412 139412 0 0.0
.text 1964544 1964544 0 0.0
tv-app debug (read only) 3114609 3114609 0 0.0
(read/write) 257024 257024 0 0.0
.bss 167064 167064 0 0.0
.data 4736 4736 0 0.0
.data.rel.ro 78792 78792 0 0.0
.dynamic 608 608 0 0.0
.got 4848 4848 0 0.0
.init 27 27 0 0.0
.init_array 960 960 0 0.0
.rodata 250440 250440 0 0.0
.text 2675746 2675746 0 0.0
tv-casting-app debug (read only) 5368353 5368353 0 0.0
(read/write) 158328 158328 0 0.0
.bss 51256 51256 0 0.0
.data 2432 2432 0 0.0
.data.rel.ro 98352 98352 0 0.0
.dynamic 608 608 0 0.0
.got 4736 4736 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 334625 334625 0 0.0
.text 4767202 4767202 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2448936 2448936 0 0.0
.bss 214444 214444 0 0.0
.data 5872 5872 0 0.0
.text 1411580 1411580 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1177055 1177055 0 0.0
bss 143068 143068 0 0.0
rodata 142520 142520 0 0.0
text 812604 812608 4 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1157107 1157107 0 0.0
bss 142304 142304 0 0.0
rodata 134052 134052 0 0.0
text 801916 801920 4 0.0
p6 all-clusters-app default (read only) 881632 881632 0 0.0
(read/write) 1686652 1686652 0 0.0
.bss 149064 149064 0 0.0
.data 2648 2648 0 0.0
.text 1526552 1526552 0 0.0
all-clusters-minimal-app default (read only) 882352 882352 0 0.0
(read/write) 1630756 1630756 0 0.0
.bss 148344 148344 0 0.0
.data 2648 2648 0 0.0
.text 1471376 1471376 0 0.0
light-app default (read only) 890656 890656 0 0.0
(read/write) 1550636 1550636 0 0.0
.bss 140248 140248 0 0.0
.data 2440 2440 0 0.0
.text 1399560 1399560 0 0.0
lock-app default (read only) 886184 886184 0 0.0
(read/write) 1588236 1588236 0 0.0
.bss 144704 144704 0 0.0
.data 2456 2456 0 0.0
.text 1432688 1432688 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 799328 799328 0 0.0
bss 70744 70744 0 0.0
noinit 40416 40416 0 0.0
text 567080 567078 -2 -0.0
lighting-app tlsr9518adk80d (read/write) 819404 819404 0 0.0
bss 71588 71588 0 0.0
noinit 40416 40416 0 0.0
text 583620 583618 -2 -0.0

@woody-apple woody-apple merged commit 4db4f77 into sve Jul 26, 2022
@woody-apple woody-apple deleted the cherry-pick-641e3adf74fe7365d63152202709296cdc2e22b7 branch July 26, 2022 05:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
sve cherry pick
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@woody-apple @dnicoara