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

Fix Dependency Loop Error Introduced with #14676 #15127

Conversation

emargolis
Copy link
Contributor

Problem

Described in #15121

Change overview

Fixed

Testing

existing tests

@github-actions
Copy link

github-actions bot commented Feb 13, 2022

PR #15127: Size comparison from 5cb8800 to 35ffbea

Full report (34 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 5cb8800 35ffbea change % change
cyw30739 light cyw930739m2evb_01 (read/write) 592782 592782 0 0.0
.app_xip_area 498260 498260 0 0.0
.bss 77220 77220 0 0.0
.data 644 644 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 550850 550850 0 0.0
.app_xip_area 457896 457896 0 0.0
.bss 75692 75692 0 0.0
.data 608 608 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 569362 569362 0 0.0
.app_xip_area 467152 467152 0 0.0
.bss 84620 84620 0 0.0
.data 552 552 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 909216 909216 0 0.0
(read/write) 127384 127384 0 0.0
.bss 125352 125352 0 0.0
.data 2032 2032 0 0.0
.text 909208 909208 0 0.0
BRD4161A+rpc (read only) 937912 937912 0 0.0
(read/write) 144304 144304 0 0.0
.bss 142128 142128 0 0.0
.data 2172 2172 0 0.0
.text 937904 937904 0 0.0
window-app BRD4161A (read only) 844388 844388 0 0.0
(read/write) 125444 125444 0 0.0
.bss 123544 123544 0 0.0
.data 1900 1900 0 0.0
.text 844380 844380 0 0.0
esp32 all-clusters-app c3devkit (read only) 944966 944966 0 0.0
(read/write) 1398610 1398610 0 0.0
.dram0.bss 66408 66408 0 0.0
.dram0.data 14268 14268 0 0.0
.flash.rodata 199032 199032 0 0.0
.flash.text 944966 944966 0 0.0
.iram0.text 62056 62056 0 0.0
m5stack (read only) 994959 994959 0 0.0
(read/write) 463896 463896 0 0.0
.dram0.bss 71552 71552 0 0.0
.dram0.data 34064 34064 0 0.0
.flash.rodata 226152 226152 0 0.0
.flash.text 989575 989575 0 0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 683252 683252 0 0.0
.bss 76656 76656 0 0.0
.data 1904 1904 0 0.0
.text 598892 598892 0 0.0
lock k32w061+release (read/write) 688804 688804 0 0.0
.bss 77048 77048 0 0.0
.data 1948 1948 0 0.0
.text 604008 604008 0 0.0
linux chip-tool-ipv6only arm64 (read only) 8245380 8245380 0 0.0
(read/write) 353377 353377 0 0.0
.bss 50497 50497 0 0.0
.data 1216 1216 0 0.0
.data.rel.ro 248800 248800 0 0.0
.dynamic 560 560 0 0.0
.got 49064 49064 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 436108 436108 0 0.0
.text 7048004 7048004 0 0.0
thermostat-no-ble arm64 (read only) 2151132 2151132 0 0.0
(read/write) 140689 140689 0 0.0
.bss 57521 57521 0 0.0
.data 1032 1032 0 0.0
.data.rel.ro 75024 75024 0 0.0
.dynamic 560 560 0 0.0
.got 4144 4144 0 0.0
.init 24 24 0 0.0
.init_array 328 328 0 0.0
.rodata 132908 132908 0 0.0
.text 1799968 1799968 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2398112 2398112 0 0.0
.bss 188476 188476 0 0.0
.data 5320 5320 0 0.0
.text 1360712 1360712 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2360344 2360344 0 0.0
.bss 181088 181088 0 0.0
.data 5624 5624 0 0.0
.text 1322944 1322944 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2323872 2323872 0 0.0
.bss 180976 180976 0 0.0
.data 5600 5600 0 0.0
.text 1286472 1286472 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) 2308900 2308900 0 0.0
.bss 178228 178228 0 0.0
.data 5424 5424 0 0.0
.text 1271472 1271472 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 1016131 1016131 0 0.0
bss 121412 121412 0 0.0
rodata 120096 120096 0 0.0
text 695660 695660 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 985407 985407 0 0.0
bss 118600 118600 0 0.0
rodata 111620 111620 0 0.0
text 675548 675548 0 0.0
nrf52840dongle_nrf52840 (read/write) 1031991 1031991 0 0.0
bss 122800 122800 0 0.0
rodata 118976 118976 0 0.0
text 700280 700280 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 922774 922774 0 0.0
bss 117976 117976 0 0.0
rodata 113336 113336 0 0.0
text 610684 610684 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 945859 945859 0 0.0
bss 119784 119784 0 0.0
rodata 108856 108856 0 0.0
text 638692 638692 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 853386 853386 0 0.0
bss 116376 116376 0 0.0
rodata 102028 102028 0 0.0
text 554492 554492 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) 944679 944679 0 0.0
bss 119504 119504 0 0.0
rodata 107812 107812 0 0.0
text 638748 638748 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 940623 940623 0 0.0
bss 119508 119508 0 0.0
rodata 107508 107508 0 0.0
text 634988 634988 0 0.0
shell nrf52840dk_nrf52840 (read/write) 807179 807179 0 0.0
bss 111216 111216 0 0.0
rodata 79104 79104 0 0.0
text 539280 539280 0 0.0
p6 all-clusters-app default (read/write) 2483136 2483136 0 0.0
.bss 117744 117744 0 0.0
.data 2672 2672 0 0.0
.text 1441400 1441400 0 0.0
light-app default (read/write) 2389952 2389952 0 0.0
.bss 107392 107392 0 0.0
.data 2520 2520 0 0.0
.text 1348216 1348216 0 0.0
lock-app default (read/write) 2353416 2353416 0 0.0
.bss 107112 107112 0 0.0
.data 2480 2480 0 0.0
.text 1311680 1311680 0 0.0
qpg lighting-app qpg6105+debug (read only) 595044 595044 0 0.0
(read/write) 146936 146936 0 0.0
.bss 88936 88936 0 0.0
.data 1108 1108 0 0.0
.text 589724 589724 0 0.0
lock-app qpg6105+debug (read only) 560772 560772 0 0.0
(read/write) 146936 146936 0 0.0
.bss 88920 88920 0 0.0
.data 1060 1060 0 0.0
.text 555452 555452 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) 875102 875102 0 0.0
bss 88736 88736 0 0.0
noinit 37160 37160 0 0.0
text 614832 614832 0 0.0

