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.

Sign up for GitHub

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

Jump to bottom

chip-tool: allow any fabricId, up to a total of 17 #17052

Merged
merged 2 commits into from
Apr 5, 2022
Merged

chip-tool: allow any fabricId, up to a total of 17 #17052

merged 2 commits into from
Apr 5, 2022

Conversation

bluebin14
Copy link
Contributor

Problem

chip-tool is hardcoded to use 3 fabric ids/controllers (1, 2 and 3). This does not even cover the basic spec requirement of 5 and necessitates ugly workarounds and using several Raspberry Pis when perfoming certification test cases. See also issue #16008

Change overview

Allow any fabricId, up to a total of 17 controllers. These only get allocated on request by using e.g. --commissioner-name 123 argument (can be hex or decimal), otherwise behavior is as before.

Testing

Tested manually using official multi-fabric tests.

@github-actions
Copy link

github-actions bot commented Apr 5, 2022 •
edited
Loading

PR #17052: Size comparison from fae3888 to 4ba7a09

Full report (2 builds for mbed, telink)
platform target config section fae3888 4ba7a09 change % change
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2363084 2363084 0 0.0
.bss 185052 185052 0 0.0
.data 5784 5784 0 0.0
.text 1325684 1325684 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 795232 795232 0 0.0
bss 70300 70300 0 0.0
noinit 40416 40416 0 0.0
text 564698 564698 0 0.0

@github-actions
Copy link

github-actions bot commented Apr 5, 2022 •
edited
Loading

PR #17052: Size comparison from fae3888 to 555ef31

Increases above 0.2%:

