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

[Telink] use src/app/chip_data_model.cmake for data model inclusions #23255

Merged
merged 2 commits into from
Oct 19, 2022

Conversation

s07641069
Copy link
Contributor

Problem

Telink CMakeFiles directly include /src/app/util/* and zzz_generated paths for includes.

This makes any common refactors tedious. Mbed and NRF already use a common src/app/chip_data_model.cmake

Issue Being Resolved
#23225

Change overview

  • use src/app/chip_data_model.cmake for data model inclusions

Testing

Tested manually with chip-tool.
Steps:

Run: $ chip-tool pairing ble-thread <...>
Wait till success
Run: $ chip-tool onoff on ${NODE_ID }1
Wait till success
Run: $ chip-tool onoff off ${NODE_ID }1
Wait till success

@github-actions
Copy link

PR #23255: Size comparison from c279578 to 33913b1

Full report (2 builds for bl702)
platform target config section c279578 33913b1 change % change
bl702 lighting-app bl702 0 0 0 0.0
(read only) 3262 3262 0 0.0
(read/write) 1188947 1188947 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 67118 67118 0 0.0
.bss_psram 29696 29696 0 0.0
.comment 48 48 0 0.0
.data 4272 4272 0 0.0
.debug_abbrev 1507059 1507059 0 0.0
.debug_aranges 133144 133144 0 0.0
.debug_frame 486648 486648 0 0.0
.debug_info 37908755 37908755 0 0.0
.debug_line 5257407 5257407 0 0.0
.debug_loc 3367638 3367638 0 0.0
.debug_ranges 359456 359456 0 0.0
.debug_str 3457927 3457927 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 116744 116744 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 565127 565127 0 0.0
.symtab 171680 171680 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 957310 957310 0 0.0
bl702+rpc 0 0 0 0.0
(read only) 3262 3262 0 0.0
(read/write) 1284627 1284627 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 75166 75166 0 0.0
.bss_psram 29936 29936 0 0.0
.comment 48 48 0 0.0
.data 4800 4800 0 0.0
.debug_abbrev 1644604 1644604 0 0.0
.debug_aranges 140648 140648 0 0.0
.debug_frame 512020 512020 0 0.0
.debug_info 41815371 41815371 0 0.0
.debug_line 5631938 5631938 0 0.0
.debug_loc 3560285 3560285 0 0.0
.debug_ranges 381912 381912 0 0.0
.debug_str 3853897 3853897 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 130136 130136 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 624300 624300 0 0.0
.symtab 189488 189488 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 1030758 1030758 0 0.0

@github-actions
Copy link

github-actions bot commented Oct 19, 2022

PR #23255: Size comparison from bd4e59b to 12f3d81

Increases (7 builds for bl602, bl702, cc13x2_26x2, cyw30739, esp32, psoc6, qpg)
platform target config section bd4e59b 12f3d81 change % change
bl602 lighting-app bl602+rpc .text 1100716 1100720 4 0.0
bl702 lighting-app bl702+rpc .debug_info 41815369 41815370 1 0.0
.text 1030754 1030756 2 0.0
cc13x2_26x2 pump-controller-app LP_CC2652R7 (read/write) 177104 177112 8 0.0
cyw30739 lock cyw930739m2evb_01 (read/write) 592162 592170 8 0.0
.app_xip_area 463452 463460 8 0.0
esp32 all-clusters-app c3devkit (read only) 1223546 1223548 2 0.0
.flash.text 1223546 1223548 2 0.0
psoc6 lock cy8ckit_062s2_43012 .debug_info 22271068 22271069 1 0.0
qpg lighting-app qpg6105+debug (read/write) 1148800 1148808 8 0.0
.text 595900 595908 8 0.0
Decreases (11 builds for bl602, bl702, cc13x2_26x2, cyw30739, esp32, psoc6, telink)
platform target config section bd4e59b 12f3d81 change % change
bl602 lighting-app bl602 (read/write) 1389982 1389974 -8 -0.0
.text 1069370 1069368 -2 -0.0
bl702 lighting-app bl702 .debug_info 37908755 37908754 -1 -0.0
.text 957310 957308 -2 -0.0
cc13x2_26x2 pump-controller-app LP_CC2652R7 (read only) 672423 672415 -8 -0.0
.text 585656 585648 -8 -0.0
cyw30739 ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 543966 543958 -8 -0.0
.app_xip_area 425632 425624 -8 -0.0
esp32 all-clusters-app c3devkit (read/write) 1788318 1788310 -8 -0.0
.flash.rodata 257872 257864 -8 -0.0
m5stack (read/write) 564236 564228 -8 -0.0
.flash.rodata 314936 314928 -8 -0.0
psoc6 all-clusters cy8ckit_062s2_43012 .debug_info 26837275 26837274 -1 -0.0
light cy8ckit_062s2_43012 .debug_info 22037779 22037778 -1 -0.0
telink light-switch-app tlsr9518adk80d text 553786 553784 -2 -0.0
lighting-app tlsr9518adk80d (read/write) 812528 805432 -7096 -0.9
bss 73344 73240 -104 -0.1
text 572206 565918 -6288 -1.1
ota-requestor-app tlsr9518adk80d (read/write) 820248 804316 -15932 -1.9
bss 74236 74052 -184 -0.2
text 578190 564792 -13398 -2.3
Full report (37 builds for bl602, bl702, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, nrfconnect, psoc6, qpg, telink)
platform target config section bd4e59b 12f3d81 change % change
bl602 lighting-app bl602 (read/write) 1389982 1389974 -8 -0.0
.bss 90745 90745 0 0.0
.data 9928 9928 0 0.0
.text 1069370 1069368 -2 -0.0
bl602+rpc (read/write) 1435198 1435198 0 0.0
.bss 98177 98177 0 0.0
.data 10312 10312 0 0.0
.text 1100716 1100720 4 0.0
bl702 lighting-app bl702 (read only) 3262 3262 0 0.0
(read/write) 1188947 1188947 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 67118 67118 0 0.0
.bss_psram 29696 29696 0 0.0
.comment 48 48 0 0.0
.data 4272 4272 0 0.0
.debug_abbrev 1507059 1507059 0 0.0
.debug_aranges 133144 133144 0 0.0
.debug_frame 486648 486648 0 0.0
.debug_info 37908755 37908754 -1 -0.0
.debug_line 5257407 5257407 0 0.0
.debug_loc 3367638 3367638 0 0.0
.debug_ranges 359456 359456 0 0.0
.debug_str 3457927 3457927 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 116744 116744 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 565127 565127 0 0.0
.symtab 171680 171680 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
957310 957308 -2 -0.0
bl702+rpc (read only) 3262 3262 0 0.0
(read/write) 1284627 1284627 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 75166 75166 0 0.0
.bss_psram 29936 29936 0 0.0
.comment 48 48 0 0.0
.data 4800 4800 0 0.0
.debug_abbrev 1644604 1644604 0 0.0
.debug_aranges 140648 140648 0 0.0
.debug_frame 512020 512020 0 0.0
.debug_info 41815369 41815370 1 0.0
.debug_line 5631938 5631938 0 0.0
.debug_loc 3560285 3560285 0 0.0
.debug_ranges 381912 381912 0 0.0
.debug_str 3853897 3853897 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 130136 130136 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 624300 624300 0 0.0
.symtab 189488 189488 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
1030754 1030756 2 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 677351 677351 0 0.0
(read/write) 174208 174208 0 0.0
.bss 81252 81252 0 0.0
.data 3380 3380 0 0.0
.rodata 89791 89791 0 0.0
.text 587248 587248 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 641599 641599 0 0.0
(read/write) 158020 158020 0 0.0
.bss 80524 80524 0 0.0
.data 3380 3380 0 0.0
.rodata 78927 78927 0 0.0
.text 562352 562352 0 0.0
lock-ftd LP_CC2652R7 (read only) 675851 675851 0 0.0
(read/write) 172844 172844 0 0.0
.bss 78476 78476 0 0.0
.data 3304 3304 0 0.0
.rodata 77315 77315 0 0.0
.text 598056 598056 0 0.0
lock-mtd LP_CC2652R7 (read only) 659607 659607 0 0.0
(read/write) 184776 184776 0 0.0
.bss 74164 74164 0 0.0
.data 3304 3304 0 0.0
.rodata 103135 103135 0 0.0
.text 555992 555992 0 0.0
pump-app LP_CC2652R7 (read only) 688091 688091 0 0.0
(read/write) 161340 161340 0 0.0
.bss 78444 78444 0 0.0
.data 3296 3296 0 0.0
.rodata 90731 90731 0 0.0
.text 596876 596876 0 0.0
pump-controller-app LP_CC2652R7 (read only) 672423 672415 -8 -0.0
(read/write) 177104 177112 8 0.0
.bss 78540 78540 0 0.0
.data 3292 3292 0 0.0
.rodata 86287 86287 0 0.0
.text 585656 585648 -8 -0.0
shell LP_CC2652R7 (read only) 668374 668374 0 0.0
(read/write) 185504 185504 0 0.0
.bss 83572 83572 0 0.0
.data 3376 3376 0 0.0
.rodata 86502 86502 0 0.0
.text 581556 581556 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 588130 588130 0 0.0
.app_xip_area 464716 464716 0 0.0
.bss 65832 65832 0 0.0
.data 760 760 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 592162 592170 8 0.0
.app_xip_area 463452 463460 8 0.0
.bss 71120 71120 0 0.0
.data 768 768 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 543966 543958 -8 -0.0
.app_xip_area 425632 425624 -8 -0.0
.bss 60800 60800 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+rpc (read/write) 974060 974060 0 0.0
.bss 152276 152276 0 0.0
.data 2248 2248 0 0.0
.text 819516 819516 0 0.0
BRD4161A+rs911x (read/write) 1031208 1031208 0 0.0
.bss 186680 186680 0 0.0
.data 2092 2092 0 0.0
.text 842416 842416 0 0.0
BRD4187C (read/write) 1146116 1146116 0 0.0
.bss 138664 138664 0 0.0
.data 2596 2596 0 0.0
.text 980260 980260 0 0.0
lock-app BRD4161A+wf200 (read/write) 1157008 1157008 0 0.0
.bss 158208 158208 0 0.0
.data 2100 2100 0 0.0
.text 996680 996680 0 0.0
window-app BRD4187C (read/write) 1139336 1139336 0 0.0
.bss 140080 140080 0 0.0
.data 2620 2620 0 0.0
.text 972040 972040 0 0.0
esp32 all-clusters-app c3devkit (read only) 1223546 1223548 2 0.0
(read/write) 1788318 1788310 -8 -0.0
.dram0.bss 76960 76960 0 0.0
.dram0.data 13840 13840 0 0.0
.flash.rodata 257872 257864 -8 -0.0
.flash.text 1223546 1223548 2 0.0
.iram0.text 65204 65204 0 0.0
m5stack (read only) 1233623 1233623 0 0.0
(read/write) 564236 564228 -8 -0.0
.dram0.bss 82336 82336 0 0.0
.dram0.data 34296 34296 0 0.0
.flash.rodata 314936 314928 -8 -0.0
.flash.text 1228239 1228239 0 0.0
.iram0.text 123939 123939 0 0.0
k32w contact k32w0+release (read/write) 661268 661268 0 0.0
.bss 77040 77040 0 0.0
.data 2104 2104 0 0.0
.text 563012 563012 0 0.0
light k32w0+release (read/write) 671480 671480 0 0.0
.bss 74840 74840 0 0.0
.data 2060 2060 0 0.0
.text 591852 591852 0 0.0
lock k32w0+release (read/write) 633076 633076 0 0.0
.bss 75600 75600 0 0.0
.data 2080 2080 0 0.0
.text 552668 552668 0 0.0
linux chip-tool-ipv6only arm64 (read only) 10429444 10429444 0 0.0
(read/write) 706353 706353 0 0.0
.bss 33953 33953 0 0.0
.data 2768 2768 0 0.0
.data.rel.ro 650632 650632 0 0.0
.dynamic 560 560 0 0.0
.got 13896 13896 0 0.0
.init 24 24 0 0.0
.init_array 208 208 0 0.0
.rodata 518132 518132 0 0.0
.text 8255748 8255748 0 0.0
thermostat-no-ble arm64 (read only) 2390508 2390508 0 0.0
(read/write) 143633 143633 0 0.0
.bss 55377 55377 0 0.0
.data 1816 1816 0 0.0
.data.rel.ro 77256 77256 0 0.0
.dynamic 560 560 0 0.0
.got 5176 5176 0 0.0
.init 24 24 0 0.0
.init_array 440 440 0 0.0
.rodata 144436 144436 0 0.0
.text 2003168 2003168 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1183627 1183627 0 0.0
bss 144457 144457 0 0.0
rodata 144396 144396 0 0.0
text 815888 815888 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1162311 1162311 0 0.0
bss 143684 143684 0 0.0
rodata 135968 135968 0 0.0
text 803780 803780 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 841952 841952 0 0.0
(read/write) 1745420 1745420 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 188728 188728 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 1229571 1229571 0 0.0
.debug_aranges 111880 111880 0 0.0
.debug_frame 373556 373556 0 0.0
.debug_info 26837275 26837274 -1 -0.0
.debug_line 3673065 3673065 0 0.0
.debug_loc 3590247 3590247 0 0.0
.debug_ranges 339736 339736 0 0.0
.debug_str 3441330 3441330 0 0.0
.heap 841952 841952 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 569695 569695 0 0.0
.symtab 421232 421232 0 0.0
.text 0 0 0 0.0
1545640 1545640 0 0.0
.zero.table 8 8 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 842688 842688 0 0.0
(read/write) 1688004 1688004 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 187992 187992 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 1221370 1221370 0 0.0
.debug_aranges 111352 111352 0 0.0
.debug_frame 376636 376636 0 0.0
.debug_info 26574057 26574057 0 0.0
.debug_line 3693782 3693782 0 0.0
.debug_loc 3577884 3577884 0 0.0
.debug_ranges 338352 338352 0 0.0
.debug_str 3430343 3430343 0 0.0
.heap 842688 842688 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 533784 533784 0 0.0
.symtab 407664 407664 0 0.0
.text 1488960 1488960 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
light cy8ckit_062s2_43012 (read only) 850872 850872 0 0.0
(read/write) 1606572 1606572 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 180016 180016 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 1055481 1055481 0 0.0
.debug_aranges 103560 103560 0 0.0
.debug_frame 346968 346968 0 0.0
.debug_info 22037779 22037778 -1 -0.0
.debug_line 3263706 3263706 0 0.0
.debug_loc 3275846 3275846 0 0.0
.debug_ranges 303656 303656 0 0.0
.debug_str 3235875 3235875 0 0.0
.heap 850872 850872 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 470161 470161 0 0.0
.symtab 376112 376112 0 0.0
.text 1415712 1415712 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
lock cy8ckit_062s2_43012 (read only) 845880 845880 0 0.0
(read/write) 1640260 1640260 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 184992 184992 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 1057420 1057420 0 0.0
.debug_aranges 103952 103952 0 0.0
.debug_frame 348824 348824 0 0.0
.debug_info 22271068 22271069 1 0.0
.debug_line 3260671 3260671 0 0.0
.debug_loc 3303427 3303427 0 0.0
.debug_ranges 305592 305592 0 0.0
.debug_str 3255273 3255273 0 0.0
.heap 845880 845880 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 472512 472512 0 0.0
.symtab 377728 377728 0 0.0
.text 1444408 1444408 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1148800 1148808 8 0.0
.bss 110580 110580 0 0.0
.data 832 832 0 0.0
.text 595900 595908 8 0.0
lock-app qpg6105+debug (read/write) 1113696 1113696 0 0.0
.bss 106372 106372 0 0.0
.data 836 836 0 0.0
.text 560792 560792 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 790200 790200 0 0.0
bss 72480 72480 0 0.0
noinit 43520 43520 0 0.0
text 553786 553784 -2 -0.0
lighting-app tlsr9518adk80d (read/write) 812528 805432 -7096 -0.9
bss 73344 73240 -104 -0.1
noinit 43520 43520 0 0.0
text 572206 565918 -6288 -1.1
ota-requestor-app tlsr9518adk80d (read/write) 820248 804316 -15932 -1.9
bss 74236 74052 -184 -0.2
noinit 43520 43520 0 0.0
text 578190 564792 -13398 -2.3

@andy31415 andy31415 merged commit e4f60ce into project-chip:master Oct 19, 2022
@s07641069 s07641069 deleted the telink_use_chip_data_model branch October 31, 2022 14:36
s07641069 added a commit to s07641069/connectedhomeip that referenced this pull request Nov 3, 2022
andy31415 added a commit that referenced this pull request Nov 4, 2022
adbridge pushed a commit to ARM-software/connectedhomeip that referenced this pull request Nov 18, 2022
adbridge pushed a commit to ARM-software/connectedhomeip that referenced this pull request Nov 18, 2022
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.

3 participants