Copy link
Contributor

@andy31415 andy31415 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approve as a fix for flaky builds, however for long term maintainability more work is required' Hardcoding things like 32 instead of using constants because it is hard to include things should be solvable by having separate includes and dependencies.

Moved some of the Spake2p defines to the CHIPCryptoPAL.h
@github-actions
Copy link

github-actions bot commented Feb 16, 2022

PR #15127: Size comparison from 6e55dee to 5c33603

Increases (4 builds for mbed)
platform target config section 6e55dee 5c33603 change % change
mbed all-clusters-app CY8CPROTO_062_4343W+release (read/write) 2428412 2428468 56 0.0
.text 1390984 1391040 56 0.0
lighting-app CY8CPROTO_062_4343W+release (read/write) 2391612 2391668 56 0.0
.text 1354184 1354240 56 0.0
lock-app CY8CPROTO_062_4343W+release (read/write) 2327056 2327120 64 0.0
.text 1289656 1289720 64 0.0
shell CY8CPROTO_062_4343W+release (read/write) 2317820 2317884 64 0.0
.text 1280392 1280456 64 0.0
Full report (33 builds for cyw30739, efr32, esp32, k32w, linux, mbed, p6, qpg, telink)
platform target config section 6e55dee 5c33603 change % change
cyw30739 light cyw930739m2evb_01 (read/write) 597258 597258 0 0.0
.app_xip_area 501176 501176 0 0.0
.bss 78780 78780 0 0.0
.data 644 644 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 555202 555202 0 0.0
.app_xip_area 460688 460688 0 0.0
.bss 77252 77252 0 0.0
.data 608 608 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 576310 576310 0 0.0
.app_xip_area 472364 472364 0 0.0
.bss 86356 86356 0 0.0
.data 552 552 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 914108 914108 0 0.0
(read/write) 129524 129524 0 0.0
.bss 127488 127488 0 0.0
.data 2036 2036 0 0.0
.text 914100 914100 0 0.0
BRD4161A+rpc (read only) 942792 942792 0 0.0
(read/write) 146440 146440 0 0.0
.bss 144264 144264 0 0.0
.data 2176 2176 0 0.0
.text 942784 942784 0 0.0
window-app BRD4161A (read only) 847960 847960 0 0.0
(read/write) 127416 127416 0 0.0
.bss 125512 125512 0 0.0
.data 1904 1904 0 0.0
.text 847952 847952 0 0.0
esp32 all-clusters-app c3devkit (read only) 947604 947604 0 0.0
(read/write) 1401130 1401130 0 0.0
.dram0.bss 68296 68296 0 0.0
.dram0.data 14268 14268 0 0.0
.flash.rodata 199664 199664 0 0.0
.flash.text 947604 947604 0 0.0
.iram0.text 62056 62056 0 0.0
m5stack (read only) 997331 997331 0 0.0
(read/write) 466380 466380 0 0.0
.dram0.bss 73432 73432 0 0.0
.dram0.data 34064 34064 0 0.0
.flash.rodata 226756 226756 0 0.0
.flash.text 991947 991947 0 0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 691232 691232 0 0.0
.bss 78384 78384 0 0.0
.data 1912 1912 0 0.0
.text 605136 605136 0 0.0
lock k32w061+release (read/write) 693848 693848 0 0.0
.bss 78600 78600 0 0.0
.data 1952 1952 0 0.0
.text 607496 607496 0 0.0
linux all-clusters-app debug (read only) 2375169 2375169 0 0.0
(read/write) 151072 151072 0 0.0
.bss 65376 65376 0 0.0
.data 1328 1328 0 0.0
.data.rel.ro 78664 78664 0 0.0
.dynamic 592 592 0 0.0
.got 4160 4160 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 206181 206181 0 0.0
.text 2006050 2006050 0 0.0
bridge-app debug+rpc (read only) 1730253 1730253 0 0.0
(read/write) 94536 94536 0 0.0
.bss 49296 49296 0 0.0
.data 2034 2034 0 0.0
.data.rel.ro 38080 38080 0 0.0
.dynamic 592 592 0 0.0
.got 3952 3952 0 0.0
.init 27 27 0 0.0
.init_array 560 560 0 0.0
.rodata 142092 142092 0 0.0
.text 1471829 1471829 0 0.0
chip-tool debug (read only) 8578997 8578997 0 0.0
(read/write) 254816 254816 0 0.0
.bss 40712 40712 0 0.0
.data 1184 1184 0 0.0
.data.rel.ro 206896 206896 0 0.0
.dynamic 608 608 0 0.0
.got 4784 4784 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 459701 459701 0 0.0
.text 7602885 7602885 0 0.0
chip-tool-ipv6only arm64 (read only) 8332196 8332196 0 0.0
(read/write) 362609 362609 0 0.0
.bss 58961 58961 0 0.0
.data 1216 1216 0 0.0
.data.rel.ro 249368 249368 0 0.0
.dynamic 560 560 0 0.0
.got 49272 49272 0 0.0
.init 24 24 0 0.0
.init_array 200 200 0 0.0
.rodata 435756 435756 0 0.0
.text 7133748 7133748 0 0.0
door-lock-app debug (read only) 1941953 1941953 0 0.0
(read/write) 120504 120504 0 0.0
.bss 51984 51984 0 0.0
.data 1010 1010 0 0.0
.data.rel.ro 62080 62080 0 0.0
.dynamic 592 592 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 173394 173394 0 0.0
.text 1619698 1619698 0 0.0
lighting-app debug+rpc (read only) 2068217 2068217 0 0.0
(read/write) 125784 125784 0 0.0
.bss 53024 53024 0 0.0
.data 1400 1400 0 0.0
.data.rel.ro 65832 65832 0 0.0
.dynamic 608 608 0 0.0
.got 4168 4168 0 0.0
.init 27 27 0 0.0
.init_array 720 720 0 0.0
.rodata 166033 166033 0 0.0
.text 1747090 1747090 0 0.0
ota-provider-app debug (read only) 1875417 1875417 0 0.0
(read/write) 116216 116216 0 0.0
.bss 51840 51840 0 0.0
.data 1224 1224 0 0.0
.data.rel.ro 57480 57480 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 158275 158275 0 0.0
.text 1566178 1566178 0 0.0
ota-requestor-app debug (read only) 1888521 1888521 0 0.0
(read/write) 117632 117632 0 0.0
.bss 52256 52256 0 0.0
.data 1160 1160 0 0.0
.data.rel.ro 58744 58744 0 0.0
.dynamic 592 592 0 0.0
.got 4200 4200 0 0.0
.init 27 27 0 0.0
.init_array 632 632 0 0.0
.rodata 153044 153044 0 0.0
.text 1586018 1586018 0 0.0
shell debug (read only) 2349865 2349865 0 0.0
(read/write) 153424 153424 0 0.0
.bss 73696 73696 0 0.0
.data 832 832 0 0.0
.data.rel.ro 73224 73224 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 207186 207186 0 0.0
.text 1985874 1985874 0 0.0
thermostat-no-ble arm64 (read only) 2162044 2162044 0 0.0
(read/write) 150737 150737 0 0.0
.bss 67489 67489 0 0.0
.data 1032 1032 0 0.0
.data.rel.ro 75024 75024 0 0.0
.dynamic 560 560 0 0.0
.got 4208 4208 0 0.0
.init 24 24 0 0.0
.init_array 336 336 0 0.0
.rodata 133532 133532 0 0.0
.text 1809888 1809888 0 0.0
tv-app debug (read only) 2537161 2537161 0 0.0
(read/write) 151456 151456 0 0.0
.bss 69184 69184 0 0.0
.data 3200 3200 0 0.0
.data.rel.ro 73008 73008 0 0.0
.dynamic 592 592 0 0.0
.got 4552 4552 0 0.0
.init 27 27 0 0.0
.init_array 888 888 0 0.0
.rodata 198197 198197 0 0.0
.text 2165650 2165650 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2428412 2428468 56 0.0
.bss 195916 195916 0 0.0
.data 5328 5328 0 0.0
.text 1390984 1391040 56 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2391612 2391668 56 0.0
.bss 188448 188448 0 0.0
.data 5632 5632 0 0.0
.text 1354184 1354240 56 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2327056 2327120 64 0.0
.bss 187424 187424 0 0.0
.data 5608 5608 0 0.0
.text 1289656 1289720 64 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139840 1139840 0 0.0
.bss 11796 11796 0 0.0
.data 4368 4368 0 0.0
.text 103224 103224 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2317820 2317884 64 0.0
.bss 185972 185972 0 0.0
.data 5440 5440 0 0.0
.text 1280392 1280456 64 0.0
p6 all-clusters-app default (read/write) 2485872 2485872 0 0.0
.bss 124232 124232 0 0.0
.data 2672 2672 0 0.0
.text 1444136 1444136 0 0.0
light-app default (read/write) 2392760 2392760 0 0.0
.bss 113912 113912 0 0.0
.data 2528 2528 0 0.0
.text 1351024 1351024 0 0.0
lock-app default (read/write) 2356240 2356240 0 0.0
.bss 113640 113640 0 0.0
.data 2488 2488 0 0.0
.text 1314504 1314504 0 0.0
qpg lighting-app qpg6105+debug (read only) 598744 598744 0 0.0
(read/write) 146940 146940 0 0.0
.bss 90744 90744 0 0.0
.data 1112 1112 0 0.0
.text 593424 593424 0 0.0
lock-app qpg6105+debug (read only) 564352 564352 0 0.0
(read/write) 146940 146940 0 0.0
.bss 90728 90728 0 0.0
.data 1064 1064 0 0.0
.text 559032 559032 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) 877490 877490 0 0.0
bss 87520 87520 0 0.0
noinit 37160 37160 0 0.0
text 617978 617978 0 0.0

@emargolis emargolis merged commit a80c9f8 into project-chip:master Feb 17, 2022
jamesluo11 pushed a commit to jamesluo11/connectedhomeip that referenced this pull request Apr 26, 2022
…-chip#15127)

Moved some of the Spake2p defines to the CHIPCryptoPAL.h
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