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 disparity in OnOff cluster revision #10789

Merged
merged 3 commits into from
Oct 22, 2021

Conversation

jmartinez-silabs
Copy link
Member

@jmartinez-silabs jmartinez-silabs commented Oct 21, 2021

Problem

Some app report cluster revision of 2
The test case suite checks for cluster revision 3
Spec now defines cluster revision 4
Fixes #10657

Change overview

Update the OnOff ClusterRevision attribute to 4 for all examples using the OnOff cluster
Enable FeatureMap for Lighting app and lock-app
For lock-app enable also other required OnOff attibutes

Testing

The test suites now checks for OnOff cluster revision 4

@github-actions
Copy link

github-actions bot commented Oct 21, 2021

PR #10789: Size comparison from 30f7de7 to b1d94a1

22 builds (for efr32, k32w, linux, mbed, p6, qpg, telink)
platform target config section 30f7de7 b1d94a1 change % change
efr32 lighting-app BRD4161A .bss 118028 118036 8 0.0
.data 1800 1800 0 0.0
.text 782392 782408 16 0.0
lock-app BRD4161A .bss 115884 115892 8 0.0
.data 1760 1760 0 0.0
.text 761528 761616 88 0.0
window-app BRD4161A .bss 116204 116204 0 0.0
.data 1764 1764 0 0.0
.text 762444 762444 0 0.0
lighting-app BRD4161A+rpc .bss 131356 131364 8 0.0
.data 1852 1852 0 0.0
.text 762108 762132 24 0.0
k32w lock-app k32w061+debug .bss 69060 69076 16 0.0
.data 1864 1864 0 0.0
.text 515168 515252 84 0.0
shell k32w061+debug .bss 55080 55080 0 0.0
.data 672 672 0 0.0
.text 357384 357384 0 0.0
lighting-app k32w061+se05x+release .bss 78584 78584 0 0.0
.data 1900 1900 0 0.0
.text 613952 613972 20 0.0
linux all-clusters-app debug .bss 52176 52176 0 0.0
.data 978 978 0 0.0
.data.rel.ro 59072 59072 0 0.0
.dynamic 592 592 0 0.0
.got 4080 4080 0 0.0
.init 27 27 0 0.0
.init_array 512 512 0 0.0
.rodata 136149 136149 0 0.0
.text 1340978 1340978 0 0.0
chip-tool debug .bss 17520 17520 0 0.0
.data 1584 1584 0 0.0
.data.rel.ro 91984 91984 0 0.0
.dynamic 592 592 0 0.0
.got 4344 4344 0 0.0
.init 27 27 0 0.0
.init_array 416 416 0 0.0
.rodata 183492 183492 0 0.0
.text 3455893 3455893 0 0.0
ota-provider-app debug .bss 37440 37440 0 0.0
.data 752 752 0 0.0
.data.rel.ro 23176 23176 0 0.0
.dynamic 592 592 0 0.0
.got 4008 4008 0 0.0
.init 27 27 0 0.0
.init_array 440 440 0 0.0
.rodata 109928 109928 0 0.0
.text 1008626 1008626 0 0.0
ota-requestor-app debug .bss 205696 205696 0 0.0
.data 752 752 0 0.0
.data.rel.ro 24488 24488 0 0.0
.dynamic 592 592 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 512 512 0 0.0
.rodata 128072 128072 0 0.0
.text 1127170 1127170 0 0.0
shell debug .bss 16072 16072 0 0.0
.data 242 242 0 0.0
.data.rel.ro 35120 35120 0 0.0
.dynamic 592 592 0 0.0
.got 3496 3496 0 0.0
.init 27 27 0 0.0
.init_array 336 336 0 0.0
.rodata 71823 71823 0 0.0
.text 569778 569778 0 0.0
tv-app debug .bss 216560 216560 0 0.0
.data 2032 2032 0 0.0
.data.rel.ro 56096 56096 0 0.0
.dynamic 592 592 0 0.0
.got 4400 4400 0 0.0
.init 27 27 0 0.0
.init_array 608 608 0 0.0
.rodata 152680 152680 0 0.0
.text 1441986 1441986 0 0.0
bridge-app debug+rpc .bss 52880 52880 0 0.0
.data 976 976 0 0.0
.data.rel.ro 25784 25784 0 0.0
.dynamic 592 592 0 0.0
.got 3944 3944 0 0.0
.init 27 27 0 0.0
.init_array 400 400 0 0.0
.rodata 110524 110524 0 0.0
.text 1049909 1049909 0 0.0
lighting-app debug+rpc .bss 42200 42200 0 0.0
.data 1106 1106 0 0.0
.data.rel.ro 52496 52496 0 0.0
.dynamic 608 608 0 0.0
.got 4104 4104 0 0.0
.init 27 27 0 0.0
.init_array 528 528 0 0.0
.rodata 127697 127697 0 0.0
.text 1250050 1250050 0 0.0
mbed lighting-app CY8CPROTO_062_4343W+release .bss 172092 172100 8 0.0
.data 5464 5464 0 0.0
.heap 858888 858880 -8 -0.0
.text 1219728 1219744 16 0.0
lock-app CY8CPROTO_062_4343W+release .bss 171012 171020 8 0.0
.data 5432 5432 0 0.0
.heap 860000 859992 -8 -0.0
.text 1197560 1197640 80 0.0
p6 lock-app default .bss 68208 68216 8 0.0
.data 2416 2416 0 0.0
.heap 962720 962712 -8 -0.0
.text 1126072 1126160 88 0.0
qpg lighting-app qpg6100+debug .bss 53552 53560 8 0.0
.data 996 996 0 0.0
.text 486132 486152 20 0.0
lock-app qpg6100+debug .bss 52496 52504 8 0.0
.data 952 952 0 0.0
.text 462208 462292 84 0.0
persistent-storage-app qpg6100+debug .bss 17778 17778 0 0.0
.data 280 280 0 0.0
.text 102732 102732 0 0.0
telink lighting-app tlsr9518adk80d bss 70992 70996 4 0.0
noinit 33216 33216 0 0.0
text 457772 457772 0 0.0
12 builds (for esp32, nrfconnect)
platform target config section 30f7de7 b1d94a1 change % change
esp32 all-clusters-app c3devkit .dram0.bss 60296 60296 0 0.0
.dram0.data 16432 16432 0 0.0
.flash.rodata 199072 199072 0 0.0
.flash.text 873290 873290 0 0.0
.iram0.text 57564 57564 0 0.0
m5stack .dram0.bss 62800 62800 0 0.0
.dram0.data 32084 32084 0 0.0
.flash.rodata 207832 207832 0 0.0
.flash.text 904371 904371 0 0.0
.iram0.text 125115 125115 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 bss 113172 113176 4 0.0
rodata 97740 97760 20 0.0
text 577308 577308 0 0.0
lock-app nrf52840dk_nrf52840 bss 112240 112248 8 0.0
rodata 94076 94160 84 0.1
text 558796 558796 0 0.0
pigweed-app nrf52840dk_nrf52840 bss 51824 51824 0 0.0
rodata 45776 45776 0 0.0
text 339456 339456 0 0.0
pump-app nrf52840dk_nrf52840 bss 112308 112308 0 0.0
rodata 95056 95056 0 0.0
text 561952 561952 0 0.0
pump-controller-app nrf52840dk_nrf52840 bss 112248 112248 0 0.0
rodata 94136 94136 0 0.0
text 558588 558588 0 0.0
shell nrf52840dk_nrf52840 bss 109068 109068 0 0.0
rodata 71644 71644 0 0.0
text 519084 519084 0 0.0
lighting-app nrf52840dk_nrf52840+rpc bss 109416 109420 4 0.0
rodata 88524 88544 20 0.0
text 550508 550508 0 0.0
nrf5340dk_nrf5340_cpuapp bss 114548 114552 4 0.0
rodata 92980 93000 20 0.0
text 506776 506776 0 0.0
lock-app nrf5340dk_nrf5340_cpuapp bss 113612 113624 12 0.0
rodata 89336 89420 84 0.1
text 488260 488260 0 0.0
shell nrf5340dk_nrf5340_cpuapp bss 110052 110052 0 0.0
rodata 66288 66288 0 0.0
text 439696 439696 0 0.0

