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

Introduce ConcreteClusterPath. #14927

Merged
merged 1 commit into from
Feb 9, 2022

Conversation

bzbarsky-apple
Copy link
Contributor

Will be useful in places where we just need an endpoint+cluster.

Fixes #14820

Problem

We end up converting between paths and multiple args representing endpoint + cluster.

Change overview

Allow us to just pass paths along as needed.

Testing

No behavior changes.

@github-actions
Copy link

github-actions bot commented Feb 9, 2022

PR #14927: Size comparison from cab1ff9 to 900ab4e

Increases (2 builds for esp32, telink)
platform target config section cab1ff9 900ab4e change % change
esp32 all-clusters-app c3devkit (read only) 939372 939472 100 0.0
.flash.text 939372 939472 100 0.0
telink lighting-app tlsr9518adk80d (read/write) 870166 870238 72 0.0
text 611502 611576 74 0.0
Full report (32 builds for cyw30739, efr32, esp32, k32w, mbed, nrfconnect, p6, qpg, telink)
platform target config section cab1ff9 900ab4e change % change
cyw30739 light cyw930739m2evb_01 (read/write) 595382 595382 0 0.0
.app_xip_area 500916 500916 0 0.0
.bss 77188 77188 0 0.0
.data 624 624 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 556334 556334 0 0.0
.app_xip_area 463404 463404 0 0.0
.bss 75684 75684 0 0.0
.data 588 588 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 577314 577314 0 0.0
.app_xip_area 475088 475088 0 0.0
.bss 84652 84652 0 0.0
.data 532 532 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 866340 866340 0 0.0
(read/write) 126684 126684 0 0.0
.bss 124760 124760 0 0.0
.data 1924 1924 0 0.0
.text 866332 866332 0 0.0
BRD4161A+rpc (read only) 853788 853788 0 0.0
(read/write) 143344 143344 0 0.0
.bss 141320 141320 0 0.0
.data 2024 2024 0 0.0
.text 853780 853780 0 0.0
window-app BRD4161A (read only) 838544 838544 0 0.0
(read/write) 125328 125328 0 0.0
.bss 123448 123448 0 0.0
.data 1880 1880 0 0.0
.text 838536 838536 0 0.0
esp32 all-clusters-app c3devkit (read only) 939372 939472 100 0.0
(read/write) 1401882 1401882 0 0.0
.dram0.bss 70024 70024 0 0.0
.dram0.data 14260 14260 0 0.0
.flash.rodata 198688 198688 0 0.0
.flash.text 939372 939472 100 0.0
.iram0.text 62056 62056 0 0.0
m5stack (read only) 987511 987511 0 0.0
(read/write) 466892 466892 0 0.0
.dram0.bss 75160 75160 0 0.0
.dram0.data 34024 34024 0 0.0
.flash.rodata 225580 225580 0 0.0
.flash.text 982127 982127 0 0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 679212 679212 0 0.0
.bss 76632 76632 0 0.0
.data 1884 1884 0 0.0
.text 594896 594896 0 0.0
lock k32w061+release (read/write) 684012 684012 0 0.0
.bss 76984 76984 0 0.0
.data 1928 1928 0 0.0
.text 599300 599300 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2390920 2390920 0 0.0
.bss 188932 188932 0 0.0
.data 5288 5288 0 0.0
.text 1353520 1353520 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2349448 2349448 0 0.0
.bss 181000 181000 0 0.0
.data 5600 5600 0 0.0
.text 1312048 1312048 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2317408 2317408 0 0.0
.bss 180912 180912 0 0.0
.data 5584 5584 0 0.0
.text 1280008 1280008 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139648 1139648 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.text 103032 103032 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2303404 2303404 0 0.0
.bss 178164 178164 0 0.0
.data 5400 5400 0 0.0
.text 1265976 1265976 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 1005707 1005707 0 0.0
bss 121352 121352 0 0.0
rodata 118312 118312 0 0.0
text 687048 687048 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 974551 974551 0 0.0
bss 118540 118540 0 0.0
rodata 109700 109700 0 0.0
text 666664 666664 0 0.0
nrf52840dongle_nrf52840 (read/write) 1022399 1022399 0 0.0
bss 122716 122716 0 0.0
rodata 117200 117200 0 0.0
text 692620 692620 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 912322 912322 0 0.0
bss 117912 117912 0 0.0
rodata 111572 111572 0 0.0
text 602076 602076 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 940775 940775 0 0.0
bss 119720 119720 0 0.0
rodata 107540 107540 0 0.0
text 634956 634956 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 848250 848250 0 0.0
bss 116312 116312 0 0.0
rodata 100708 100708 0 0.0
text 550752 550752 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 527595 527595 0 0.0
bss 53632 53632 0 0.0
rodata 49976 49976 0 0.0
text 361016 361016 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 940211 940211 0 0.0
bss 119440 119440 0 0.0
rodata 106896 106896 0 0.0
text 635212 635212 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 935535 935535 0 0.0
bss 119444 119444 0 0.0
rodata 106188 106188 0 0.0
text 631244 631244 0 0.0
shell nrf52840dk_nrf52840 (read/write) 803911 803911 0 0.0
bss 111304 111304 0 0.0
rodata 78716 78716 0 0.0
text 536272 536272 0 0.0
p6 all-clusters-app default (read/write) 2465432 2465432 0 0.0
.bss 118544 118544 0 0.0
.data 2568 2568 0 0.0
.text 1423696 1423696 0 0.0
light-app default (read/write) 2367776 2367776 0 0.0
.bss 107664 107664 0 0.0
.data 2432 2432 0 0.0
.text 1326040 1326040 0 0.0
lock-app default (read/write) 2336584 2336584 0 0.0
.bss 107400 107400 0 0.0
.data 2400 2400 0 0.0
.text 1294848 1294848 0 0.0
qpg lighting-app qpg6105+debug (read only) 586368 586368 0 0.0
(read/write) 146936 146936 0 0.0
.bss 88920 88920 0 0.0
.data 1084 1084 0 0.0
.text 581048 581048 0 0.0
lock-app qpg6105+debug (read only) 535332 535332 0 0.0
(read/write) 146936 146936 0 0.0
.bss 88392 88392 0 0.0
.data 1028 1028 0 0.0
.text 530012 530012 0 0.0
persistent-storage-app qpg6105+debug (read only) 99520 99520 0 0.0
(read/write) 146940 146940 0 0.0
.bss 24004 24004 0 0.0
.data 176 176 0 0.0
.text 94200 94200 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 870166 870238 72 0.0
bss 88680 88680 0 0.0
noinit 37160 37160 0 0.0
text 611502 611576 74 0.0

