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

Revert: [ESP32] Init OTA requestor in all-clusters-app #13246 #13437

Closed
wants to merge 1 commit into from

Conversation

shubhamdp
Copy link
Contributor

Problem

ZAP CI broken

Change overview

To support OTA requestor functionality, we need OTA requestor server and
OTA provider client. OTA provider client was enabled in #13246 which
broke the ZAP regen.

Having same cluster's client and server in same app is not supported in
the zap. Removed OTA provider client from all-clusters-app

Removing the OTA requestor support from all-clusters-app/esp32

Testing

CI should be green

@github-actions
Copy link

github-actions bot commented Jan 11, 2022

PR #13437: Size comparison from 19f61eb to 347397b

Increases above 0.2%:

platform target config section 19f61eb 347397b change % change
esp32 all-clusters-app c3devkit .flash.rodata 176816 177272 456 0.3
Increases (4 builds for esp32, mbed, p6)
platform target config section 19f61eb 347397b change % change
esp32 all-clusters-app c3devkit (read only) 890494 891988 1494 0.2
(read/write) 1313594 1314050 456 0.0
.flash.rodata 176816 177272 456 0.3
.flash.text 890494 891988 1494 0.2
m5stack (read only) 950619 951943 1324 0.1
(read/write) 445204 445624 420 0.1
.flash.rodata 206164 206592 428 0.2
.flash.text 945235 946559 1324 0.1
mbed all-clusters-app CY8CPROTO_062_4343W+release (read/write) 2346888 2348664 1776 0.1
.bss 188716 188724 8 0.0
.text 1309464 1311240 1776 0.1
p6 all-clusters-app default (read/write) 2399760 2401752 1992 0.1
.text 1358024 1360016 1992 0.1
Decreases (3 builds for esp32, linux)
platform target config section 19f61eb 347397b change % change
esp32 all-clusters-app c3devkit .dram0.bss 69472 69464 -8 -0.0
m5stack .dram0.bss 73968 73960 -8 -0.0
linux chip-tool-ipv6only arm64 (read only) 7109708 7109596 -112 -0.0
.rodata 389860 389844 -16 -0.0
.text 6022996 6022900 -96 -0.0
Full report (32 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 19f61eb 347397b change % change
efr32 lighting-app BRD4161A (read only) 828916 828916 0 0.0
(read/write) 126996 126996 0 0.0
.bss 125120 125120 0 0.0
.data 1876 1876 0 0.0
.text 828908 828908 0 0.0
BRD4161A+rpc (read only) 816112 816112 0 0.0
(read/write) 143656 143656 0 0.0
.bss 141680 141680 0 0.0
.data 1976 1976 0 0.0
.text 816104 816104 0 0.0
window-app BRD4161A (read only) 802380 802380 0 0.0
(read/write) 125936 125936 0 0.0
.bss 124104 124104 0 0.0
.data 1832 1832 0 0.0
.text 802372 802372 0 0.0
esp32 all-clusters-app c3devkit (read only) 890494 891988 1494 0.2
(read/write) 1313594 1314050 456 0.0
.dram0.bss 69472 69464 -8 -0.0
.dram0.data 14244 14244 0 0.0
.flash.rodata 176816 177272 456 0.3
.flash.text 890494 891988 1494 0.2
.iram0.text 62254 62254 0 0.0
m5stack (read only) 950619 951943 1324 0.1
(read/write) 445204 445624 420 0.1
.dram0.bss 73968 73960 -8 -0.0
.dram0.data 34064 34064 0 0.0
.flash.rodata 206164 206592 428 0.2
.flash.text 945235 946559 1324 0.1
.iram0.text 122671 122671 0 0.0
k32w light k32w061+release (read/write) 655316 655316 0 0.0
.bss 76776 76776 0 0.0
.data 1848 1848 0 0.0
.text 570892 570892 0 0.0
lock k32w061+release (read/write) 659656 659656 0 0.0
.bss 77072 77072 0 0.0
.data 1868 1868 0 0.0
.text 574916 574916 0 0.0
linux chip-tool-ipv6only arm64 (read only) 7109708 7109596 -112 -0.0
(read/write) 327041 327041 0 0.0
.bss 54865 54865 0 0.0
.data 1096 1096 0 0.0
.data.rel.ro 209264 209264 0 0.0
.dynamic 560 560 0 0.0
.got 58136 58136 0 0.0
.init 24 24 0 0.0
.init_array 168 168 0 0.0
.rodata 389860 389844 -16 -0.0
.text 6022996 6022900 -96 -0.0
thermostat-no-ble arm64 (read only) 2031916 2031916 0 0.0
(read/write) 145137 145137 0 0.0
.bss 64657 64657 0 0.0
.data 880 880 0 0.0
.data.rel.ro 72656 72656 0 0.0
.dynamic 560 560 0 0.0
.got 4008 4008 0 0.0
.init 24 24 0 0.0
.init_array 296 296 0 0.0
.rodata 129004 129004 0 0.0
.text 1689136 1689136 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2346888 2348664 1776 0.1
.bss 188716 188724 8 0.0
.data 5312 5312 0 0.0
.text 1309464 1311240 1776 0.1
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2330496 2330496 0 0.0
.bss 180544 180544 0 0.0
.data 5552 5552 0 0.0
.text 1293096 1293096 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2303648 2303648 0 0.0
.bss 179592 179592 0 0.0
.data 5544 5544 0 0.0
.text 1266248 1266248 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139712 1139712 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.text 103096 103096 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2054432 2054432 0 0.0
.bss 157060 157060 0 0.0
.data 4864 4864 0 0.0
.text 1017032 1017032 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 938287 938287 0 0.0
bss 119232 119232 0 0.0
rodata 108156 108156 0 0.0
text 633348 633348 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 923751 923751 0 0.0
bss 116276 116276 0 0.0
rodata 100604 100604 0 0.0
text 628700 628700 0 0.0
nrf52840dongle_nrf52840 (read/write) 988963 988963 0 0.0
bss 122076 122076 0 0.0
rodata 112908 112908 0 0.0
text 665544 665544 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 848142 848142 0 0.0
bss 116020 116020 0 0.0
rodata 101328 101328 0 0.0
text 550272 550272 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 910431 910431 0 0.0
bss 118420 118420 0 0.0
rodata 103428 103428 0 0.0
text 611212 611212 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 820498 820498 0 0.0
bss 115236 115236 0 0.0
rodata 96652 96652 0 0.0
text 528176 528176 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 541835 541835 0 0.0
bss 52588 52588 0 0.0
rodata 50104 50104 0 0.0
text 376940 376940 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 911707 911707 0 0.0
bss 118180 118180 0 0.0
rodata 103640 103640 0 0.0
text 612424 612424 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 908511 908511 0 0.0
bss 118208 118208 0 0.0
rodata 102900 102900 0 0.0
text 609960 609960 0 0.0
shell nrf52840dk_nrf52840 (read/write) 798063 798063 0 0.0
bss 109768 109768 0 0.0
rodata 78180 78180 0 0.0
text 533608 533608 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 710882 710882 0 0.0
bss 107656 107656 0 0.0
rodata 72484 72484 0 0.0
text 451288 451288 0 0.0
p6 all-clusters-app default (read/write) 2399760 2401752 1992 0.1
.bss 116804 116804 0 0.0
.data 2592 2592 0 0.0
.text 1358024 1360016 1992 0.1
light-app default (read/write) 2323744 2323744 0 0.0
.bss 105672 105672 0 0.0
.data 2384 2384 0 0.0
.text 1282008 1282008 0 0.0
lock-app default (read/write) 2295968 2295968 0 0.0
.bss 104552 104552 0 0.0
.data 2336 2336 0 0.0
.text 1254232 1254232 0 0.0
qpg lighting-app qpg6105+debug (read only) 533208 533208 0 0.0
(read/write) 146936 146936 0 0.0
.bss 86624 86624 0 0.0
.data 1004 1004 0 0.0
.text 527888 527888 0 0.0
lock-app qpg6105+debug (read only) 504984 504984 0 0.0
(read/write) 146940 146940 0 0.0
.bss 85760 85760 0 0.0
.data 952 952 0 0.0
.text 499664 499664 0 0.0
persistent-storage-app qpg6105+debug (read only) 106448 106448 0 0.0
(read/write) 146938 146938 0 0.0
.bss 36146 36146 0 0.0
.data 288 288 0 0.0
.text 101128 101128 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 834566 834566 0 0.0
bss 86924 86924 0 0.0
noinit 37160 37160 0 0.0
text 582774 582774 0 0.0

To support OTA requestor functionality, we need OTA requestor server and
OTA provider client. OTA provider client was enabled in project-chip#13246 which
broke the ZAP regen.

Having same cluster's client and server in same app is not supported in
the zap. Removed OTA provider client from all-clusters-app

Removing the OTA requestor support from all-clusters-app/esp32
@dhrishi
Copy link
Contributor

dhrishi commented Jan 11, 2022

This will be required once #13440 is fixed.

@github-actions
Copy link

github-actions bot commented Jan 11, 2022

PR #13437: Size comparison from a841e21 to fb8650d

Increases (2 builds for mbed, p6)
platform target config section a841e21 fb8650d change % change
mbed all-clusters-app CY8CPROTO_062_4343W+release (read/write) 2349496 2349752 256 0.0
.text 1312072 1312328 256 0.0
p6 all-clusters-app default (read/write) 2402808 2403104 296 0.0
.text 1361072 1361368 296 0.0
Decreases (2 builds for linux, mbed)
platform target config section a841e21 fb8650d change % change
linux chip-tool-ipv6only arm64 (read only) 7113260 7113132 -128 -0.0
.rodata 390132 390116 -16 -0.0
.text 6025556 6025444 -112 -0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release .data 5320 5312 -8 -0.2
Full report (30 builds for efr32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section a841e21 fb8650d change % change
efr32 lighting-app BRD4161A (read only) 829972 829972 0 0.0
(read/write) 127056 127056 0 0.0
.bss 125176 125176 0 0.0
.data 1880 1880 0 0.0
.text 829964 829964 0 0.0
BRD4161A+rpc (read only) 817168 817168 0 0.0
(read/write) 143720 143720 0 0.0
.bss 141736 141736 0 0.0
.data 1980 1980 0 0.0
.text 817160 817160 0 0.0
window-app BRD4161A (read only) 803436 803436 0 0.0
(read/write) 125996 125996 0 0.0
.bss 124160 124160 0 0.0
.data 1836 1836 0 0.0
.text 803428 803428 0 0.0
k32w light k32w061+release (read/write) 656148 656148 0 0.0
.bss 76824 76824 0 0.0
.data 1852 1852 0 0.0
.text 571672 571672 0 0.0
lock k32w061+release (read/write) 660488 660488 0 0.0
.bss 77120 77120 0 0.0
.data 1872 1872 0 0.0
.text 575696 575696 0 0.0
linux chip-tool-ipv6only arm64 (read only) 7113260 7113132 -128 -0.0
(read/write) 327377 327377 0 0.0
.bss 54865 54865 0 0.0
.data 1096 1096 0 0.0
.data.rel.ro 209544 209544 0 0.0
.dynamic 560 560 0 0.0
.got 58184 58184 0 0.0
.init 24 24 0 0.0
.init_array 168 168 0 0.0
.rodata 390132 390116 -16 -0.0
.text 6025556 6025444 -112 -0.0
thermostat-no-ble arm64 (read only) 2036572 2036572 0 0.0
(read/write) 145377 145377 0 0.0
.bss 64721 64721 0 0.0
.data 880 880 0 0.0
.data.rel.ro 72832 72832 0 0.0
.dynamic 560 560 0 0.0
.got 4008 4008 0 0.0
.init 24 24 0 0.0
.init_array 304 304 0 0.0
.rodata 129244 129244 0 0.0
.text 1693360 1693360 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2349496 2349752 256 0.0
.bss 189068 189068 0 0.0
.data 5320 5312 -8 -0.2
.text 1312072 1312328 256 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2331144 2331144 0 0.0
.bss 180600 180600 0 0.0
.data 5552 5552 0 0.0
.text 1293744 1293744 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2304432 2304432 0 0.0
.bss 179648 179648 0 0.0
.data 5544 5544 0 0.0
.text 1267032 1267032 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139712 1139712 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.text 103096 103096 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2054432 2054432 0 0.0
.bss 157060 157060 0 0.0
.data 4864 4864 0 0.0
.text 1017032 1017032 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 939003 939003 0 0.0
bss 119284 119284 0 0.0
rodata 108232 108232 0 0.0
text 633916 633916 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 924467 924467 0 0.0
bss 116328 116328 0 0.0
rodata 100680 100680 0 0.0
text 629268 629268 0 0.0
nrf52840dongle_nrf52840 (read/write) 989679 989679 0 0.0
bss 122128 122128 0 0.0
rodata 112984 112984 0 0.0
text 666112 666112 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 848858 848858 0 0.0
bss 116072 116072 0 0.0
rodata 101404 101404 0 0.0
text 550836 550836 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 911275 911275 0 0.0
bss 118472 118472 0 0.0
rodata 103504 103504 0 0.0
text 611912 611912 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 821310 821310 0 0.0
bss 115288 115288 0 0.0
rodata 96728 96728 0 0.0
text 528872 528872 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 541835 541835 0 0.0
bss 52588 52588 0 0.0
rodata 50104 50104 0 0.0
text 376940 376940 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 912567 912567 0 0.0
bss 118232 118232 0 0.0
rodata 103716 103716 0 0.0
text 613172 613172 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 909355 909355 0 0.0
bss 118260 118260 0 0.0
rodata 102976 102976 0 0.0
text 610660 610660 0 0.0
shell nrf52840dk_nrf52840 (read/write) 798063 798063 0 0.0
bss 109768 109768 0 0.0
rodata 78180 78180 0 0.0
text 533608 533608 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 710882 710882 0 0.0
bss 107656 107656 0 0.0
rodata 72484 72484 0 0.0
text 451288 451288 0 0.0
p6 all-clusters-app default (read/write) 2402808 2403104 296 0.0
.bss 117148 117148 0 0.0
.data 2592 2592 0 0.0
.text 1361072 1361368 296 0.0
light-app default (read/write) 2324800 2324800 0 0.0
.bss 105728 105728 0 0.0
.data 2384 2384 0 0.0
.text 1283064 1283064 0 0.0
lock-app default (read/write) 2297024 2297024 0 0.0
.bss 104608 104608 0 0.0
.data 2344 2344 0 0.0
.text 1255288 1255288 0 0.0
qpg lighting-app qpg6105+debug (read only) 533852 533852 0 0.0
(read/write) 146940 146940 0 0.0
.bss 86672 86672 0 0.0
.data 1008 1008 0 0.0
.text 528532 528532 0 0.0
lock-app qpg6105+debug (read only) 505772 505772 0 0.0
(read/write) 146936 146936 0 0.0
.bss 85808 85808 0 0.0
.data 956 956 0 0.0
.text 500452 500452 0 0.0
persistent-storage-app qpg6105+debug (read only) 106448 106448 0 0.0
(read/write) 146938 146938 0 0.0
.bss 36146 36146 0 0.0
.data 288 288 0 0.0
.text 101128 101128 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 835562 835562 0 0.0
bss 86976 86976 0 0.0
noinit 37160 37160 0 0.0
text 583540 583540 0 0.0

@shubhamdp
Copy link
Contributor Author

@bzbarsky-apple suggested

I guess the sanest short-term thing is probably to remove OTA Provider Server from all-clusters-app for now. And push for the ZAP bug to be fixed, so we can re-enable it....

I think I misunderstood and reverted the PR. Closing it and will remove the OTA Provider Server from all-clusters-app.

@shubhamdp shubhamdp closed this Jan 11, 2022
@shubhamdp shubhamdp deleted the task/revert_13246 branch January 25, 2022 09:59
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.

2 participants