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 DataModel derivation handling and make unit tests run #30558

Merged
merged 1 commit into from
Nov 18, 2023

Conversation

andy31415
Copy link
Contributor

Changes:

  • Make sure tests were run (we failed that before and they were broken)
  • Update derivation handling to have different choices on what gets inherited and what not, to make unit tests pass
  • Fix ordering in test since now attribute is updated not replaced

Tested:

  • Unit tests pass

Changes:

- Make sure tests were run (we failed that before and they were broken)
- Update derivation handling to have different choices on what gets
  inherited and what not, to make unit tests pass
- Fix ordering in test since now attribute is updated not replaced

Tested:

- Unit tests pass
Copy link

github-actions bot commented Nov 17, 2023

PR #30558: Size comparison from 916ba56 to e4bf108

Full report (73 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
platform target config section 916ba56 e4bf108 change % change
bl602 lighting-app bl602 (read/write) 1410022 1410022 0 0.0
.bss 85048 85048 0 0.0
.data 9376 9376 0 0.0
.rodata 156520 156520 0 0.0
.text 1078422 1078422 0 0.0
bl602+mfd (read/write) 1424462 1424462 0 0.0
.bss 85216 85216 0 0.0
.data 9344 9344 0 0.0
.rodata 155480 155480 0 0.0
.text 1093774 1093774 0 0.0
bl602+rpc (read/write) 1457806 1457806 0 0.0
.bss 93080 93080 0 0.0
.data 9744 9744 0 0.0
.rodata 164144 164144 0 0.0
.text 1110166 1110166 0 0.0
bl702 lighting-app bl702 (read only) 3478 3478 0 0.0
(read/write) 1176175 1176175 0 0.0
.bss 11197 11197 0 0.0
.data 3560 3560 0 0.0
.rodata 106268 106268 0 0.0
.text 948898 948898 0 0.0
bl702+mfd (read only) 3478 3478 0 0.0
(read/write) 1187043 1187043 0 0.0
.bss 11373 11373 0 0.0
.data 3536 3536 0 0.0
.rodata 105208 105208 0 0.0
.text 960706 960706 0 0.0
bl702+rpc (read only) 3478 3478 0 0.0
(read/write) 1276239 1276239 0 0.0
.bss 19677 19677 0 0.0
.data 4112 4112 0 0.0
.rodata 121676 121676 0 0.0
.text 1023964 1023964 0 0.0
bl706-eth (read/write) 995037 995037 0 0.0
.bss 23772 23772 0 0.0
.data 3128 3128 0 0.0
.rodata 99336 99336 0 0.0
.text 741320 741320 0 0.0
bl706-wifi (read/write) 1230818 1230818 0 0.0
.bss 10657 10657 0 0.0
.data 3568 3568 0 0.0
.rodata 120208 120208 0 0.0
.text 966350 966350 0 0.0
bl702l lighting-app bl702l (read only) 512 512 0 0.0
(read/write) 1145892 1145892 0 0.0
.bss 16408 16408 0 0.0
.data 4920 4920 0 0.0
.rodata 100272 100272 0 0.0
.text 941996 941996 0 0.0
bl702l+mfd (read only) 512 512 0 0.0
(read/write) 1157352 1157352 0 0.0
.bss 16584 16584 0 0.0
.data 4904 4904 0 0.0
.rodata 99212 99212 0 0.0
.text 954372 954372 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 (read only) 739859 739859 0 0.0
(read/write) 167080 167080 0 0.0
.bss 89492 89492 0 0.0
.data 3424 3424 0 0.0
.rodata 84671 84671 0 0.0
.text 654800 654800 0 0.0
lock-ftd LP_EM_CC1354P10_6 (read only) 757451 757451 0 0.0
(read/write) 177252 177252 0 0.0
.bss 99620 99620 0 0.0
.data 3444 3444 0 0.0
.rodata 79783 79783 0 0.0
.text 677276 677276 0 0.0
lock-mtd LP_EM_CC1354P10_6 (read only) 744163 744163 0 0.0
(read/write) 171708 171708 0 0.0
.bss 94076 94076 0 0.0
.data 3444 3444 0 0.0
.rodata 105519 105519 0 0.0
.text 638256 638256 0 0.0
pump-app LP_EM_CC1354P10_6 (read only) 698219 698219 0 0.0
(read/write) 166116 166116 0 0.0
.bss 88296 88296 0 0.0
.data 3412 3412 0 0.0
.rodata 80447 80447 0 0.0
.text 617384 617384 0 0.0
pump-controller-app LP_EM_CC1354P10_6 (read only) 683859 683859 0 0.0
(read/write) 166256 166256 0 0.0
.bss 88448 88448 0 0.0
.data 3408 3408 0 0.0
.rodata 76279 76279 0 0.0
.text 607192 607192 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL (read only) 564930 564930 0 0.0
(read/write) 207520 207520 0 0.0
.bss 200980 200980 0 0.0
.data 1416 1416 0 0.0
.rodata 83698 83698 0 0.0
.text 479108 479108 0 0.0
lock CC3235SF_LAUNCHXL (read only) 617186 617186 0 0.0
(read/write) 207860 207860 0 0.0
.bss 201296 201296 0 0.0
.data 1444 1444 0 0.0
.rodata 105506 105506 0 0.0
.text 509560 509560 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 558087 558087 0 0.0
.app_xip_area 448457 448457 0 0.0
.bss 64544 64544 0 0.0
.data 664 664 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 540263 540263 0 0.0
.app_xip_area 425953 425953 0 0.0
.bss 69192 69192 0 0.0
.data 696 696 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 578175 578175 0 0.0
.app_xip_area 469929 469929 0 0.0
.bss 63232 63232 0 0.0
.data 592 592 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
switch cyw930739m2evb_01 (read/write) 554495 554495 0 0.0
.app_xip_area 443145 443145 0 0.0
.bss 66232 66232 0 0.0
.data 692 692 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A+rs9116 (read/write) 1012236 1012236 0 0.0
.bss 172464 172464 0 0.0
.data 2696 2696 0 0.0
.text 837056 837056 0 0.0
BRD4187C (read/write) 1098068 1098068 0 0.0
.bss 196092 196092 0 0.0
.data 3304 3304 0 0.0
.text 898652 898652 0 0.0
lock-app BRD4161A+wf200 (read/write) 1104520 1104520 0 0.0
.bss 187064 187064 0 0.0
.data 2708 2708 0 0.0
.text 914724 914724 0 0.0
window-app BRD4187C (read/write) 1132928 1132928 0 0.0
.bss 168444 168444 0 0.0
.data 3176 3176 0 0.0
.text 961288 961288 0 0.0
esp32 all-clusters-app c3devkit (read only) 1132984 1132984 0 0.0
(read/write) 1670700 1670700 0 0.0
.dram0.bss 72432 72432 0 0.0
.dram0.data 12996 12996 0 0.0
.flash.rodata 241400 241400 0 0.0
.flash.text 1132984 1132984 0 0.0
.iram0.text 75694 75694 0 0.0
m5stack (read only) 1177783 1177783 0 0.0
(read/write) 520712 520712 0 0.0
.dram0.bss 79080 79080 0 0.0
.dram0.data 34020 34020 0 0.0
.flash.rodata 273248 273248 0 0.0
.flash.text 1172399 1172399 0 0.0
.iram0.text 123907 123907 0 0.0
k32w contact k32w0+release (read only) 592404 592404 0 0.0
(read/write) 88096 88096 0 0.0
.bss 71336 71336 0 0.0
.data 2136 2136 0 0.0
.text 591868 591868 0 0.0
k32w1+release (read only) 1024 1024 0 0.0
(read/write) 687960 687960 0 0.0
.bss 67536 67536 0 0.0
.data 2720 2720 0 0.0
.text 574224 574224 0 0.0
light k32w0+release (read only) 592124 592124 0 0.0
(read/write) 87772 87772 0 0.0
.bss 71024 71024 0 0.0
.data 2124 2124 0 0.0
.text 591588 591588 0 0.0
k32w1+release (read only) 1024 1024 0 0.0
(read/write) 779988 779988 0 0.0
.bss 77212 77212 0 0.0
.data 1932 1932 0 0.0
.text 657384 657384 0 0.0
lock k32w0+release (read only) 563972 563972 0 0.0
(read/write) 85592 85592 0 0.0
.bss 68904 68904 0 0.0
.data 2064 2064 0 0.0
.text 563436 563436 0 0.0
linux air-purifier-app debug (read only) 2504349 2504349 0 0.0
(read/write) 126832 126832 0 0.0
.bss 46944 46944 0 0.0
.data 1472 1472 0 0.0
.data.rel.ro 72408 72408 0 0.0
.dynamic 608 608 0 0.0
.got 4568 4568 0 0.0
.init 27 27 0 0.0
.init_array 808 808 0 0.0
.rodata 177320 177320 0 0.0
.text 2152533 2152533 0 0.0
all-clusters-app debug (read only) 5325273 5325273 0 0.0
(read/write) 429440 429440 0 0.0
.bss 130032 130032 0 0.0
.data 3856 3856 0 0.0
.data.rel.ro 288304 288304 0 0.0
.dynamic 624 624 0 0.0
.got 5352 5352 0 0.0
.init 27 27 0 0.0
.init_array 1224 1224 0 0.0
.rodata 302268 302268 0 0.0
.text 4634931 4634931 0 0.0
all-clusters-minimal-app debug (read only) 4928241 4928241 0 0.0
(read/write) 234376 234376 0 0.0
.bss 127824 127824 0 0.0
.data 3792 3792 0 0.0
.data.rel.ro 95616 95616 0 0.0
.dynamic 624 624 0 0.0
.got 5312 5312 0 0.0
.init 27 27 0 0.0
.init_array 1168 1168 0 0.0
.rodata 270605 270605 0 0.0
.text 4425859 4425859 0 0.0
bridge-app debug (read only) 4401185 4401185 0 0.0
(read/write) 215680 215680 0 0.0
.bss 119224 119224 0 0.0
.data 4704 4704 0 0.0
.data.rel.ro 84992 84992 0 0.0
.dynamic 624 624 0 0.0
.got 5280 5280 0 0.0
.init 27 27 0 0.0
.init_array 832 832 0 0.0
.rodata 218325 218325 0 0.0
.text 3964835 3964835 0 0.0
chip-tool debug (read only) 10721321 10721321 0 0.0
(read/write) 464488 464488 0 0.0
.bss 94072 94072 0 0.0
.data 4994 4994 0 0.0
.data.rel.ro 358184 358184 0 0.0
.dynamic 624 624 0 0.0
.got 5784 5784 0 0.0
.init 27 27 0 0.0
.init_array 776 776 0 0.0
.rodata 400297 400297 0 0.0
.text 9693203 9693203 0 0.0
chip-tool-ipv6only arm64 (read only) 10573976 10573976 0 0.0
(read/write) 531936 531936 0 0.0
.bss 103352 103352 0 0.0
.data 4296 4296 0 0.0
.data.rel.ro 396040 396040 0 0.0
.dynamic 512 512 0 0.0
.got 18936 18936 0 0.0
.init 24 24 0 0.0
.init_array 256 256 0 0.0
.rodata 324656 324656 0 0.0
.text 9447048 9447048 0 0.0
lighting-app debug+rpc+ui (read only) 5273953 5273953 0 0.0
(read/write) 224528 224528 0 0.0
.bss 119328 119328 0 0.0
.data 4384 4384 0 0.0
.data.rel.ro 93248 93248 0 0.0
.dynamic 672 672 0 0.0
.got 5896 5896 0 0.0
.init 27 27 0 0.0
.init_array 968 968 0 0.0
.rodata 338228 338228 0 0.0
.text 4691843 4691843 0 0.0
lock-app debug (read only) 4486409 4486409 0 0.0
(read/write) 203296 203296 0 0.0
.bss 113632 113632 0 0.0
.data 3648 3648 0 0.0
.data.rel.ro 79272 79272 0 0.0
.dynamic 624 624 0 0.0
.got 5232 5232 0 0.0
.init 27 27 0 0.0
.init_array 856 856 0 0.0
.rodata 246293 246293 0 0.0
.text 4030579 4030579 0 0.0
ota-provider-app debug (read only) 4150457 4150457 0 0.0
(read/write) 192448 192448 0 0.0
.bss 113632 113632 0 0.0
.data 3920 3920 0 0.0
.data.rel.ro 68976 68976 0 0.0
.dynamic 624 624 0 0.0
.got 4544 4544 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 200629 200629 0 0.0
.text 3758499 3758499 0 0.0
ota-requestor-app debug (read only) 4236793 4236793 0 0.0
(read/write) 196696 196696 0 0.0
.bss 114656 114656 0 0.0
.data 4192 4192 0 0.0
.data.rel.ro 71952 71952 0 0.0
.dynamic 624 624 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 784 784 0 0.0
.rodata 204437 204437 0 0.0
.text 3836723 3836723 0 0.0
shell debug (read only) 2767217 2767217 0 0.0
(read/write) 149736 149736 0 0.0
.bss 60680 60680 0 0.0
.data 784 784 0 0.0
.data.rel.ro 82464 82464 0 0.0
.dynamic 592 592 0 0.0
.got 4104 4104 0 0.0
.init 27 27 0 0.0
.init_array 1080 1080 0 0.0
.rodata 180640 180640 0 0.0
.text 2415890 2415890 0 0.0
thermostat-no-ble arm64 (read only) 4387632 4387632 0 0.0
(read/write) 246528 246528 0 0.0
.bss 122248 122248 0 0.0
.data 2800 2800 0 0.0
.data.rel.ro 102072 102072 0 0.0
.dynamic 512 512 0 0.0
.got 11944 11944 0 0.0
.init 24 24 0 0.0
.init_array 432 432 0 0.0
.rodata 161724 161724 0 0.0
.text 3886312 3886312 0 0.0
tv-app debug (read only) 5270337 5270337 0 0.0
(read/write) 345208 345208 0 0.0
.bss 242432 242432 0 0.0
.data 4992 4992 0 0.0
.data.rel.ro 90480 90480 0 0.0
.dynamic 624 624 0 0.0
.got 5520 5520 0 0.0
.init 27 27 0 0.0
.init_array 1136 1136 0 0.0
.rodata 267101 267101 0 0.0
.text 4768211 4768211 0 0.0
tv-casting-app debug (read only) 8663097 8663097 0 0.0
(read/write) 321952 321952 0 0.0
.bss 156288 156288 0 0.0
.data 2464 2464 0 0.0
.data.rel.ro 156352 156352 0 0.0
.dynamic 624 624 0 0.0
.got 5064 5064 0 0.0
.init 27 27 0 0.0
.init_array 1144 1144 0 0.0
.rodata 346312 346312 0 0.0
.text 7894019 7894019 0 0.0
mbed lock-app-release cy8cproto_062_4343w (read only) 6224 6224 0 0.0
(read/write) 2522728 2522728 0 0.0
.bss 220032 220032 0 0.0
.data 5136 5136 0 0.0
.text 1485412 1485412 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1057624 1057624 0 0.0
bss 128931 128931 0 0.0
rodata 104120 104120 0 0.0
text 776936 776936 0 0.0
nrf7002dk_nrf5340_cpuapp (read only) 4 4 0 0.0
(read/write) 1184336 1184336 0 0.0
bss 121133 121133 0 0.0
rodata 138296 138296 0 0.0
text 774576 774576 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1042904 1042904 0 0.0
bss 129210 129210 0 0.0
rodata 99376 99376 0 0.0
text 766668 766668 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 836328 836328 0 0.0
(read/write) 1736780 1736780 0 0.0
.bss 194532 194532 0 0.0
.data 2480 2480 0 0.0
.text 1531380 1531380 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 838056 838056 0 0.0
(read/write) 1700620 1700620 0 0.0
.bss 192804 192804 0 0.0
.data 2480 2480 0 0.0
.text 1496948 1496948 0 0.0
light cy8ckit_062s2_43012 (read only) 844736 844736 0 0.0
(read/write) 1626724 1626724 0 0.0
.bss 186236 186236 0 0.0
.data 2368 2368 0 0.0
.text 1429732 1429732 0 0.0
lock cy8ckit_062s2_43012 (read only) 817664 817664 0 0.0
(read/write) 1653748 1653748 0 0.0
.bss 213292 213292 0 0.0
.data 2384 2384 0 0.0
.text 1429684 1429684 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1113992 1113992 0 0.0
.bss 101160 101160 0 0.0
.data 748 748 0 0.0
.text 626368 626368 0 0.0
lock-app qpg6105+debug (read/write) 1075132 1075132 0 0.0
.bss 95936 95936 0 0.0
.data 780 780 0 0.0
.text 587508 587508 0 0.0
telink air-quality-sensor-app tlsr9528a_retention (read only) 51774 51774 0 0.0
(read/write) 817018 817018 0 0.0
bss 53700 53700 0 0.0
text 610704 610704 0 0.0
all-clusters-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 1075092 1075092 0 0.0
bss 99976 99976 0 0.0
text 757966 757966 0 0.0
all-clusters-minimal-app tlsr9528a (read only) 4 4 0 0.0
(read/write) 1079924 1079924 0 0.0
bss 109660 109660 0 0.0
text 749602 749602 0 0.0
bridge-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 932212 932212 0 0.0
bss 94180 94180 0 0.0
text 644538 644538 0 0.0
contact-sensor-app tlsr9528a_retention (read only) 51774 51774 0 0.0
(read/write) 817130 817130 0 0.0
bss 53752 53752 0 0.0
text 610908 610908 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a (read only) 4 4 0 0.0
(read/write) 971160 971160 0 0.0
bss 77572 77572 0 0.0
text 688780 688780 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 1089824 1089824 0 0.0
bss 99744 99744 0 0.0
text 766726 766726 0 0.0
lock-app-dfu tlsr9528a (read only) 4 4 0 0.0
(read/write) 957936 957936 0 0.0
bss 95824 95824 0 0.0
text 642906 642906 0 0.0
ota-requestor-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 945420 945420 0 0.0
bss 92288 92288 0 0.0
text 660206 660206 0 0.0
pump-app tlsr9528a (read only) 4 4 0 0.0
(read/write) 873508 873508 0 0.0
bss 67588 67588 0 0.0
text 617330 617330 0 0.0
pump-controller-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 814200 814200 0 0.0
bss 55832 55832 0 0.0
text 584284 584284 0 0.0
resource-monitoring-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 829884 829884 0 0.0
bss 56236 56236 0 0.0
text 594880 594880 0 0.0
shell tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 706192 706192 0 0.0
bss 73620 73620 0 0.0
text 462342 462342 0 0.0
smoke_co_alarm-app tlsr9528a_retention (read only) 51774 51774 0 0.0
(read/write) 818858 818858 0 0.0
bss 53844 53844 0 0.0
text 613632 613632 0 0.0
temperature-measurement-app-mars-ota tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 870889 870889 0 0.0
bss 59300 59300 0 0.0
text 625624 625624 0 0.0
thermostat tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 838236 838236 0 0.0
bss 56120 56120 0 0.0
text 602438 602438 0 0.0
window-covering tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 832736 832736 0 0.0
bss 56472 56472 0 0.0
text 596672 596672 0 0.0

@mergify mergify bot merged commit d0a7cb1 into project-chip:master Nov 18, 2023
57 checks passed
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