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

Mark fabric-scoped commands in the XML and use that in codegen. #21022

Merged

Conversation

bzbarsky-apple
Copy link
Contributor

Fixes #20811

Problem

Hardcoding which commands are fabric-scoped. This does not allow non-standard things to be fabric-scoped.

Change overview

Use XML data for this instead.

Testing

Looked at generated code.

@github-actions
Copy link

github-actions bot commented Jul 20, 2022

PR #21022: Size comparison from a3390b1 to f5c050f

Increases above 0.2%:

platform target config section a3390b1 f5c050f change % change
linux all-clusters-app debug .rodata 264779 265419 640 0.2
all-clusters-minimal-app debug .rodata 265675 266315 640 0.2
bridge-app debug+rpc .rodata 198184 198824 640 0.3
lighting-app debug+rpc .rodata 214000 214640 640 0.3
lock-app debug .rodata 229008 229648 640 0.3
ota-provider-app debug .rodata 203800 204472 672 0.3
ota-requestor-app debug .rodata 207552 208192 640 0.3
shell debug .rodata 228082 228722 640 0.3
tv-app debug .rodata 249512 250152 640 0.3
tv-casting-app debug .rodata 333601 334273 672 0.2
Increases (41 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, nrfconnect, p6, telink)
platform target config section a3390b1 f5c050f change % change
bl602 lighting-app bl602 (read/write) 1379514 1379538 24 0.0
.text 1050152 1050176 24 0.0
bl602+rpc (read/write) 1424922 1424946 24 0.0
.text 1081808 1081832 24 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 668119 668127 8 0.0
.text 579484 579492 8 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 633719 633735 16 0.0
.text 555844 555860 16 0.0
lock-ftd LP_CC2652R7 (read only) 671227 671235 8 0.0
.text 594304 594312 8 0.0
lock-mtd LP_CC2652R7 (read only) 653503 653519 16 0.0
.text 551832 551848 16 0.0
pump-app LP_CC2652R7 (read only) 680227 680235 8 0.0
.text 590932 590940 8 0.0
pump-controller-app LP_CC2652R7 (read only) 666003 666011 8 0.0
.text 580848 580856 8 0.0
shell LP_CC2652R7 (read only) 660594 660602 8 0.0
.text 575188 575196 8 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 581546 581562 16 0.0
.app_xip_area 460096 460112 16 0.0
lock cyw930739m2evb_01 (read/write) 587462 587470 8 0.0
.app_xip_area 461284 461292 8 0.0
efr32 lighting-app BRD4161A (read/write) 1085936 1085952 16 0.0
.text 950808 950824 16 0.0
BRD4161A+rpc (read/write) 1140212 1140244 32 0.0
.text 988196 988228 32 0.0
BRD4161A+rs911x (read/write) 972052 972068 16 0.0
.text 808472 808488 16 0.0
lock-app BRD4161A+wf200 (read/write) 1127560 1127576 16 0.0
.text 981332 981348 16 0.0
window-app BRD4161A (read/write) 1079428 1079444 16 0.0
.text 942800 942816 16 0.0
esp32 all-clusters-app c3devkit (read only) 1021766 1021786 20 0.0
.flash.text 1021766 1021786 20 0.0
m5stack (read only) 1075515 1075539 24 0.0
.flash.text 1070131 1070155 24 0.0
k32w light k32w061+release (read/write) 660328 660344 16 0.0
.text 582996 583012 16 0.0
lock k32w061+release (read/write) 687308 687324 16 0.0
.text 609492 609508 16 0.0
linux all-clusters-app debug (read only) 2977953 2979457 1504 0.1
.rodata 264779 265419 640 0.2
.text 2535202 2536066 864 0.0
all-clusters-minimal-app debug (read only) 2823905 2825393 1488 0.1
.rodata 265675 266315 640 0.2
.text 2382914 2383762 848 0.0
bridge-app debug+rpc (read only) 2324017 2325505 1488 0.1
.rodata 198184 198824 640 0.3
.text 1963810 1964658 848 0.0
chip-tool debug (read only) 10335705 10337193 1488 0.0
.rodata 517045 517685 640 0.1
.text 8367444 8368292 848 0.0
chip-tool-ipv6only arm64 (read only) 9763524 9765500 1976 0.0
.rodata 453364 453676 312 0.1
.text 7728196 7729860 1664 0.0
lighting-app debug+rpc (read only) 2561761 2563265 1504 0.1
.rodata 214000 214640 640 0.3
.text 2177506 2178370 864 0.0
lock-app debug (read only) 2526657 2528145 1488 0.1
.rodata 229008 229648 640 0.3
.text 2132194 2133042 848 0.0
ota-provider-app debug (read only) 2330241 2331761 1520 0.1
.rodata 203800 204472 672 0.3
.text 1963378 1964226 848 0.0
ota-requestor-app debug (read only) 2448825 2450329 1504 0.1
.rodata 207552 208192 640 0.3
.text 2069810 2070674 864 0.0
shell debug (read only) 2564465 2565953 1488 0.1
.rodata 228082 228722 640 0.3
.text 2178994 2179842 848 0.0
thermostat-no-ble arm64 (read only) 2338060 2340036 1976 0.1
.rodata 138964 139276 312 0.2
.text 1962448 1964112 1664 0.1
tv-app debug (read only) 3112297 3113785 1488 0.0
.rodata 249512 250152 640 0.3
.text 2674530 2675378 848 0.0
tv-casting-app debug (read only) 5365833 5367369 1536 0.0
.rodata 333601 334273 672 0.2
.text 4765874 4766738 864 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1176035 1176051 16 0.0
text 812024 812036 12 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1156099 1156115 16 0.0
text 801336 801348 12 0.0
p6 all-clusters-app default (read/write) 1685700 1685716 16 0.0
.text 1526096 1526112 16 0.0
all-clusters-minimal-app default (read/write) 1629828 1629844 16 0.0
.text 1470944 1470960 16 0.0
light-app default (read/write) 1549828 1549844 16 0.0
.text 1399248 1399264 16 0.0
lock-app default (read/write) 1587420 1587436 16 0.0
.text 1432368 1432384 16 0.0
telink light-switch-app tlsr9518adk80d (read/write) 798396 798412 16 0.0
text 566532 566546 14 0.0
lighting-app tlsr9518adk80d (read/write) 818436 818460 24 0.0
text 583072 583092 20 0.0
Decreases (6 builds for cc13x2_26x2)
platform target config section a3390b1 f5c050f change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read/write) 183128 183120 -8 -0.0
lock-ftd LP_CC2652R7 (read/write) 170196 170188 -8 -0.0
lock-mtd LP_CC2652R7 (read/write) 183608 183592 -16 -0.0
pump-app LP_CC2652R7 (read/write) 162052 162044 -8 -0.0
pump-controller-app LP_CC2652R7 (read/write) 176396 176388 -8 -0.0
shell LP_CC2652R7 (read/write) 186156 186148 -8 -0.0
Full report (43 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section a3390b1 f5c050f change % change
bl602 lighting-app bl602 (read/write) 1379514 1379538 24 0.0
.bss 116970 116970 0 0.0
.data 4480 4480 0 0.0
.text 1050152 1050176 24 0.0
bl602+rpc (read/write) 1424922 1424946 24 0.0
.bss 124418 124418 0 0.0
.data 4600 4600 0 0.0
.text 1081808 1081832 24 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 668119 668127 8 0.0
(read/write) 183128 183120 -8 -0.0
.bss 74140 74140 0 0.0
.data 3356 3356 0 0.0
.rodata 88319 88319 0 0.0
.text 579484 579492 8 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 633719 633735 16 0.0
(read/write) 157708 157708 0 0.0
.bss 73436 73436 0 0.0
.data 3356 3356 0 0.0
.rodata 77551 77551 0 0.0
.text 555844 555860 16 0.0
lock-ftd LP_CC2652R7 (read only) 671227 671235 8 0.0
(read/write) 170196 170188 -8 -0.0
.bss 71204 71204 0 0.0
.data 3280 3280 0 0.0
.rodata 76443 76443 0 0.0
.text 594304 594312 8 0.0
lock-mtd LP_CC2652R7 (read only) 653503 653519 16 0.0
(read/write) 183608 183592 -16 -0.0
.bss 66892 66892 0 0.0
.data 3280 3280 0 0.0
.rodata 101191 101191 0 0.0
.text 551832 551848 16 0.0
pump-app LP_CC2652R7 (read only) 680227 680235 8 0.0
(read/write) 162052 162044 -8 -0.0
.bss 71292 71292 0 0.0
.data 3280 3280 0 0.0
.rodata 88811 88811 0 0.0
.text 590932 590940 8 0.0
pump-controller-app LP_CC2652R7 (read only) 666003 666011 8 0.0
(read/write) 176396 176388 -8 -0.0
.bss 71412 71412 0 0.0
.data 3276 3276 0 0.0
.rodata 84675 84675 0 0.0
.text 580848 580856 8 0.0
shell LP_CC2652R7 (read only) 660594 660602 8 0.0
(read/write) 186156 186148 -8 -0.0
.bss 76444 76444 0 0.0
.data 3360 3360 0 0.0
.rodata 85090 85090 0 0.0
.text 575188 575196 8 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 581546 581562 16 0.0
.app_xip_area 460096 460112 16 0.0
.bss 64244 64244 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) 587462 587470 8 0.0
.app_xip_area 461284 461292 8 0.0
.bss 68972 68972 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) 584910 584910 0 0.0
.app_xip_area 464308 464308 0 0.0
.bss 63452 63452 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) 1085936 1085952 16 0.0
.bss 133060 133060 0 0.0
.data 2048 2048 0 0.0
.text 950808 950824 16 0.0
BRD4161A+rpc (read/write) 1140212 1140244 32 0.0
.bss 149732 149732 0 0.0
.data 2260 2260 0 0.0
.text 988196 988228 32 0.0
BRD4161A+rs911x (read/write) 972052 972068 16 0.0
.bss 161512 161512 0 0.0
.data 2048 2048 0 0.0
.text 808472 808488 16 0.0
lock-app BRD4161A+wf200 (read/write) 1127560 1127576 16 0.0
.bss 144152 144152 0 0.0
.data 2056 2056 0 0.0
.text 981332 981348 16 0.0
window-app BRD4161A (read/write) 1079428 1079444 16 0.0
.bss 134532 134532 0 0.0
.data 2076 2076 0 0.0
.text 942800 942816 16 0.0
esp32 all-clusters-app c3devkit (read only) 1021766 1021786 20 0.0
(read/write) 1486130 1486130 0 0.0
.dram0.bss 70088 70088 0 0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 216000 216000 0 0.0
.flash.text 1021766 1021786 20 0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1075515 1075539 24 0.0
(read/write) 488160 488160 0 0.0
.dram0.bss 75608 75608 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 246412 246412 0 0.0
.flash.text 1070131 1070155 24 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 660328 660344 16 0.0
.bss 69540 69540 0 0.0
.data 1992 1992 0 0.0
.text 582996 583012 16 0.0
lock k32w061+release (read/write) 687308 687324 16 0.0
.bss 70012 70012 0 0.0
.data 2004 2004 0 0.0
.text 609492 609508 16 0.0
linux all-clusters-app debug (read only) 2977953 2979457 1504 0.1
(read/write) 155312 155312 0 0.0
.bss 61824 61824 0 0.0
.data 2064 2064 0 0.0
.data.rel.ro 85160 85160 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 264779 265419 640 0.2
.text 2535202 2536066 864 0.0
all-clusters-minimal-app debug (read only) 2823905 2825393 1488 0.1
(read/write) 146984 146984 0 0.0
.bss 61024 61024 0 0.0
.data 2064 2064 0 0.0
.data.rel.ro 77720 77720 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 265675 266315 640 0.2
.text 2382914 2383762 848 0.0
bridge-app debug+rpc (read only) 2324017 2325505 1488 0.1
(read/write) 125768 125768 0 0.0
.bss 49088 49088 0 0.0
.data 3824 3824 0 0.0
.data.rel.ro 67096 67096 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 198184 198824 640 0.3
.text 1963810 1964658 848 0.0
chip-tool debug (read only) 10335705 10337193 1488 0.0
(read/write) 630888 630888 0 0.0
.bss 24760 24760 0 0.0
.data 3266 3266 0 0.0
.data.rel.ro 596472 596472 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 517045 517685 640 0.1
.text 8367444 8368292 848 0.0
chip-tool-ipv6only arm64 (read only) 9763524 9765500 1976 0.0
(read/write) 678401 678401 0 0.0
.bss 32833 32833 0 0.0
.data 3272 3272 0 0.0
.data.rel.ro 623808 623808 0 0.0
.dynamic 560 560 0 0.0
.got 13536 13536 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 453364 453676 312 0.1
.text 7728196 7729860 1664 0.0
lighting-app debug+rpc (read only) 2561761 2563265 1504 0.1
(read/write) 129856 129856 0 0.0
.bss 49664 49664 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 72248 72248 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 214000 214640 640 0.3
.text 2177506 2178370 864 0.0
lock-app debug (read only) 2526657 2528145 1488 0.1
(read/write) 124808 124808 0 0.0
.bss 48032 48032 0 0.0
.data 1712 1712 0 0.0
.data.rel.ro 69208 69208 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 229008 229648 640 0.3
.text 2132194 2133042 848 0.0
ota-provider-app debug (read only) 2330241 2331761 1520 0.1
(read/write) 118608 118608 0 0.0
.bss 47680 47680 0 0.0
.data 1936 1936 0 0.0
.data.rel.ro 63192 63192 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 203800 204472 672 0.3
.text 1963378 1964226 848 0.0
ota-requestor-app debug (read only) 2448825 2450329 1504 0.1
(read/write) 125544 125544 0 0.0
.bss 50048 50048 0 0.0
.data 2240 2240 0 0.0
.data.rel.ro 67416 67416 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 207552 208192 640 0.3
.text 2069810 2070674 864 0.0
shell debug (read only) 2564465 2565953 1488 0.1
(read/write) 141336 141336 0 0.0
.bss 57608 57608 0 0.0
.data 1248 1248 0 0.0
.data.rel.ro 76792 76792 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 228082 228722 640 0.3
.text 2178994 2179842 848 0.0
thermostat-no-ble arm64 (read only) 2338060 2340036 1976 0.1
(read/write) 141233 141233 0 0.0
.bss 55265 55265 0 0.0
.data 1672 1672 0 0.0
.data.rel.ro 75552 75552 0 0.0
.dynamic 560 560 0 0.0
.got 4976 4976 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 138964 139276 312 0.2
.text 1962448 1964112 1664 0.1
tv-app debug (read only) 3112297 3113785 1488 0.0
(read/write) 256960 256960 0 0.0
.bss 167064 167064 0 0.0
.data 4736 4736 0 0.0
.data.rel.ro 78728 78728 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 249512 250152 640 0.3
.text 2674530 2675378 848 0.0
tv-casting-app debug (read only) 5365833 5367369 1536 0.0
(read/write) 158264 158264 0 0.0
.bss 51256 51256 0 0.0
.data 2432 2432 0 0.0
.data.rel.ro 98288 98288 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 333601 334273 672 0.2
.text 4765874 4766738 864 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2448688 2448688 0 0.0
.bss 213948 213948 0 0.0
.data 5872 5872 0 0.0
.text 1411332 1411332 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1176035 1176051 16 0.0
bss 142908 142908 0 0.0
rodata 142204 142204 0 0.0
text 812024 812036 12 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1156099 1156115 16 0.0
bss 142144 142144 0 0.0
rodata 133748 133748 0 0.0
text 801336 801348 12 0.0
p6 all-clusters-app default (read only) 882128 882128 0 0.0
(read/write) 1685700 1685716 16 0.0
.bss 148568 148568 0 0.0
.data 2648 2648 0 0.0
.text 1526096 1526112 16 0.0
all-clusters-minimal-app default (read only) 882848 882848 0 0.0
(read/write) 1629828 1629844 16 0.0
.bss 147848 147848 0 0.0
.data 2648 2648 0 0.0
.text 1470944 1470960 16 0.0
light-app default (read only) 891152 891152 0 0.0
(read/write) 1549828 1549844 16 0.0
.bss 139752 139752 0 0.0
.data 2440 2440 0 0.0
.text 1399248 1399264 16 0.0
lock-app default (read only) 886680 886680 0 0.0
(read/write) 1587420 1587436 16 0.0
.bss 144208 144208 0 0.0
.data 2456 2456 0 0.0
.text 1432368 1432384 16 0.0
telink light-switch-app tlsr9518adk80d (read/write) 798396 798412 16 0.0
bss 70584 70584 0 0.0
noinit 40416 40416 0 0.0
text 566532 566546 14 0.0
lighting-app tlsr9518adk80d (read/write) 818436 818460 24 0.0
bss 71428 71428 0 0.0
noinit 40416 40416 0 0.0
text 583072 583092 20 0.0

@woody-apple woody-apple enabled auto-merge (squash) July 20, 2022 21:35
@woody-apple woody-apple merged commit 6d54807 into project-chip:master Jul 21, 2022
@bzbarsky-apple bzbarsky-apple deleted the fabric-scoped-commands branch July 21, 2022 12:56
andy31415 pushed a commit that referenced this pull request Jul 21, 2022
isiu-apple pushed a commit to isiu-apple/connectedhomeip that referenced this pull request Sep 16, 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.

Ensure that all Fabric-scoped commands respond with UNSUPPORTED_ACCESS if there is no accessing fabric
3 participants