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.

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

SimpleSubscriptionResumptionStorage should be made conditionally compiled in GN #24653

Conversation

jtung-apple
Copy link
Contributor

Fixes #24564 per @andy31415 's request.

Changes:

  • Add the declaration of gn variable chip_persist_subscriptions to src/platform/device.gni
  • Move the CHIP_CONFIG_PERSIST_SUBSCRIPTIONS define to src/app/BUILD.gn
  • Conditionally have src/app/BUILD.gn and src/app/tests/BUILD.gn add the SimpleSubscriptionResumptionStorage source / test test files depending on chip_persist_subscriptions

@github-actions
Copy link

github-actions bot commented Jan 25, 2023

PR #24653: Size comparison from 14dada3 to 742f700

Increases (13 builds for bl602, bl702, nrfconnect, psoc6, qpg, telink)
platform target config section 14dada3 742f700 change % change
bl602 lighting-app bl602 (read/write) 1345482 1345490 8 0.0
.text 1022520 1022522 2 0.0
bl602+rpc .text 1053452 1053456 4 0.0
bl702 lighting-app bl702 .debug_info 40190809 40190968 159 0.0
bl702+rpc .debug_info 44587089 44587262 173 0.0
.text 1029342 1029344 2 0.0
nrfconnect all-clusters-app nrf7002dk_nrf5340_cpuapp text 763564 763568 4 0.0
psoc6 all-clusters cy8ckit_062s2_43012 .debug_info 27465101 27465272 171 0.0
all-clusters-minimal cy8ckit_062s2_43012 .debug_info 27022865 27023023 158 0.0
light cy8ckit_062s2_43012 .debug_info 22483781 22483928 147 0.0
lock cy8ckit_062s2_43012 .debug_info 22704397 22704558 161 0.0
.debug_loc 3357990 3357991 1 0.0
qpg lock-app qpg6105+debug (read/write) 1115984 1115992 8 0.0
.text 563080 563088 8 0.0
telink all-clusters-app tlsr9518adk80d (read/write) 1026608 1026616 8 0.0
text 688796 688798 2 0.0
all-clusters-minimal-app tlsr9518adk80d text 652282 652284 2 0.0
ota-requestor-app tlsr9518adk80d text 608286 608288 2 0.0
Decreases (7 builds for bl702, nrfconnect, psoc6, telink)
platform target config section 14dada3 742f700 change % change
bl702 lighting-app bl702 (read/write) 1184951 1184935 -16 -0.0
.text 952354 952352 -2 -0.0
bl702+rpc .debug_loc 3597945 3597931 -14 -0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 text 804400 804396 -4 -0.0
psoc6 all-clusters-minimal cy8ckit_062s2_43012 .debug_loc 3635394 3635393 -1 -0.0
telink contact-sensor-app tlsr9518adk80d text 582576 582574 -2 -0.0
light-switch-app tlsr9518adk80d text 597178 597176 -2 -0.0
thermostat tlsr9518adk80d text 597938 597936 -2 -0.0
Full report (43 builds for bl602, bl702, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
platform target config section 14dada3 742f700 change % change
bl602 lighting-app bl602 (read/write) 1345482 1345490 8 0.0
.bss 94858 94858 0 0.0
.data 9736 9736 0 0.0
.text 1022520 1022522 2 0.0
bl602+rpc (read/write) 1390930 1390930 0 0.0
.bss 102906 102906 0 0.0
.data 10128 10128 0 0.0
.text 1053452 1053456 4 0.0
bl702 lighting-app bl702 (read only) 3358 3358 0 0.0
(read/write) 1184951 1184935 -16 -0.0
.bleromro 6342 6342 0 0.0
.bleromrw 124 124 0 0.0
.boot2 292 292 0 0.0
.bss 70701 70701 0 0.0
.bss_psram 30048 30048 0 0.0
.comment 48 48 0 0.0
.data 4056 4056 0 0.0
.debug_abbrev 1549734 1549734 0 0.0
.debug_aranges 134056 134056 0 0.0
.debug_frame 491000 491000 0 0.0
.debug_info 40190809 40190968 159 0.0
.debug_line 5266055 5266055 0 0.0
.debug_loc 3401794 3401794 0 0.0
.debug_ranges 371904 371904 0 0.0
.debug_str 3535090 3535090 0 0.0
.hbn 536 536 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 144 144 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 106704 106704 0 0.0
.rsvd 2960 2960 0 0.0
.sha_ocram 72 72 0 0.0
.shstrtab 304 304 0 0.0
.stack 2048 2048 0 0.0
.strtab 571662 571662 0 0.0
.symtab 173168 173168 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3358 3358 0 0.0
.text 0 0 0 0.0
952354 952352 -2 -0.0
bl702+rpc (read only) 3358 3358 0 0.0
(read/write) 1277579 1277579 0 0.0
.bleromro 6342 6342 0 0.0
.bleromrw 124 124 0 0.0
.boot2 292 292 0 0.0
.bss 78749 78749 0 0.0
.bss_psram 30304 30304 0 0.0
.comment 48 48 0 0.0
.data 4608 4608 0 0.0
.debug_abbrev 1698172 1698172 0 0.0
.debug_aranges 142280 142280 0 0.0
.debug_frame 518704 518704 0 0.0
.debug_info 44587089 44587262 173 0.0
.debug_line 5664380 5664380 0 0.0
.debug_loc 3597945 3597931 -14 -0.0
.debug_ranges 395608 395608 0 0.0
.debug_str 3938399 3938399 0 0.0
.hbn 536 536 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 160 160 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 121232 121232 0 0.0
.rsvd 2960 2960 0 0.0
.sha_ocram 72 72 0 0.0
.shstrtab 304 304 0 0.0
.stack 2048 2048 0 0.0
.strtab 632259 632259 0 0.0
.symtab 191520 191520 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3358 3358 0 0.0
.text 0 0 0 0.0
1029342 1029344 2 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 677223 677223 0 0.0
(read/write) 174632 174632 0 0.0
.bss 81548 81548 0 0.0
.data 3384 3384 0 0.0
.rodata 87471 87471 0 0.0
.text 589440 589440 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 640847 640847 0 0.0
(read/write) 158240 158240 0 0.0
.bss 80740 80740 0 0.0
.data 3384 3384 0 0.0
.rodata 77423 77423 0 0.0
.text 563100 563100 0 0.0
lock-ftd LP_CC2652R7 (read only) 674347 674347 0 0.0
(read/write) 174980 174980 0 0.0
.bss 79108 79108 0 0.0
.data 3312 3312 0 0.0
.rodata 76267 76267 0 0.0
.text 597600 597600 0 0.0
lock-mtd LP_CC2652R7 (read only) 660663 660663 0 0.0
(read/write) 183928 183928 0 0.0
.bss 74372 74372 0 0.0
.data 3312 3312 0 0.0
.rodata 102735 102735 0 0.0
.text 557448 557448 0 0.0
pump-app LP_CC2652R7 (read only) 687379 687379 0 0.0
(read/write) 162676 162676 0 0.0
.bss 79068 79068 0 0.0
.data 3276 3276 0 0.0
.rodata 90395 90395 0 0.0
.text 596504 596504 0 0.0
pump-controller-app LP_CC2652R7 (read only) 672811 672811 0 0.0
(read/write) 177356 177356 0 0.0
.bss 79180 79180 0 0.0
.data 3300 3300 0 0.0
.rodata 86475 86475 0 0.0
.text 585856 585856 0 0.0
shell LP_CC2652R7 (read only) 668494 668494 0 0.0
(read/write) 185432 185432 0 0.0
.bss 83620 83620 0 0.0
.data 3380 3380 0 0.0
.rodata 84206 84206 0 0.0
.text 583972 583972 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 585402 585402 0 0.0
.app_xip_area 461420 461420 0 0.0
.bss 66432 66432 0 0.0
.data 736 736 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 589118 589118 0 0.0
.app_xip_area 459840 459840 0 0.0
.bss 71720 71720 0 0.0
.data 744 744 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 550766 550766 0 0.0
.app_xip_area 432272 432272 0 0.0
.bss 60984 60984 0 0.0
.data 692 692 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A+rpc (read/write) 974096 974096 0 0.0
.bss 147152 147152 0 0.0
.data 2196 2196 0 0.0
.text 824728 824728 0 0.0
BRD4161A+rs911x (read/write) 1037116 1037116 0 0.0
.bss 181632 181632 0 0.0
.data 2040 2040 0 0.0
.text 853424 853424 0 0.0
BRD4187C (read/write) 1151248 1151248 0 0.0
.bss 133652 133652 0 0.0
.data 2544 2544 0 0.0
.text 990456 990456 0 0.0
lock-app BRD4161A+wf200 (read/write) 1064740 1064740 0 0.0
.bss 153152 153152 0 0.0
.data 2048 2048 0 0.0
.text 909520 909520 0 0.0
window-app BRD4187C (read/write) 1143940 1143940 0 0.0
.bss 135068 135068 0 0.0
.data 2568 2568 0 0.0
.text 981708 981708 0 0.0
esp32 all-clusters-app c3devkit (read only) 1041532 1041532 0 0.0
(read/write) 1515938 1515938 0 0.0
.dram0.bss 75904 75904 0 0.0
.dram0.data 13792 13792 0 0.0
.flash.rodata 220024 220024 0 0.0
.flash.text 1041532 1041532 0 0.0
.iram0.text 72896 72896 0 0.0
m5stack (read only) 1093751 1093751 0 0.0
(read/write) 497599 497599 0 0.0
.dram0.bss 80952 80952 0 0.0
.dram0.data 34072 34072 0 0.0
.flash.rodata 248804 248804 0 0.0
.flash.text 1088367 1088367 0 0.0
.iram0.text 124855 124855 0 0.0
k32w contact k32w0+release (read/write) 660908 660908 0 0.0
.bss 77360 77360 0 0.0
.data 2112 2112 0 0.0
.text 562324 562324 0 0.0
light k32w0+release (read/write) 672820 672820 0 0.0
.bss 75144 75144 0 0.0
.data 2064 2064 0 0.0
.text 592884 592884 0 0.0
lock k32w0+release (read/write) 632288 632288 0 0.0
.bss 75912 75912 0 0.0
.data 2084 2084 0 0.0
.text 551564 551564 0 0.0
linux chip-tool-ipv6only arm64 (read only) 10984620 10984620 0 0.0
(read/write) 698024 698024 0 0.0
.bss 34248 34248 0 0.0
.data 3008 3008 0 0.0
.data.rel.ro 641448 641448 0 0.0
.dynamic 560 560 0 0.0
.got 14120 14120 0 0.0
.init 24 24 0 0.0
.init_array 208 208 0 0.0
.rodata 570732 570732 0 0.0
.text 8761188 8761188 0 0.0
thermostat-no-ble arm64 (read only) 2503556 2503556 0 0.0
(read/write) 144648 144648 0 0.0
.bss 56456 56456 0 0.0
.data 1824 1824 0 0.0
.data.rel.ro 76944 76944 0 0.0
.dynamic 560 560 0 0.0
.got 5392 5392 0 0.0
.init 24 24 0 0.0
.init_array 432 432 0 0.0
.rodata 150816 150816 0 0.0
.text 2090944 2090944 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2463192 2463192 0 0.0
.bss 215956 215956 0 0.0
.data 5880 5880 0 0.0
.text 1425836 1425836 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1164968 1164968 0 0.0
bss 147118 147118 0 0.0
rodata 133232 133232 0 0.0
text 804400 804396 -4 -0.0
nrf7002dk_nrf5340_cpuapp (read only) 4 4 0 0.0
(read/write) 1366544 1366544 0 0.0
bss 106418 106418 0 0.0
rodata 210720 210720 0 0.0
text 763564 763568 4 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1110692 1110692 0 0.0
bss 146274 146274 0 0.0
rodata 110380 110380 0 0.0
text 773940 773940 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 840944 840944 0 0.0
(read/write) 1749972 1749972 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 189736 189736 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2664 2664 0 0.0
.debug_abbrev 1251009 1251009 0 0.0
.debug_aranges 111256 111256 0 0.0
.debug_frame 373620 373620 0 0.0
.debug_info 27465101 27465272 171 0.0
.debug_line 3766626 3766626 0 0.0
.debug_loc 3651664 3651664 0 0.0
.debug_ranges 357376 357376 0 0.0
.debug_str 3484013 3484013 0 0.0
.heap 840944 840944 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 575760 575760 0 0.0
.symtab 423440 423440 0 0.0
.text 0 0 0 0.0
1549184 1549184 0 0.0
.zero.table 8 8 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 841752 841752 0 0.0
(read/write) 1691372 1691372 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 188928 188928 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2664 2664 0 0.0
.debug_abbrev 1236720 1236720 0 0.0
.debug_aranges 110520 110520 0 0.0
.debug_frame 376064 376064 0 0.0
.debug_info 27022865 27023023 158 0.0
.debug_line 3774912 3774912 0 0.0
.debug_loc 3635394 3635393 -1 -0.0
.debug_ranges 355344 355344 0 0.0
.debug_str 3469766 3469766 0 0.0
.heap 841752 841752 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 536226 536226 0 0.0
.symtab 408432 408432 0 0.0
.text 1491392 1491392 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
light cy8ckit_062s2_43012 (read only) 849944 849944 0 0.0
(read/write) 1611148 1611148 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 180936 180936 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2464 2464 0 0.0
.debug_abbrev 1071778 1071778 0 0.0
.debug_aranges 102800 102800 0 0.0
.debug_frame 346624 346624 0 0.0
.debug_info 22483781 22483928 147 0.0
.debug_line 3339092 3339092 0 0.0
.debug_loc 3336402 3336402 0 0.0
.debug_ranges 319416 319416 0 0.0
.debug_str 3274787 3274787 0 0.0
.heap 849944 849944 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 474042 474042 0 0.0
.symtab 377600 377600 0 0.0
.text 1419360 1419360 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
lock cy8ckit_062s2_43012 (read only) 844960 844960 0 0.0
(read/write) 1645212 1645212 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 185912 185912 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2472 2472 0 0.0
.debug_abbrev 1073126 1073126 0 0.0
.debug_aranges 103184 103184 0 0.0
.debug_frame 348424 348424 0 0.0
.debug_info 22704397 22704558 161 0.0
.debug_line 3340859 3340859 0 0.0
.debug_loc 3357990 3357991 1 0.0
.debug_ranges 321272 321272 0 0.0
.debug_str 3291194 3291194 0 0.0
.heap 844960 844960 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 476977 476977 0 0.0
.symtab 379424 379424 0 0.0
.text 1448440 1448440 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1148304 1148304 0 0.0
.bss 100668 100668 0 0.0
.data 848 848 0 0.0
.text 595404 595404 0 0.0
lock-app qpg6105+debug (read/write) 1115984 1115992 8 0.0
.bss 97188 97188 0 0.0
.data 860 860 0 0.0
.text 563080 563088 8 0.0
telink all-clusters-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 1026608 1026616 8 0.0
bss 98552 98552 0 0.0
text 688796 688798 2 0.0
all-clusters-minimal-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 964972 964972 0 0.0
bss 97696 97696 0 0.0
text 652282 652284 2 0.0
contact-sensor-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 869244 869244 0 0.0
bss 89844 89844 0 0.0
text 582576 582574 -2 -0.0
light-switch-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 885700 885700 0 0.0
bss 89940 89940 0 0.0
text 597178 597176 -2 -0.0
lighting-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 964052 964052 0 0.0
bss 97996 97996 0 0.0
text 663182 663182 0 0.0
ota-requestor-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 899532 899532 0 0.0
bss 90888 90888 0 0.0
text 608286 608288 2 0.0
thermostat tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 888916 888916 0 0.0
bss 91328 91328 0 0.0
text 597938 597936 -2 -0.0

@andy31415 andy31415 merged commit 19cb1a5 into project-chip:master Jan 26, 2023
lecndav pushed a commit to lecndav/connectedhomeip that referenced this pull request Mar 22, 2023
…iled in GN (project-chip#24653)

* SimpleSubscriptionResumptionStorage should be made conditionally compiled in GN

* Restyled fix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] [ICD] SimpleSubscriptionResumptionStorage should be made conditionally compiled in GN
3 participants