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

[Darwin] Update templates to preserve acronyms (e.g ACL) in APIs #22665

Merged

Conversation

vivien-apple
Copy link
Contributor

@vivien-apple vivien-apple commented Sep 15, 2022

Issue Being Resolved

This PR fixes part 2 and 3 from #22545 and it relies on a zap update (notably project-chip/zap#726)

Change overview

  • Update darwin and darwin-framework-tool templates to use the new option from asUpperCamelCase in order to not convert acronyms such as ACL to Acl.
  • Update generated code.

@github-actions
Copy link

github-actions bot commented Sep 15, 2022

PR #22665: Size comparison from 1e66f4b to 2475ae8

Increases (4 builds for cc13x2_26x2, cyw30739, esp32, psoc6)
platform target config section 1e66f4ba 2475ae8 change % change
cc13x2_26x2 lock-mtd LP_CC2652R7 (read only) 661883 661891 8 0.0
.text 558272 558280 8 0.0
cyw30739 ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 543490 543498 8 0.0
.app_xip_area 425172 425180 8 0.0
esp32 all-clusters-app c3devkit (read only) 1223850 1223854 4 0.0
.flash.text 1223850 1223854 4 0.0
psoc6 all-clusters-minimal cy8ckit_062s2_43012 .debug_info 26550829 26550830 1 0.0
Decreases (10 builds for bl602, bl702, cc13x2_26x2, esp32, psoc6, qpg, telink)
platform target config section 1e66f4ba 2475ae8 change % change
bl602 lighting-app bl602+rpc .text 1099200 1099196 -4 -0.0
bl702 lighting-app bl702+rpc .debug_info 41800589 41800587 -2 -0.0
.text 1030902 1030898 -4 -0.0
cc13x2_26x2 lock-mtd LP_CC2652R7 (read/write) 175540 175532 -8 -0.0
esp32 all-clusters-app c3devkit (read/write) 1788110 1788102 -8 -0.0
.flash.rodata 257664 257656 -8 -0.0
m5stack (read/write) 563996 563988 -8 -0.0
.flash.rodata 314720 314712 -8 -0.0
psoc6 all-clusters cy8ckit_062s2_43012 .debug_info 26813983 26813981 -2 -0.0
lock cy8ckit_062s2_43012 .debug_info 22396460 22396459 -1 -0.0
qpg lighting-app qpg6105+debug (read/write) 1130892 1130884 -8 -0.0
.text 577988 577980 -8 -0.0
telink lighting-app tlsr9518adk80d text 592850 592848 -2 -0.0
ota-requestor-app tlsr9518adk80d (read/write) 843924 843916 -8 -0.0
text 599114 599112 -2 -0.0
Full report (37 builds for bl602, bl702, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
platform target config section 1e66f4ba 2475ae8 change % change
bl602 lighting-app bl602 (read/write) 1412878 1412878 0 0.0
.bss 121585 121585 0 0.0
.data 9824 9824 0 0.0
.text 1067594 1067594 0 0.0
bl602+rpc (read/write) 1458346 1458346 0 0.0
.bss 129017 129017 0 0.0
.data 10208 10208 0 0.0
.text 1099200 1099196 -4 -0.0
bl702 lighting-app bl702 (read only) 3262 3262 0 0.0
(read/write) 1188443 1188443 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 66958 66958 0 0.0
.bss_psram 29696 29696 0 0.0
.comment 48 48 0 0.0
.data 4280 4280 0 0.0
.debug_abbrev 1506733 1506733 0 0.0
.debug_aranges 133072 133072 0 0.0
.debug_frame 486348 486348 0 0.0
.debug_info 37894018 37894018 0 0.0
.debug_line 5253283 5253283 0 0.0
.debug_loc 3363557 3363557 0 0.0
.debug_ranges 360232 360232 0 0.0
.debug_str 3455381 3455381 0 0.0
.hbn 509 509 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 116504 116504 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 564895 564895 0 0.0
.symtab 171616 171616 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
957198 957198 0 0.0
bl702+rpc (read only) 3262 3262 0 0.0
(read/write) 1284371 1284371 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 75006 75006 0 0.0
.bss_psram 29936 29936 0 0.0
.comment 48 48 0 0.0
.data 4800 4800 0 0.0
.debug_abbrev 1644312 1644312 0 0.0
.debug_aranges 140576 140576 0 0.0
.debug_frame 511724 511724 0 0.0
.debug_info 41800589 41800587 -2 -0.0
.debug_line 5627822 5627822 0 0.0
.debug_loc 3556225 3556225 0 0.0
.debug_ranges 382688 382688 0 0.0
.debug_str 3851348 3851348 0 0.0
.hbn 509 509 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 129896 129896 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 624068 624068 0 0.0
.symtab 189424 189424 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
1030902 1030898 -4 -0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 676947 676947 0 0.0
(read/write) 174476 174476 0 0.0
.bss 74316 74316 0 0.0
.data 3380 3380 0 0.0
.rodata 89451 89451 0 0.0
.text 587184 587184 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 641659 641659 0 0.0
(read/write) 157884 157884 0 0.0
.bss 73588 73588 0 0.0
.data 3380 3380 0 0.0
.rodata 78595 78595 0 0.0
.text 562744 562744 0 0.0
lock-ftd LP_CC2652R7 (read only) 678063 678063 0 0.0
(read/write) 163672 163672 0 0.0
.bss 71516 71516 0 0.0
.data 3304 3304 0 0.0
.rodata 77295 77295 0 0.0
.text 600288 600288 0 0.0
lock-mtd LP_CC2652R7 (read only) 661883 661891 8 0.0
(read/write) 175540 175532 -8 -0.0
.bss 67204 67204 0 0.0
.data 3304 3304 0 0.0
.rodata 103131 103131 0 0.0
.text 558272 558280 8 0.0
pump-app LP_CC2652R7 (read only) 687299 687299 0 0.0
(read/write) 155140 155140 0 0.0
.bss 71452 71452 0 0.0
.data 3296 3296 0 0.0
.rodata 90563 90563 0 0.0
.text 596252 596252 0 0.0
pump-controller-app LP_CC2652R7 (read only) 671783 671783 0 0.0
(read/write) 170768 170768 0 0.0
.bss 71564 71564 0 0.0
.data 3292 3292 0 0.0
.rodata 86119 86119 0 0.0
.text 585184 585184 0 0.0
shell LP_CC2652R7 (read only) 667982 667982 0 0.0
(read/write) 178952 178952 0 0.0
.bss 76628 76628 0 0.0
.data 3376 3376 0 0.0
.rodata 86174 86174 0 0.0
.text 581492 581492 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 587426 587426 0 0.0
.app_xip_area 464084 464084 0 0.0
.bss 65776 65776 0 0.0
.data 744 744 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 594514 594514 0 0.0
.app_xip_area 465844 465844 0 0.0
.bss 71096 71096 0 0.0
.data 752 752 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 543490 543498 8 0.0
.app_xip_area 425172 425180 8 0.0
.bss 60784 60784 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1110720 1110720 0 0.0
.bss 136332 136332 0 0.0
.data 2072 2072 0 0.0
.text 972296 972296 0 0.0
BRD4161A+rpc (read/write) 973588 973588 0 0.0
.bss 150844 150844 0 0.0
.data 2252 2252 0 0.0
.text 820472 820472 0 0.0
BRD4161A+rs911x (read/write) 1003968 1003968 0 0.0
.bss 169168 169168 0 0.0
.data 2064 2064 0 0.0
.text 832716 832716 0 0.0
lock-app BRD4161A+wf200 (read/write) 1151492 1151492 0 0.0
.bss 152248 152248 0 0.0
.data 2072 2072 0 0.0
.text 997152 997152 0 0.0
window-app BRD4161A (read/write) 1101944 1101944 0 0.0
.bss 137772 137772 0 0.0
.data 2096 2096 0 0.0
.text 962056 962056 0 0.0
esp32 all-clusters-app c3devkit (read only) 1223850 1223854 4 0.0
(read/write) 1788110 1788102 -8 -0.0
.dram0.bss 76952 76952 0 0.0
.dram0.data 13840 13840 0 0.0
.flash.rodata 257664 257656 -8 -0.0
.flash.text 1223850 1223854 4 0.0
.iram0.text 65204 65204 0 0.0
m5stack (read only) 1233719 1233719 0 0.0
(read/write) 563996 563988 -8 -0.0
.dram0.bss 82312 82312 0 0.0
.dram0.data 34296 34296 0 0.0
.flash.rodata 314720 314712 -8 -0.0
.flash.text 1228335 1228335 0 0.0
.iram0.text 123939 123939 0 0.0
k32w light k32w0+release (read/write) 649972 649972 0 0.0
.bss 70712 70712 0 0.0
.data 2068 2068 0 0.0
.text 574464 574464 0 0.0
lock k32w0+release (read/write) 706960 706960 0 0.0
.bss 71160 71160 0 0.0
.data 2076 2076 0 0.0
.text 630996 630996 0 0.0
linux chip-tool-ipv6only arm64 (read only) 10349028 10349028 0 0.0
(read/write) 706241 706241 0 0.0
.bss 33937 33937 0 0.0
.data 2864 2864 0 0.0
.data.rel.ro 650560 650560 0 0.0
.dynamic 560 560 0 0.0
.got 13904 13904 0 0.0
.init 24 24 0 0.0
.init_array 200 200 0 0.0
.rodata 503588 503588 0 0.0
.text 8191492 8191492 0 0.0
thermostat-no-ble arm64 (read only) 2368572 2368572 0 0.0
(read/write) 142545 142545 0 0.0
.bss 55249 55249 0 0.0
.data 1704 1704 0 0.0
.data.rel.ro 76704 76704 0 0.0
.dynamic 560 560 0 0.0
.got 5096 5096 0 0.0
.init 24 24 0 0.0
.init_array 416 416 0 0.0
.rodata 141748 141748 0 0.0
.text 1987728 1987728 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2455808 2455808 0 0.0
.bss 215044 215044 0 0.0
.data 5872 5872 0 0.0
.text 1418452 1418452 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1182739 1182739 0 0.0
bss 143641 143641 0 0.0
rodata 144212 144212 0 0.0
text 815940 815940 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1161923 1161923 0 0.0
bss 142868 142868 0 0.0
rodata 135804 135804 0 0.0
text 804332 804332 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 841960 841960 0 0.0
(read/write) 1744780 1744780 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 188720 188720 0 0.0
.comment 204 204 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 1229160 1229160 0 0.0
.debug_aranges 111800 111800 0 0.0
.debug_frame 373224 373224 0 0.0
.debug_info 26813983 26813981 -2 -0.0
.debug_line 3668902 3668902 0 0.0
.debug_loc 3582819 3582819 0 0.0
.debug_ranges 340552 340552 0 0.0
.debug_str 3439174 3439174 0 0.0
.heap 841960 841960 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 571696 571696 0 0.0
.symtab 422080 422080 0 0.0
.text 1545008 1545008 0 0.0
.zero.table 8 8 0 0.0
text 0 0 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 842696 842696 0 0.0
(read/write) 1687988 1687988 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 187984 187984 0 0.0
.comment 204 204 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 1220959 1220959 0 0.0
.debug_aranges 111272 111272 0 0.0
.debug_frame 376304 376304 0 0.0
.debug_info 26550829 26550830 1 0.0
.debug_line 3689618 3689618 0 0.0
.debug_loc 3570456 3570456 0 0.0
.debug_ranges 339168 339168 0 0.0
.debug_str 3428187 3428187 0 0.0
.heap 842696 842696 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 536170 536170 0 0.0
.symtab 408672 408672 0 0.0
.text 1488952 1488952 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
light cy8ckit_062s2_43012 (read only) 850928 850928 0 0.0
(read/write) 1605236 1605236 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 179960 179960 0 0.0
.comment 204 204 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 2456 2456 0 0.0
.debug_abbrev 1055118 1055118 0 0.0
.debug_aranges 103448 103448 0 0.0
.debug_frame 346572 346572 0 0.0
.debug_info 22017083 22017083 0 0.0
.debug_line 3259785 3259785 0 0.0
.debug_loc 3268826 3268826 0 0.0
.debug_ranges 304640 304640 0 0.0
.debug_str 3233441 3233441 0 0.0
.heap 850928 850928 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 469469 469469 0 0.0
.symtab 375760 375760 0 0.0
.text 1414432 1414432 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
lock cy8ckit_062s2_43012 (read only) 845896 845896 0 0.0
(read/write) 1642924 1642924 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 184976 184976 0 0.0
.comment 204 204 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 1062573 1062573 0 0.0
.debug_aranges 104120 104120 0 0.0
.debug_frame 349400 349400 0 0.0
.debug_info 22396460 22396459 -1 -0.0
.debug_line 3268505 3268505 0 0.0
.debug_loc 3308664 3308664 0 0.0
.debug_ranges 307984 307984 0 0.0
.debug_str 3260858 3260858 0 0.0
.heap 845896 845896 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 475672 475672 0 0.0
.symtab 378944 378944 0 0.0
.text 1447088 1447088 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1130892 1130884 -8 -0.0
.bss 106112 106112 0 0.0
.data 1028 1028 0 0.0
.text 577988 577980 -8 -0.0
lock-app qpg6105+debug (read/write) 1101888 1101888 0 0.0
.bss 102344 102344 0 0.0
.data 1032 1032 0 0.0
.text 548988 548988 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 813868 813868 0 0.0
bss 71372 71372 0 0.0
noinit 43488 43488 0 0.0
text 574710 574710 0 0.0
lighting-app tlsr9518adk80d (read/write) 835800 835800 0 0.0
bss 72228 72228 0 0.0
noinit 43488 43488 0 0.0
text 592850 592848 -2 -0.0
ota-requestor-app tlsr9518adk80d (read/write) 843924 843916 -8 -0.0
bss 73136 73136 0 0.0
noinit 43488 43488 0 0.0
text 599114 599112 -2 -0.0

@vivien-apple
Copy link
Contributor Author

I have added the content of #22671 into this PR since that was a very small delta and #22671 needs the same zap update...

@woody-apple woody-apple enabled auto-merge (squash) September 15, 2022 22:19
@github-actions
Copy link

github-actions bot commented Sep 15, 2022

PR #22665: Size comparison from 003fc60 to 9620c97

Increases (6 builds for bl702, esp32, psoc6, qpg, telink)
platform target config section 003fc60 9620c97 change % change
bl702 lighting-app bl702 .debug_info 37894050 3789405 2 0.0
.text 957196 957200 4 0.0
esp32 all-clusters-app c3devkit (read/write) 1788086 1788094 8 0.0
.flash.rodata 257656 257664 8 0.0
psoc6 all-clusters cy8ckit_062s2_43012 .debug_info 26815346 26815347 1 0.0
all-clusters-minimal cy8ckit_062s2_43012 .debug_info 26552194 26552195 1 0.0
qpg lock-app qpg6105+debug (read/write) 1101880 1101888 8 0.0
.text 548980 548988 8 0.0
telink lighting-app tlsr9518adk80d text 592870 592872 2 0.0
Decreases (4 builds for esp32, nrfconnect, psoc6)
platform target config section 003fc60 9620c97 change % change
esp32 all-clusters-app c3devkit (read only) 1223050 1223048 -2 -0.0
.flash.text 1223050 1223048 -2 -0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 text 815384 815380 -4 -0.0
psoc6 light cy8ckit_062s2_43012 .debug_info 22017631 22017630 -1 -0.0
lock cy8ckit_062s2_43012 .debug_info 22396951 22396950 -1 -0.0
Full report (37 builds for bl602, bl702, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
platform target config section 003fc60 9620c97 change % change
bl602 lighting-app bl602 (read/write) 1412934 1412934 0 0.0
.bss 121585 121585 0 0.0
.data 9824 9824 0 0.0
.text 1067652 1067652 0 0.0
bl602+rpc (read/write) 1458402 1458402 0 0.0
.bss 129017 129017 0 0.0
.data 10208 10208 0 0.0
.text 1099256 1099256 0 0.0
bl702 lighting-app bl702 (read only) 3262 3262 0 0.0
(read/write) 1188443 1188443 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 66958 66958 0 0.0
.bss_psram 29696 29696 0 0.0
.comment 48 48 0 0.0
.data 4280 4280 0 0.0
.debug_abbrev 1506733 1506733 0 0.0
.debug_aranges 133072 133072 0 0.0
.debug_frame 486352 486352 0 0.0
.debug_info 37894050 3789405 2 0.0
.debug_line 5253364 5253364 0 0.0
.debug_loc 3363571 3363571 0 0.0
.debug_ranges 360232 360232 0 0.0
.debug_str 3455343 3455343 0 0.0
.hbn 509 509 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 116504 116504 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 564895 564895 0 0.0
.symtab 171616 171616 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
957196 957200 4 0.0
bl702+rpc (read only) 3262 3262 0 0.0
(read/write) 1284371 1284371 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 75006 75006 0 0.0
.bss_psram 29936 29936 0 0.0
.comment 48 48 0 0.0
.data 4800 4800 0 0.0
.debug_abbrev 1644312 1644312 0 0.0
.debug_aranges 140576 140576 0 0.0
.debug_frame 511728 511728 0 0.0
.debug_info 41800620 41800620 0 0.0
.debug_line 5627903 5627903 0 0.0
.debug_loc 3556239 3556239 0 0.0
.debug_ranges 382688 382688 0 0.0
.debug_str 3851310 3851310 0 0.0
.hbn 509 509 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 129896 129896 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 624068 624068 0 0.0
.symtab 189424 189424 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
1030898 1030898 0 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 676515 676515 0 0.0
(read/write) 174900 174900 0 0.0
.bss 74308 74308 0 0.0
.data 3380 3380 0 0.0
.rodata 89595 89595 0 0.0
.text 586608 586608 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 640771 640771 0 0.0
(read/write) 157876 157876 0 0.0
.bss 73580 73580 0 0.0
.data 3380 3380 0 0.0
.rodata 78747 78747 0 0.0
.text 561704 561704 0 0.0
lock-ftd LP_CC2652R7 (read only) 678063 678063 0 0.0
(read/write) 163672 163672 0 0.0
.bss 71516 71516 0 0.0
.data 3304 3304 0 0.0
.rodata 77295 77295 0 0.0
.text 600288 600288 0 0.0
lock-mtd LP_CC2652R7 (read only) 661891 661891 0 0.0
(read/write) 175532 175532 0 0.0
.bss 67204 67204 0 0.0
.data 3304 3304 0 0.0
.rodata 103131 103131 0 0.0
.text 558280 558280 0 0.0
pump-app LP_CC2652R7 (read only) 687299 687299 0 0.0
(read/write) 155140 155140 0 0.0
.bss 71452 71452 0 0.0
.data 3296 3296 0 0.0
.rodata 90563 90563 0 0.0
.text 596252 596252 0 0.0
pump-controller-app LP_CC2652R7 (read only) 671783 671783 0 0.0
(read/write) 170768 170768 0 0.0
.bss 71564 71564 0 0.0
.data 3292 3292 0 0.0
.rodata 86119 86119 0 0.0
.text 585184 585184 0 0.0
shell LP_CC2652R7 (read only) 667518 667518 0 0.0
(read/write) 179408 179408 0 0.0
.bss 76620 76620 0 0.0
.data 3376 3376 0 0.0
.rodata 86302 86302 0 0.0
.text 580900 580900 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 587458 587458 0 0.0
.app_xip_area 464116 464116 0 0.0
.bss 65776 65776 0 0.0
.data 744 744 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 594514 594514 0 0.0
.app_xip_area 465844 465844 0 0.0
.bss 71096 71096 0 0.0
.data 752 752 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 543506 543506 0 0.0
.app_xip_area 425188 425188 0 0.0
.bss 60784 60784 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1110784 1110784 0 0.0
.bss 136332 136332 0 0.0
.data 2072 2072 0 0.0
.text 972360 972360 0 0.0
BRD4161A+rpc (read/write) 973620 973620 0 0.0
.bss 150844 150844 0 0.0
.data 2252 2252 0 0.0
.text 820504 820504 0 0.0
BRD4161A+rs911x (read/write) 1004032 1004032 0 0.0
.bss 169168 169168 0 0.0
.data 2064 2064 0 0.0
.text 832780 832780 0 0.0
lock-app BRD4161A+wf200 (read/write) 1151492 1151492 0 0.0
.bss 152248 152248 0 0.0
.data 2072 2072 0 0.0
.text 997152 997152 0 0.0
window-app BRD4161A (read/write) 1102832 1102832 0 0.0
.bss 137780 137780 0 0.0
.data 2096 2096 0 0.0
.text 962936 962936 0 0.0
esp32 all-clusters-app c3devkit (read only) 1223050 1223048 -2 -0.0
(read/write) 1788086 1788094 8 0.0
.dram0.bss 76944 76944 0 0.0
.dram0.data 13840 13840 0 0.0
.flash.rodata 257656 257664 8 0.0
.flash.text 1223050 1223048 -2 -0.0
.iram0.text 65204 65204 0 0.0
m5stack (read only) 1233111 1233111 0 0.0
(read/write) 563980 563980 0 0.0
.dram0.bss 82304 82304 0 0.0
.dram0.data 34296 34296 0 0.0
.flash.rodata 314712 314712 0 0.0
.flash.text 1227727 1227727 0 0.0
.iram0.text 123939 123939 0 0.0
k32w light k32w0+release (read/write) 650004 650004 0 0.0
.bss 70712 70712 0 0.0
.data 2068 2068 0 0.0
.text 574496 574496 0 0.0
lock k32w0+release (read/write) 706960 706960 0 0.0
.bss 71160 71160 0 0.0
.data 2076 2076 0 0.0
.text 630996 630996 0 0.0
linux chip-tool-ipv6only arm64 (read only) 10353140 10353140 0 0.0
(read/write) 706241 706241 0 0.0
.bss 33937 33937 0 0.0
.data 2864 2864 0 0.0
.data.rel.ro 650560 650560 0 0.0
.dynamic 560 560 0 0.0
.got 13904 13904 0 0.0
.init 24 24 0 0.0
.init_array 200 200 0 0.0
.rodata 503924 503924 0 0.0
.text 8195268 8195268 0 0.0
thermostat-no-ble arm64 (read only) 2368828 2368828 0 0.0
(read/write) 142545 142545 0 0.0
.bss 55249 55249 0 0.0
.data 1704 1704 0 0.0
.data.rel.ro 76704 76704 0 0.0
.dynamic 560 560 0 0.0
.got 5096 5096 0 0.0
.init 24 24 0 0.0
.init_array 416 416 0 0.0
.rodata 141748 141748 0 0.0
.text 1987984 1987984 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2455808 2455808 0 0.0
.bss 215044 215044 0 0.0
.data 5872 5872 0 0.0
.text 1418452 1418452 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1182191 1182191 0 0.0
bss 143633 143633 0 0.0
rodata 144224 144224 0 0.0
text 815384 815380 -4 -0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1160863 1160863 0 0.0
bss 142860 142860 0 0.0
rodata 135816 135816 0 0.0
text 803252 803252 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 841968 841968 0 0.0
(read/write) 1744324 1744324 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 188712 188712 0 0.0
.comment 204 204 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 1229321 1229321 0 0.0
.debug_aranges 111784 111784 0 0.0
.debug_frame 373216 373216 0 0.0
.debug_info 26815346 26815347 1 0.0
.debug_line 3669159 3669159 0 0.0
.debug_loc 3582858 3582858 0 0.0
.debug_ranges 340664 340664 0 0.0
.debug_str 3438974 3438974 0 0.0
.heap 841968 841968 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 569356 569356 0 0.0
.symtab 421168 421168 0 0.0
.text 1544560 1544560 0 0.0
.zero.table 8 8 0 0.0
text 0 0 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 842704 842704 0 0.0
(read/write) 1686964 1686964 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 187976 187976 0 0.0
.comment 204 204 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 1221120 1221120 0 0.0
.debug_aranges 111256 111256 0 0.0
.debug_frame 376296 376296 0 0.0
.debug_info 26552194 26552195 1 0.0
.debug_line 3689875 3689875 0 0.0
.debug_loc 3570495 3570495 0 0.0
.debug_ranges 339280 339280 0 0.0
.debug_str 3427987 3427987 0 0.0
.heap 842704 842704 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 533445 533445 0 0.0
.symtab 407600 407600 0 0.0
.text 1487936 1487936 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
light cy8ckit_062s2_43012 (read only) 850896 850896 0 0.0
(read/write) 1605540 1605540 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 179992 179992 0 0.0
.comment 204 204 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 2456 2456 0 0.0
.debug_abbrev 1055176 1055176 0 0.0
.debug_aranges 103464 103464 0 0.0
.debug_frame 346624 346624 0 0.0
.debug_info 22017631 22017630 -1 -0.0
.debug_line 3259887 3259887 0 0.0
.debug_loc 3268799 3268799 0 0.0
.debug_ranges 304608 304608 0 0.0
.debug_str 3233519 3233519 0 0.0
.heap 850896 850896 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 469822 469822 0 0.0
.symtab 376048 376048 0 0.0
.text 1414704 1414704 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
lock cy8ckit_062s2_43012 (read only) 845864 845864 0 0.0
(read/write) 1643148 1643148 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 185008 185008 0 0.0
.comment 204 204 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 1062595 1062595 0 0.0
.debug_aranges 104136 104136 0 0.0
.debug_frame 349448 349448 0 0.0
.debug_info 22396951 22396950 -1 -0.0
.debug_line 3268581 3268581 0 0.0
.debug_loc 3308657 3308657 0 0.0
.debug_ranges 307952 307952 0 0.0
.debug_str 3260974 3260974 0 0.0
.heap 845864 845864 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 476025 476025 0 0.0
.symtab 379232 379232 0 0.0
.text 1447280 1447280 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1130924 1130924 0 0.0
.bss 106112 106112 0 0.0
.data 1028 1028 0 0.0
.text 578020 578020 0 0.0
lock-app qpg6105+debug (read/write) 1101880 1101888 8 0.0
.bss 102344 102344 0 0.0
.data 1032 1032 0 0.0
.text 548980 548988 8 0.0
telink light-switch-app tlsr9518adk80d (read/write) 813868 813868 0 0.0
bss 71372 71372 0 0.0
noinit 43488 43488 0 0.0
text 574710 574710 0 0.0
lighting-app tlsr9518adk80d (read/write) 835824 835824 0 0.0
bss 72228 72228 0 0.0
noinit 43488 43488 0 0.0
text 592870 592872 2 0.0
ota-requestor-app tlsr9518adk80d (read/write) 843916 843916 0 0.0
bss 73136 73136 0 0.0
noinit 43488 43488 0 0.0
text 599110 599110 0 0.0

@vivien-apple vivien-apple force-pushed the Darwin_KeepAcronymsInAPIs branch from 9620c97 to da2a9c4 Compare September 16, 2022 00:15
@woody-apple woody-apple merged commit 9989fc1 into project-chip:master Sep 16, 2022
isiu-apple pushed a commit to isiu-apple/connectedhomeip that referenced this pull request Sep 16, 2022
…ject-chip#22665)

* Update ZAP repo

* [darwin] Add cluster and commands description from XML into MTRBaseClusters.zapt

* [Darwin] Update template to preserve acronyms (e.g ACL) in APIs

* Update constants name in TemperatureSensorViewController.m

* Ota -> OTA in src/darwin/Framework/CHIPTests/MTRTestOTAProvider.m

* Exclude src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h from restyle as we seems to have colliding versions

* Update generated code
bzbarsky-apple pushed a commit to bzbarsky-apple/connectedhomeip that referenced this pull request Nov 29, 2022
This is a re-landing of PR project-chip#22665 but with backwards compat preserved
and some of the comment-only changes removed to ease review; those
will re-land in a separate PR.

* Update ZAP repo

* [Darwin] Update template to preserve acronyms (e.g ACL) in APIs

* Ota -> OTA in src/darwin/Framework/CHIPTests/MTRTestOTAProvider.m

* Update generated code

The header changes not accompanied by backwards-compat shims are OK for the
following reasons:

* The changes to the argument types in MTROTAProviderDelegate.h are in
  MTR_NEWLY_AVAILABLE APIs.
* MTROTAProviderDelegateBridge.h is not public API.
* In MTRBaseClusters.h readAttributeAclWithParams, writeAttributeAclWithValue,
  subscribeAttributeAclWithParams, readAttributeAclWithClusterStateCache get
  renamed only in MTR_NEWLY_AVAILABLE APIs.
* In MTRBaseClusters.h MTRBaseClusterOtaSoftwareUpdateProvider gets renamed to
  MTRBaseClusterOTASoftwareUpdateProvider.  This is OK because all the selectors
  on it are MTR_NEWLY_AVAILABLE and a shim is provided for the (Deprecated)
  extension.
* In MTRBaseClusters.h MTROtaSoftwareUpdateProviderCluster* structs in arguments
  get renamed to MTROTASoftwareUpdateProviderCluster* only in
  MTR_NEWLY_AVAILABLE APIs.
* In MTRBaseClusters.h MTRBaseClusterOtaSoftwareUpdateRequestor gets renamed to
  MTRBaseClusterOTASoftwareUpdateRequestor.  This is OK because all the
  selectors on it are MTR_NEWLY_AVAILABLE and a shim is provided for the
  (Deprecated) extension.
* In MTRBaseClusters.h MTROtaSoftwareUpdateRequestorCluster* structs in
  arguments get renamed to MTROTASoftwareUpdateRequestorCluster* only in
  MTR_NEWLY_AVAILABLE APIs.
* In MTRBaseClusters.h *AttributePir* bits get renamed only in
  MTR_NEWLY_AVAILABLE APIs.
* In MTRBaseClusters.h MTRBaseClusterWakeOnLan gets renamed to
  MTRBaseClusterWakeOnLAN and needs a shim.  This is OK because all the
  selectors on it are MTR_NEWLY_AVAILABLE and a shim is provided for the
  (Deprecated) extension.
* MTRBaseClusters_internal.h is not public API.
* MTRCallbackBridge_internal.h is not public API.
* In MTRClusterConstants.h all the name changes are to MTR_NEWLY_AVAILABLE
  constants.
* In MTRClusters.h renaming MTRClusterOtaSoftwareUpdateProvider to
  MTRClusterOTASoftwareUpdateProvider is OK because a shim is provided.
* In MTRClusters.h renaming MTRClusterOtaSoftwareUpdateRequestor to
  MTRClusterOTASoftwareUpdateRequestor is OK because a shim is provided.
* In MTRClusters.h renaming MTRClusterWakeOnLan to MTRClusterWakeOnLAN is OK
  because a shim is provided.
* In MTRClusters.h, all the attributes that had their names change get shims.
* MTRClusters_internal.h is not public API.
bzbarsky-apple added a commit that referenced this pull request Nov 30, 2022
…3800)

This is a re-landing of PR #22665 but with backwards compat preserved
and some of the comment-only changes removed to ease review; those
will re-land in a separate PR.

* Update ZAP repo

* [Darwin] Update template to preserve acronyms (e.g ACL) in APIs

* Ota -> OTA in src/darwin/Framework/CHIPTests/MTRTestOTAProvider.m

* Update generated code

The header changes not accompanied by backwards-compat shims are OK for the
following reasons:

* The changes to the argument types in MTROTAProviderDelegate.h are in
  MTR_NEWLY_AVAILABLE APIs.
* MTROTAProviderDelegateBridge.h is not public API.
* In MTRBaseClusters.h readAttributeAclWithParams, writeAttributeAclWithValue,
  subscribeAttributeAclWithParams, readAttributeAclWithClusterStateCache get
  renamed only in MTR_NEWLY_AVAILABLE APIs.
* In MTRBaseClusters.h MTRBaseClusterOtaSoftwareUpdateProvider gets renamed to
  MTRBaseClusterOTASoftwareUpdateProvider.  This is OK because all the selectors
  on it are MTR_NEWLY_AVAILABLE and a shim is provided for the (Deprecated)
  extension.
* In MTRBaseClusters.h MTROtaSoftwareUpdateProviderCluster* structs in arguments
  get renamed to MTROTASoftwareUpdateProviderCluster* only in
  MTR_NEWLY_AVAILABLE APIs.
* In MTRBaseClusters.h MTRBaseClusterOtaSoftwareUpdateRequestor gets renamed to
  MTRBaseClusterOTASoftwareUpdateRequestor.  This is OK because all the
  selectors on it are MTR_NEWLY_AVAILABLE and a shim is provided for the
  (Deprecated) extension.
* In MTRBaseClusters.h MTROtaSoftwareUpdateRequestorCluster* structs in
  arguments get renamed to MTROTASoftwareUpdateRequestorCluster* only in
  MTR_NEWLY_AVAILABLE APIs.
* In MTRBaseClusters.h *AttributePir* bits get renamed only in
  MTR_NEWLY_AVAILABLE APIs.
* In MTRBaseClusters.h MTRBaseClusterWakeOnLan gets renamed to
  MTRBaseClusterWakeOnLAN and needs a shim.  This is OK because all the
  selectors on it are MTR_NEWLY_AVAILABLE and a shim is provided for the
  (Deprecated) extension.
* MTRBaseClusters_internal.h is not public API.
* MTRCallbackBridge_internal.h is not public API.
* In MTRClusterConstants.h all the name changes are to MTR_NEWLY_AVAILABLE
  constants.
* In MTRClusters.h renaming MTRClusterOtaSoftwareUpdateProvider to
  MTRClusterOTASoftwareUpdateProvider is OK because a shim is provided.
* In MTRClusters.h renaming MTRClusterOtaSoftwareUpdateRequestor to
  MTRClusterOTASoftwareUpdateRequestor is OK because a shim is provided.
* In MTRClusters.h renaming MTRClusterWakeOnLan to MTRClusterWakeOnLAN is OK
  because a shim is provided.
* In MTRClusters.h, all the attributes that had their names change get shims.
* MTRClusters_internal.h is not public API.

Co-authored-by: Vivien Nicolas <[email protected]>
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.

[Platform] Apply API review fixes to Darwin auto-generated APIs
3 participants