Will be useful in places where we just need an endpoint+cluster.

Fixes project-chip#14820
@github-actions
Copy link

github-actions bot commented Feb 9, 2022

PR #14927: Size comparison from 5158095 to 2e1bdce

Increases (13 builds for esp32, linux, telink)
platform target config section 5158095 2e1bdce change % change
esp32 all-clusters-app c3devkit (read only) 938890 938990 100 0.0
.flash.text 938890 938990 100 0.0
linux all-clusters-app debug (read only) 2329193 2329273 80 0.0
.text 1962514 1962594 80 0.0
bridge-app debug+rpc (read only) 1705749 1705829 80 0.0
.text 1448869 1448949 80 0.0
chip-tool debug (read only) 7466189 7466349 160 0.0
.text 6650981 6651141 160 0.0
chip-tool-ipv6only arm64 (read only) 7390172 7390428 256 0.0
.text 6355636 6355892 256 0.0
door-lock-app debug (read only) 1910457 1910537 80 0.0
.text 1590082 1590162 80 0.0
lighting-app debug+rpc (read only) 2005001 2005097 96 0.0
.text 1687298 1687394 96 0.0
ota-provider-app debug (read only) 1714425 1714521 96 0.0
.text 1443810 1443906 96 0.0
ota-requestor-app debug (read only) 1703081 1703161 80 0.0
.text 1441138 1441218 80 0.0
shell debug (read only) 2302633 2302729 96 0.0
.text 1941042 1941138 96 0.0
thermostat-no-ble arm64 (read only) 2130892 2131052 160 0.0
.text 1780720 1780880 160 0.0
tv-app debug (read only) 2503017 2503193 176 0.0
.text 2133938 2134114 176 0.0
telink lighting-app tlsr9518adk80d (read/write) 866702 866774 72 0.0
text 608294 608368 74 0.0
Full report (43 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 5158095 2e1bdce change % change
cyw30739 light cyw930739m2evb_01 (read/write) 595374 595374 0 0.0
.app_xip_area 500908 500908 0 0.0
.bss 77188 77188 0 0.0
.data 624 624 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 556326 556326 0 0.0
.app_xip_area 463396 463396 0 0.0
.bss 75684 75684 0 0.0
.data 588 588 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 577314 577314 0 0.0
.app_xip_area 475088 475088 0 0.0
.bss 84652 84652 0 0.0
.data 532 532 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 866532 866532 0 0.0
(read/write) 126684 126684 0 0.0
.bss 124760 124760 0 0.0
.data 1924 1924 0 0.0
.text 866524 866524 0 0.0
BRD4161A+rpc (read only) 853996 853996 0 0.0
(read/write) 143344 143344 0 0.0
.bss 141320 141320 0 0.0
.data 2024 2024 0 0.0
.text 853988 853988 0 0.0
window-app BRD4161A (read only) 838752 838752 0 0.0
(read/write) 125328 125328 0 0.0
.bss 123448 123448 0 0.0
.data 1880 1880 0 0.0
.text 838744 838744 0 0.0
esp32 all-clusters-app c3devkit (read only) 938890 938990 100 0.0
(read/write) 1400826 1400826 0 0.0
.dram0.bss 69496 69496 0 0.0
.dram0.data 14260 14260 0 0.0
.flash.rodata 198160 198160 0 0.0
.flash.text 938890 938990 100 0.0
.iram0.text 62056 62056 0 0.0
m5stack (read only) 987147 987147 0 0.0
(read/write) 465848 465848 0 0.0
.dram0.bss 74640 74640 0 0.0
.dram0.data 34024 34024 0 0.0
.flash.rodata 225056 225056 0 0.0
.flash.text 981763 981763 0 0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 679196 679196 0 0.0
.bss 76632 76632 0 0.0
.data 1884 1884 0 0.0
.text 594880 594880 0 0.0
lock k32w061+release (read/write) 683996 683996 0 0.0
.bss 76984 76984 0 0.0
.data 1928 1928 0 0.0
.text 599284 599284 0 0.0
linux all-clusters-app debug (read only) 2329193 2329273 80 0.0
(read/write) 140032 140032 0 0.0
.bss 54656 54656 0 0.0
.data 1168 1168 0 0.0
.data.rel.ro 78536 78536 0 0.0
.dynamic 592 592 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 204453 204453 0 0.0
.text 1962514 1962594 80 0.0
bridge-app debug+rpc (read only) 1705749 1705829 80 0.0
(read/write) 84328 84328 0 0.0
.bss 39088 39088 0 0.0
.data 1970 1970 0 0.0
.data.rel.ro 38120 38120 0 0.0
.dynamic 592 592 0 0.0
.got 3976 3976 0 0.0
.init 27 27 0 0.0
.init_array 560 560 0 0.0
.rodata 140332 140332 0 0.0
.text 1448869 1448949 80 0.0
chip-tool debug (read only) 7466189 7466349 160 0.0
(read/write) 197176 197176 0 0.0
.bss 32360 32360 0 0.0
.data 1152 1152 0 0.0
.data.rel.ro 157624 157624 0 0.0
.dynamic 608 608 0 0.0
.got 4784 4784 0 0.0
.init 27 27 0 0.0
.init_array 616 616 0 0.0
.rodata 414773 414773 0 0.0
.text 6650981 6651141 160 0.0
chip-tool-ipv6only arm64 (read only) 7390172 7390428 256 0.0
(read/write) 301313 301313 0 0.0
.bss 50641 50641 0 0.0
.data 1176 1176 0 0.0
.data.rel.ro 199304 199304 0 0.0
.dynamic 560 560 0 0.0
.got 46400 46400 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 397252 397252 0 0.0
.text 6355636 6355892 256 0.0
door-lock-app debug (read only) 1910457 1910537 80 0.0
(read/write) 110680 110680 0 0.0
.bss 42160 42160 0 0.0
.data 946 946 0 0.0
.data.rel.ro 62160 62160 0 0.0
.dynamic 592 592 0 0.0
.got 4112 4112 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 171858 171858 0 0.0
.text 1590082 1590162 80 0.0
lighting-app debug+rpc (read only) 2005001 2005097 96 0.0
(read/write) 115632 115632 0 0.0
.bss 43104 43104 0 0.0
.data 1368 1368 0 0.0
.data.rel.ro 65672 65672 0 0.0
.dynamic 608 608 0 0.0
.got 4144 4144 0 0.0
.init 27 27 0 0.0
.init_array 712 712 0 0.0
.rodata 163057 163057 0 0.0
.text 1687298 1687394 96 0.0
ota-provider-app debug (read only) 1714425 1714521 96 0.0
(read/write) 81368 81368 0 0.0
.bss 41120 41120 0 0.0
.data 1160 1160 0 0.0
.data.rel.ro 33560 33560 0 0.0
.dynamic 608 608 0 0.0
.got 4240 4240 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 151910 151910 0 0.0
.text 1443810 1443906 96 0.0
ota-requestor-app debug (read only) 1703081 1703161 80 0.0
(read/write) 83320 83320 0 0.0
.bss 42272 42272 0 0.0
.data 1128 1128 0 0.0
.data.rel.ro 34616 34616 0 0.0
.dynamic 592 592 0 0.0
.got 4040 4040 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 145047 145047 0 0.0
.text 1441138 1441218 80 0.0
shell debug (read only) 2302633 2302729 96 0.0
(read/write) 141584 141584 0 0.0
.bss 62048 62048 0 0.0
.data 768 768 0 0.0
.data.rel.ro 73072 73072 0 0.0
.dynamic 592 592 0 0.0
.got 4168 4168 0 0.0
.init 27 27 0 0.0
.init_array 904 904 0 0.0
.rodata 205170 205170 0 0.0
.text 1941042 1941138 96 0.0
thermostat-no-ble arm64 (read only) 2130892 2131052 160 0.0
(read/write) 140673 140673 0 0.0
.bss 57665 57665 0 0.0
.data 984 984 0 0.0
.data.rel.ro 74904 74904 0 0.0
.dynamic 560 560 0 0.0
.got 4152 4152 0 0.0
.init 24 24 0 0.0
.init_array 328 328 0 0.0
.rodata 132108 132108 0 0.0
.text 1780720 1780880 160 0.0
tv-app debug (read only) 2503017 2503193 176 0.0
(read/write) 139512 139512 0 0.0
.bss 57280 57280 0 0.0
.data 3168 3168 0 0.0
.data.rel.ro 73048 73048 0 0.0
.dynamic 592 592 0 0.0
.got 4528 4528 0 0.0
.init 27 27 0 0.0
.init_array 880 880 0 0.0
.rodata 196140 196140 0 0.0
.text 2133938 2134114 176 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2389944 2389944 0 0.0
.bss 188404 188404 0 0.0
.data 5280 5280 0 0.0
.text 1352544 1352544 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2349448 2349448 0 0.0
.bss 181000 181000 0 0.0
.data 5600 5600 0 0.0
.text 1312048 1312048 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2317408 2317408 0 0.0
.bss 180912 180912 0 0.0
.data 5584 5584 0 0.0
.text 1280008 1280008 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139648 1139648 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.text 103032 103032 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2303404 2303404 0 0.0
.bss 178164 178164 0 0.0
.data 5400 5400 0 0.0
.text 1265976 1265976 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 1005691 1005691 0 0.0
bss 121352 121352 0 0.0
rodata 118312 118312 0 0.0
text 687036 687036 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 974535 974535 0 0.0
bss 118540 118540 0 0.0
rodata 109700 109700 0 0.0
text 666652 666652 0 0.0
nrf52840dongle_nrf52840 (read/write) 1022383 1022383 0 0.0
bss 122716 122716 0 0.0
rodata 117200 117200 0 0.0
text 692608 692608 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 912306 912306 0 0.0
bss 117912 117912 0 0.0
rodata 111572 111572 0 0.0
text 602064 602064 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 940775 940775 0 0.0
bss 119720 119720 0 0.0
rodata 107540 107540 0 0.0
text 634944 634944 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 848234 848234 0 0.0
bss 116312 116312 0 0.0
rodata 100708 100708 0 0.0
text 550744 550744 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 527595 527595 0 0.0
bss 53632 53632 0 0.0
rodata 49976 49976 0 0.0
text 361016 361016 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 940195 940195 0 0.0
bss 119440 119440 0 0.0
rodata 106896 106896 0 0.0
text 635200 635200 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 935535 935535 0 0.0
bss 119444 119444 0 0.0
rodata 106188 106188 0 0.0
text 631236 631236 0 0.0
shell nrf52840dk_nrf52840 (read/write) 803911 803911 0 0.0
bss 111304 111304 0 0.0
rodata 78716 78716 0 0.0
text 536272 536272 0 0.0
p6 all-clusters-app default (read/write) 2464320 2464320 0 0.0
.bss 118024 118024 0 0.0
.data 2568 2568 0 0.0
.text 1422584 1422584 0 0.0
light-app default (read/write) 2367968 2367968 0 0.0
.bss 107664 107664 0 0.0
.data 2432 2432 0 0.0
.text 1326232 1326232 0 0.0
lock-app default (read/write) 2336776 2336776 0 0.0
.bss 107400 107400 0 0.0
.data 2400 2400 0 0.0
.text 1295040 1295040 0 0.0
qpg lighting-app qpg6105+debug (read only) 586352 586352 0 0.0
(read/write) 146936 146936 0 0.0
.bss 88920 88920 0 0.0
.data 1084 1084 0 0.0
.text 581032 581032 0 0.0
lock-app qpg6105+debug (read only) 535316 535316 0 0.0
(read/write) 146936 146936 0 0.0
.bss 88392 88392 0 0.0
.data 1028 1028 0 0.0
.text 529996 529996 0 0.0
persistent-storage-app qpg6105+debug (read only) 99520 99520 0 0.0
(read/write) 146940 146940 0 0.0
.bss 24004 24004 0 0.0
.data 176 176 0 0.0
.text 94200 94200 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 866702 866774 72 0.0
bss 88664 88664 0 0.0
noinit 37160 37160 0 0.0
text 608294 608368 74 0.0

@bzbarsky-apple bzbarsky-apple merged commit 1afe006 into project-chip:master Feb 9, 2022
@bzbarsky-apple bzbarsky-apple deleted the cluster-path branch February 9, 2022 07:12
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.

Create ClusterPath containing endpoint and cluster id
3 participants