@github-actions
Copy link

Size increase report for "nrfconnect-example-build" from 30f7de7

File Section File VM
chip-lock.elf rodata 80 84
Full report output
BLOAT REPORT

Files found only in the build output:
    report.csv

Comparing ./master_artifact/chip-shell.elf and ./pull_artifact/chip-shell.elf:

sections,vmsize,filesize

Comparing ./master_artifact/chip-lock.elf and ./pull_artifact/chip-lock.elf:

sections,vmsize,filesize
rodata,84,80


@woody-apple
Copy link
Contributor

@jmartinez-silabs can you resolve conflicts?

…aturemap attribute in lighting-app and required onoff attributes in lock-app
@github-actions
Copy link

Size increase report for "gn_qpg-example-build" from 3f984d7

File Section File VM
chip-qpg6100-lighting-example.out .text 20 20
chip-qpg6100-lighting-example.out .bss 0 8
chip-qpg6100-lighting-example.out .heap 0 -8
Full report output
BLOAT REPORT

Files found only in the build output:
    report.csv

Comparing ./master_artifact/chip-qpg6100-lighting-example.out and ./pull_artifact/chip-qpg6100-lighting-example.out:

sections,vmsize,filesize
.text,20,20
.bss,8,0
.heap,-8,0
[Unmapped],0,-20

Comparing ./master_artifact/chip-qpg6100-lighting-example.out.map and ./pull_artifact/chip-qpg6100-lighting-example.out.map:

BLOAT EXECUTION FAILED WITH CODE 1:
bloaty: unknown file type for file './pull_artifact/chip-qpg6100-lighting-example.out.map'