platform target config section fae3888 555ef31 change % change
linux chip-tool debug .bss 22016 22592 576 2.6
chip-tool-no-interactive-ipv6only arm64 .bss 40337 40897 560 1.4
Increases (2 builds for linux)
platform target config section fae3888 555ef31 change % change
linux chip-tool debug (read only) 10601045 10602277 1232 0.0
(read/write) 369752 370328 576 0.2
.bss 22016 22592 576 2.6
.got 4920 4928 8 0.2
.text 9238725 9239845 1120 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 10213932 10214844 912 0.0
(read/write) 489633 490209 576 0.1
.bss 40337 40897 560 1.4
.rodata 510172 510188 16 0.0
.text 8604996 8605812 816 0.0
Full report (28 builds for cc13x2_26x2, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section fae3888 555ef31 change % change
cc13x2_26x2 lock-ftd LP_CC2652R7 (read only) 670895 670895 0 0.0
(read/write) 180824 180824 0 0.0
.bss 81760 81760 0 0.0
.data 3164 3164 0 0.0
.rodata 80039 80039 0 0.0
.text 590376 590376 0 0.0
lock-mtd LP_CC2652R7 (read only) 620023 620023 0 0.0
(read/write) 154508 154508 0 0.0
.bss 77488 77488 0 0.0
.data 3164 3164 0 0.0
.rodata 79927 79927 0 0.0
.text 539608 539608 0 0.0
pump-app LP_CC2652R7 (read only) 690303 690303 0 0.0
(read/write) 162592 162592 0 0.0
.bss 82168 82168 0 0.0
.data 3196 3196 0 0.0
.rodata 82119 82119 0 0.0
.text 607700 607700 0 0.0
pump-controller-app LP_CC2652R7 (read only) 672543 672543 0 0.0
(read/write) 180080 180080 0 0.0
.bss 81896 81896 0 0.0
.data 3160 3160 0 0.0
.rodata 78455 78455 0 0.0
.text 593604 593604 0 0.0
efr32 lighting-app BRD4161A (read only) 919660 919660 0 0.0
(read/write) 129792 129792 0 0.0
.bss 127800 127800 0 0.0
.data 1992 1992 0 0.0
.text 919652 919652 0 0.0
BRD4161A+rpc (read only) 947572 947572 0 0.0
(read/write) 145740 145740 0 0.0
.bss 143568 143568 0 0.0
.data 2172 2172 0 0.0
.text 947564 947564 0 0.0
window-app BRD4161A (read only) 854860 854860 0 0.0
(read/write) 127816 127816 0 0.0
.bss 125944 125944 0 0.0
.data 1872 1872 0 0.0
.text 854852 854852 0 0.0
esp32 all-clusters-app c3devkit (read only) 988422 988422 0 0.0
(read/write) 1460922 1460922 0 0.0
.dram0.bss 62952 62952 0 0.0
.dram0.data 14196 14196 0 0.0
.flash.rodata 198288 198288 0 0.0
.flash.text 988422 988422 0 0.0
.iram0.text 62572 62572 0 0.0
m5stack (read only) 1040787 1040787 0 0.0
(read/write) 461912 461912 0 0.0
.dram0.bss 68480 68480 0 0.0
.dram0.data 34056 34056 0 0.0
.flash.rodata 227232 227232 0 0.0
.flash.text 1035403 1035403 0 0.0
.iram0.text 123415 123415 0 0.0
k32w light k32w061+release (read/write) 710780 710780 0 0.0
.bss 77968 77968 0 0.0
.data 1904 1904 0 0.0
.text 625108 625108 0 0.0
lock k32w061+release (read/write) 710168 710168 0 0.0
.bss 77960 77960 0 0.0
.data 1944 1944 0 0.0
.text 624464 624464 0 0.0
linux all-clusters-app debug (read only) 2595705 2595705 0 0.0
(read/write) 144872 144872 0 0.0
.bss 57664 57664 0 0.0
.data 1440 1440 0 0.0
.data.rel.ro 79880 79880 0 0.0
.dynamic 592 592 0 0.0
.got 4312 4312 0 0.0
.init 27 27 0 0.0
.init_array 960 960 0 0.0
.rodata 221285 221285 0 0.0
.text 2206402 2206402 0 0.0
bridge-app debug+rpc (read only) 1804485 1804485 0 0.0
(read/write) 90296 90296 0 0.0
.bss 44584 44584 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 38584 38584 0 0.0
.dynamic 592 592 0 0.0
.got 3928 3928 0 0.0
.init 27 27 0 0.0
.init_array 552 552 0 0.0
.rodata 147513 147513 0 0.0
.text 1540341 1540341 0 0.0
chip-tool debug (read only) 10601045 10602277 1232 0.0
(read/write) 369752 370328 576 0.2
.bss 22016 22592 576 2.6
.data 1040 1040 0 0.0
.data.rel.ro 340464 340464 0 0.0
.dynamic 624 624 0 0.0
.got 4920 4928 8 0.2
.init 27 27 0 0.0
.init_array 656 656 0 0.0
.rodata 536109 536109 0 0.0
.text 9238725 9239845 1120 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 10213932 10214844 912 0.0
(read/write) 489633 490209 576 0.1
.bss 40337 40897 560 1.4
.data 1128 1128 0 0.0
.data.rel.ro 387360 387360 0 0.0
.dynamic 560 560 0 0.0
.got 57016 57016 0 0.0
.init 24 24 0 0.0
.init_array 184 184 0 0.0
.rodata 510172 510188 16 0.0
.text 8604996 8605812 816 0.0
door-lock-app debug (read only) 2075777 2075777 0 0.0
(read/write) 118320 118320 0 0.0
.bss 47904 47904 0 0.0
.data 1152 1152 0 0.0
.data.rel.ro 63704 63704 0 0.0
.dynamic 592 592 0 0.0
.got 4256 4256 0 0.0
.init 27 27 0 0.0
.init_array 680 680 0 0.0
.rodata 185513 185513 0 0.0
.text 1736450 1736450 0 0.0
lighting-app debug+rpc (read only) 2255289 2255289 0 0.0
(read/write) 125312 125312 0 0.0
.bss 49216 49216 0 0.0
.data 1600 1600 0 0.0
.data.rel.ro 68808 68808 0 0.0
.dynamic 608 608 0 0.0
.got 4304 4304 0 0.0
.init 27 27 0 0.0
.init_array 760 760 0 0.0
.rodata 179625 179625 0 0.0
.text 1912386 1912386 0 0.0
ota-provider-app debug (read only) 2013697 2013697 0 0.0
(read/write) 113888 113888 0 0.0
.bss 47744 47744 0 0.0
.data 1384 1384 0 0.0
.data.rel.ro 59032 59032 0 0.0
.dynamic 608 608 0 0.0
.got 4456 4456 0 0.0
.init 27 27 0 0.0
.init_array 632 632 0 0.0
.rodata 171403 171403 0 0.0
.text 1687570 1687570 0 0.0
ota-requestor-app debug (read only) 2043145 2043145 0 0.0
(read/write) 117176 117176 0 0.0
.bss 48736 48736 0 0.0
.data 1608 1608 0 0.0
.data.rel.ro 61240 61240 0 0.0
.dynamic 592 592 0 0.0
.got 4296 4296 0 0.0
.init 27 27 0 0.0
.init_array 656 656 0 0.0
.rodata 167892 167892 0 0.0
.text 1718850 1718850 0 0.0
shell debug (read only) 2491433 2491433 0 0.0
(read/write) 148336 148336 0 0.0
.bss 67336 67336 0 0.0
.data 848 848 0 0.0
.data.rel.ro 74424 74424 0 0.0
.dynamic 592 592 0 0.0
.got 4160 4160 0 0.0
.init 27 27 0 0.0
.init_array 928 928 0 0.0
.rodata 212978 212978 0 0.0
.text 2119922 2119922 0 0.0
thermostat-no-ble arm64 (read only) 2326940 2326940 0 0.0
(read/write) 149521 149521 0 0.0
.bss 62977 62977 0 0.0
.data 1136 1136 0 0.0
.data.rel.ro 77760 77760 0 0.0
.dynamic 560 560 0 0.0
.got 4632 4632 0 0.0
.init 24 24 0 0.0
.init_array 368 368 0 0.0
.rodata 143340 143340 0 0.0
.text 1957760 1957760 0 0.0
tv-app debug (read only) 2764905 2764905 0 0.0
(read/write) 249984 249984 0 0.0
.bss 165360 165360 0 0.0
.data 3392 3392 0 0.0
.data.rel.ro 75040 75040 0 0.0
.dynamic 592 592 0 0.0
.got 4672 4672 0 0.0
.init 27 27 0 0.0
.init_array 904 904 0 0.0
.rodata 211467 211467 0 0.0
.text 2374610 2374610 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2363084 2363084 0 0.0
.bss 185052 185052 0 0.0
.data 5784 5784 0 0.0
.text 1325684 1325684 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1149827 1149827 0 0.0
bss 135812 135812 0 0.0
rodata 145084 145084 0 0.0
text 790312 790312 0 0.0
p6 all-clusters-app default (read/write) 2507928 2507928 0 0.0
.bss 118480 118480 0 0.0
.data 2672 2672 0 0.0
.text 1466192 1466192 0 0.0
light-app default (read/write) 2409120 2409120 0 0.0
.bss 111944 111944 0 0.0
.data 2528 2528 0 0.0
.text 1367384 1367384 0 0.0
lock-app default (read/write) 2372816 2372816 0 0.0
.bss 111688 111688 0 0.0
.data 2488 2488 0 0.0
.text 1331080 1331080 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 795232 795232 0 0.0
bss 70300 70300 0 0.0
noinit 40416 40416 0 0.0
text 564698 564698 0 0.0

@woody-apple
Copy link
Contributor

Fast tracking tooling updates

@woody-apple woody-apple merged commit 1fb5900 into project-chip:master Apr 5, 2022
@bluebin14 bluebin14 deleted the fix-chip-tool branch April 5, 2022 15:52
chencheung pushed a commit to chencheung/connectedhomeip that referenced this pull request Apr 6, 2022
@bluebin14 @chencheung
chip-tool: allow any fabricId, up to a total of 17 (project-chip#17052)
bd22fc8 
* chip-tool: allow any fabricId, up to a total of 17

* chip-tool: fix compiler warning on Linux
chencheung pushed a commit to chencheung/connectedhomeip that referenced this pull request Apr 6, 2022
@bluebin14 @chencheung
chip-tool: allow any fabricId, up to a total of 17 (project-chip#17052)
c7723b3 
* chip-tool: allow any fabricId, up to a total of 17

* chip-tool: fix compiler warning on Linux
andrei-menzopol pushed a commit to andrei-menzopol/connectedhomeip that referenced this pull request Apr 14, 2022
@bluebin14 @andrei-menzopol
chip-tool: allow any fabricId, up to a total of 17 (project-chip#17052)
397bcfb 
* chip-tool: allow any fabricId, up to a total of 17

* chip-tool: fix compiler warning on Linux
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@woody-apple woody-apple woody-apple approved these changes

@anush-apple anush-apple Awaiting requested review from anush-apple

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@bzbarsky-apple bzbarsky-apple Awaiting requested review from bzbarsky-apple

@carol-apple carol-apple Awaiting requested review from carol-apple

@cecille cecille Awaiting requested review from cecille

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

@franck-apple franck-apple Awaiting requested review from franck-apple

@gjc13 gjc13 Awaiting requested review from gjc13

@harimau-qirex harimau-qirex Awaiting requested review from harimau-qirex

@hawk248 hawk248 Awaiting requested review from hawk248

@holbrookt holbrookt Awaiting requested review from holbrookt

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@isiu-apple isiu-apple Awaiting requested review from isiu-apple

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@kghost kghost Awaiting requested review from kghost

@lazarkov lazarkov Awaiting requested review from lazarkov

@LuDuda LuDuda Awaiting requested review from LuDuda

@lzgrablic02 lzgrablic02 Awaiting requested review from lzgrablic02

@msandstedt msandstedt Awaiting requested review from msandstedt

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@sagar-apple sagar-apple Awaiting requested review from sagar-apple

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tcarmelveilleux tcarmelveilleux Awaiting requested review from tcarmelveilleux

@tecimovic tecimovic Awaiting requested review from tecimovic

@turon turon Awaiting requested review from turon

@vijs vijs Awaiting requested review from vijs

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wbschiller wbschiller Awaiting requested review from wbschiller

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yunhanw-google yunhanw-google Awaiting requested review from yunhanw-google

Assignees
No one assigned
Labels
examples fast track review - pending
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bluebin14 @woody-apple