@woody-apple woody-apple merged commit 685e556 into project-chip:master Oct 22, 2021
@github-actions
Copy link

PR #10789: Size comparison from 3f984d7 to 4aa9b18

27 builds (for efr32, esp32, k32w, mbed, nrfconnect, p6, qpg, telink)
platform target config section 3f984d7 4aa9b18 change % change
efr32 lighting-app BRD4161A .bss 118036 118036 0 0.0
.data 1800 1800 0 0.0
.text 784296 784320 24 0.0
lock-app BRD4161A .bss 115884 115892 8 0.0
.data 1760 1760 0 0.0
.text 763440 763528 88 0.0
window-app BRD4161A .bss 116204 116204 0 0.0
.data 1764 1764 0 0.0
.text 764356 764356 0 0.0
lighting-app BRD4161A+rpc .bss 131364 131364 0 0.0
.data 1852 1852 0 0.0
.text 764012 764028 16 0.0
esp32 all-clusters-app c3devkit .dram0.bss 60296 60296 0 0.0
.dram0.data 16440 16440 0 0.0
.flash.rodata 199864 199864 0 0.0
.flash.text 874306 874306 0 0.0
.iram0.text 57564 57564 0 0.0
m5stack .dram0.bss 62808 62808 0 0.0
.dram0.data 32084 32084 0 0.0
.flash.rodata 208600 208600 0 0.0
.flash.text 905227 905227 0 0.0
.iram0.text 125115 125115 0 0.0
k32w lock-app k32w061+debug .bss 69068 69076 8 0.0
.data 1864 1864 0 0.0
.text 516024 516108 84 0.0
shell k32w061+debug .bss 55080 55080 0 0.0
.data 672 672 0 0.0
.text 359480 359480 0 0.0
lighting-app k32w061+se05x+release .bss 78592 78592 0 0.0
.data 1900 1900 0 0.0
.text 614788 614808 20 0.0
mbed lighting-app CY8CPROTO_062_4343W+release .bss 172100 172108 8 0.0
.data 5464 5464 0 0.0
.heap 858880 858872 -8 -0.0
.text 1220088 1220112 24 0.0
lock-app CY8CPROTO_062_4343W+release .bss 171020 171028 8 0.0
.data 5432 5432 0 0.0
.heap 859992 859984 -8 -0.0
.text 1197992 1198072 80 0.0
pigweed-app CY8CPROTO_062_4343W+release .bss 11760 11760 0 0.0
.data 4360 4360 0 0.0
.heap 1020328 1020328 0 0.0
.text 103064 103064 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 bss 113180 113184 4 0.0
rodata 98080 98100 20 0.0
text 577104 577104 0 0.0
lock-app nrf52840dk_nrf52840 bss 112244 112256 12 0.0
rodata 94416 94500 84 0.1
text 558592 558592 0 0.0
pigweed-app nrf52840dk_nrf52840 bss 51824 51824 0 0.0
rodata 45776 45776 0 0.0
text 339456 339456 0 0.0
pump-app nrf52840dk_nrf52840 bss 112316 112316 0 0.0
rodata 95396 95396 0 0.0
text 561744 561744 0 0.0
pump-controller-app nrf52840dk_nrf52840 bss 112252 112252 0 0.0
rodata 94476 94476 0 0.0
text 558384 558384 0 0.0
shell nrf52840dk_nrf52840 bss 109072 109072 0 0.0
rodata 72524 72524 0 0.0
text 520208 520208 0 0.0
lighting-app nrf52840dk_nrf52840+rpc bss 109420 109424 4 0.0
rodata 88856 88876 20 0.0
text 550296 550296 0 0.0
nrf5340dk_nrf5340_cpuapp bss 114552 114556 4 0.0
rodata 93320 93340 20 0.0
text 506572 506572 0 0.0
lock-app nrf5340dk_nrf5340_cpuapp bss 113620 113628 8 0.0
rodata 89676 89760 84 0.1
text 488056 488056 0 0.0
shell nrf5340dk_nrf5340_cpuapp bss 110056 110056 0 0.0
rodata 67168 67168 0 0.0
text 440816 440816 0 0.0
p6 lock-app default .bss 68216 68224 8 0.0
.data 2416 2416 0 0.0
.heap 962712 962704 -8 -0.0
.text 1126688 1126776 88 0.0
qpg lighting-app qpg6100+debug .bss 53464 53472 8 0.0
.data 1004 1004 0 0.0
.text 486036 486056 20 0.0
lock-app qpg6100+debug .bss 52408 52416 8 0.0
.data 960 960 0 0.0
.text 462120 462204 84 0.0
persistent-storage-app qpg6100+debug .bss 27752 27752 0 0.0
.data 372 372 0 0.0
.text 149896 149896 0 0.0
telink lighting-app tlsr9518adk80d bss 71000 71004 4 0.0
noinit 33216 33216 0 0.0
text 457612 457612 0 0.0

@jmartinez-silabs jmartinez-silabs deleted the OnOff_Revision branch October 26, 2021 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
8 participants