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

Make contains/excludes constraints compile for lists of unsigned values. #19730

Merged

Conversation

bzbarsky-apple
Copy link
Contributor

Two changes here:

  1. In chip_tests_iterate_expected_list, we were marking each individual value as
    an array (because "this.isArray" would be true in general when this helper is
    used). That caused asTypedLiteral to fail to map it to an integer basic type
    and hence we were not adding with the proper suffixes, and that lead to
    signed-to-unsigned comparison errors. This is the actual bugfix.

  2. In asTypedLiteral, we really should be suffixing uint8_t with "U". It's not
    clear why compilers don't complain about signed-to-unsigned compares for that
    type the way they do for uint16/32/64_t, but conceptually this is the right
    thing to do.

Fixes #19726

Problem

See #19726

Change overview

See above.

Testing

Checked that things compile with the YAML from #19726 and this change.

@github-actions
Copy link

github-actions bot commented Jun 17, 2022

PR #19730: Size comparison from 147cab2 to 27b4b2b

Increases (2 builds for cc13x2_26x2, telink)
platform target config section 147cab2 27b4b2b change % change
cc13x2_26x2 shell LP_CC2652R7 (read only) 688938 688946 8 0.0
.text 578968 578976 8 0.0
telink light-switch-app tlsr9518adk80d text 559626 559628 2 0.0
Decreases (1 build for cc13x2_26x2)
platform target config section 147cab2 27b4b2b change % change
cc13x2_26x2 shell LP_CC2652R7 (read/write) 157420 157412 -8 -0.0
Full report (41 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 147cab2 27b4b2b change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 659531 659531 0 0.0
(read/write) 191332 191332 0 0.0
.bss 73756 73756 0 0.0
.data 3356 3356 0 0.0
.rodata 87083 87083 0 0.0
.text 572136 572136 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 647999 647999 0 0.0
(read/write) 157316 157316 0 0.0
.bss 73044 73044 0 0.0
.data 3356 3356 0 0.0
.rodata 90407 90407 0 0.0
.text 557272 557272 0 0.0
lock-ftd LP_CC2652R7 (read only) 690467 690467 0 0.0
(read/write) 150508 150508 0 0.0
.bss 70756 70756 0 0.0
.data 3280 3280 0 0.0
.rodata 99163 99163 0 0.0
.text 590820 590820 0 0.0
lock-mtd LP_CC2652R7 (read only) 639875 639875 0 0.0
(read/write) 143888 143888 0 0.0
.bss 66492 66492 0 0.0
.data 3280 3280 0 0.0
.rodata 99043 99043 0 0.0
.text 540340 540340 0 0.0
pump-app LP_CC2652R7 (read only) 671419 671419 0 0.0
(read/write) 170444 170444 0 0.0
.bss 70876 70876 0 0.0
.data 3280 3280 0 0.0
.rodata 87259 87259 0 0.0
.text 583676 583676 0 0.0
pump-controller-app LP_CC2652R7 (read only) 662415 662415 0 0.0
(read/write) 179576 179576 0 0.0
.bss 71004 71004 0 0.0
.data 3276 3276 0 0.0
.rodata 85183 85183 0 0.0
.text 576748 576748 0 0.0
shell LP_CC2652R7 (read only) 688938 688946 8 0.0
(read/write) 157420 157412 -8 -0.0
.bss 76052 76052 0 0.0
.data 3360 3360 0 0.0
.rodata 109658 109658 0 0.0
.text 578968 578976 8 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 612738 612738 0 0.0
.app_xip_area 469404 469404 0 0.0
.bss 86288 86288 0 0.0
.data 728 728 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 610062 610062 0 0.0
.app_xip_area 466552 466552 0 0.0
.bss 86464 86464 0 0.0
.data 732 732 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 616070 616070 0 0.0
.app_xip_area 473624 473624 0 0.0
.bss 85456 85456 0 0.0
.data 672 672 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 924024 924024 0 0.0
(read/write) 132416 132416 0 0.0
.bss 130336 130336 0 0.0
.data 2080 2080 0 0.0
.text 924016 924016 0 0.0
BRD4161A+rpc (read only) 959728 959728 0 0.0
(read/write) 149296 149296 0 0.0
.bss 147008 147008 0 0.0
.data 2284 2284 0 0.0
.text 959720 959720 0 0.0
BRD4161A+rs911x (read only) 799108 799108 0 0.0
(read/write) 128692 128692 0 0.0
.bss 126604 126604 0 0.0
.data 2088 2088 0 0.0
.text 799100 799100 0 0.0
lock-app BRD4161A+wf200 (read only) 965540 965540 0 0.0
(read/write) 129068 129068 0 0.0
.bss 126980 126980 0 0.0
.data 2088 2088 0 0.0
.text 965532 965532 0 0.0
window-app BRD4161A (read only) 909136 909136 0 0.0
(read/write) 132520 132520 0 0.0
.bss 130408 130408 0 0.0
.data 2108 2108 0 0.0
.text 909128 909128 0 0.0
esp32 all-clusters-app c3devkit (read only) 1012646 1012646 0 0.0
(read/write) 1482898 1482898 0 0.0
.dram0.bss 69392 69392 0 0.0
.dram0.data 14632 14632 0 0.0
.flash.rodata 213440 213440 0 0.0
.flash.text 1012646 1012646 0 0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1067167 1067167 0 0.0
(read/write) 485016 485016 0 0.0
.dram0.bss 74912 74912 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 243964 243964 0 0.0
.flash.text 1061783 1061783 0 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 658876 658876 0 0.0
.bss 68756 68756 0 0.0
.data 1992 1992 0 0.0
.text 582328 582328 0 0.0
lock k32w061+release (read/write) 720864 720864 0 0.0
.bss 69196 69196 0 0.0
.data 2000 2000 0 0.0
.text 643868 643868 0 0.0
linux all-clusters-app debug (read only) 2929673 2929673 0 0.0
(read/write) 188656 188656 0 0.0
.bss 95744 95744 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 84664 84664 0 0.0
.dynamic 608 608 0 0.0
.got 4536 4536 0 0.0
.init 27 27 0 0.0
.init_array 1032 1032 0 0.0
.rodata 259421 259421 0 0.0
.text 2493810 2493810 0 0.0
all-clusters-minimal-app debug (read only) 2783385 2783385 0 0.0
(read/write) 180560 180560 0 0.0
.bss 95072 95072 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 77304 77304 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 1032 1032 0 0.0
.rodata 260957 260957 0 0.0
.text 2348162 2348162 0 0.0
bridge-app debug+rpc (read only) 2286033 2286033 0 0.0
(read/write) 159424 159424 0 0.0
.bss 83136 83136 0 0.0
.data 3792 3792 0 0.0
.data.rel.ro 66728 66728 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 194304 194304 0 0.0
.text 1930642 1930642 0 0.0
chip-tool debug (read only) 10140301 10140301 0 0.0
(read/write) 609544 609544 0 0.0
.bss 24352 24352 0 0.0
.data 1088 1088 0 0.0
.data.rel.ro 577808 577808 0 0.0
.dynamic 624 624 0 0.0
.got 5008 5008 0 0.0
.init 27 27 0 0.0
.init_array 640 640 0 0.0
.rodata 508757 508757 0 0.0
.text 8225813 8225813 0 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 9881868 9881868 0 0.0
(read/write) 674225 674225 0 0.0
.bss 42641 42641 0 0.0
.data 1152 1152 0 0.0
.data.rel.ro 613208 613208 0 0.0
.dynamic 528 528 0 0.0
.got 13416 13416 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 472300 472300 0 0.0
.text 7873140 7873140 0 0.0
lighting-app debug+rpc (read only) 2518753 2518753 0 0.0
(read/write) 163448 163448 0 0.0
.bss 83616 83616 0 0.0
.data 2064 2064 0 0.0
.data.rel.ro 71896 71896 0 0.0
.dynamic 608 608 0 0.0
.got 4424 4424 0 0.0
.init 27 27 0 0.0
.init_array 816 816 0 0.0
.rodata 210056 210056 0 0.0
.text 2138994 2138994 0 0.0
lock-app debug (read only) 2457497 2457497 0 0.0
(read/write) 158096 158096 0 0.0
.bss 82016 82016 0 0.0
.data 1680 1680 0 0.0
.data.rel.ro 68568 68568 0 0.0
.dynamic 608 608 0 0.0
.got 4424 4424 0 0.0
.init 27 27 0 0.0
.init_array 776 776 0 0.0
.rodata 223752 223752 0 0.0
.text 2069442 2069442 0 0.0
ota-provider-app debug (read only) 2295377 2295377 0 0.0
(read/write) 152232 152232 0 0.0
.bss 81696 81696 0 0.0
.data 1912 1912 0 0.0
.data.rel.ro 62840 62840 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 199928 199928 0 0.0
.text 1933298 1933298 0 0.0
ota-requestor-app debug (read only) 2411105 2411105 0 0.0
(read/write) 158976 158976 0 0.0
.bss 84000 84000 0 0.0
.data 2200 2200 0 0.0
.data.rel.ro 66936 66936 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 203616 203616 0 0.0
.text 2037106 2037106 0 0.0
shell debug (read only) 2603217 2603217 0 0.0
(read/write) 219288 219288 0 0.0
.bss 134504 134504 0 0.0
.data 1232 1232 0 0.0
.data.rel.ro 77808 77808 0 0.0
.dynamic 608 608 0 0.0
.got 4168 4168 0 0.0
.init 27 27 0 0.0
.init_array 936 936 0 0.0
.rodata 229746 229746 0 0.0
.text 2213714 2213714 0 0.0
thermostat-no-ble arm64 (read only) 2570748 2570748 0 0.0
(read/write) 192193 192193 0 0.0
.bss 99489 99489 0 0.0
.data 1688 1688 0 0.0
.data.rel.ro 82928 82928 0 0.0
.dynamic 528 528 0 0.0
.got 5072 5072 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 163324 163324 0 0.0
.text 2168304 2168304 0 0.0
tv-app debug (read only) 3067249 3067249 0 0.0
(read/write) 289352 289352 0 0.0
.bss 199240 199240 0 0.0
.data 4656 4656 0 0.0
.data.rel.ro 79016 79016 0 0.0
.dynamic 608 608 0 0.0
.got 4840 4840 0 0.0
.init 27 27 0 0.0
.init_array 952 952 0 0.0
.rodata 245664 245664 0 0.0
.text 2634722 2634722 0 0.0
tv-casting-app debug (read only) 5532881 5532881 0 0.0
(read/write) 195664 195664 0 0.0
.bss 84424 84424 0 0.0
.data 2448 2448 0 0.0
.data.rel.ro 102576 102576 0 0.0
.dynamic 608 608 0 0.0
.got 4712 4712 0 0.0
.init 27 27 0 0.0
.init_array 864 864 0 0.0
.rodata 339593 339593 0 0.0
.text 4917058 4917058 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2437720 2437720 0 0.0
.bss 208204 208204 0 0.0
.data 5864 5864 0 0.0
.text 1400364 1400364 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1198699 1198699 0 0.0
bss 141598 141598 0 0.0
rodata 155676 155676 0 0.0
text 822504 822504 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1146655 1146655 0 0.0
bss 140850 140850 0 0.0
rodata 132200 132200 0 0.0
text 794724 794724 0 0.0
p6 all-clusters-app default (read/write) 2553584 2553584 0 0.0
.bss 143384 143384 0 0.0
.data 2776 2776 0 0.0
.text 1511848 1511848 0 0.0
all-clusters-minimal-app default (read/write) 2499448 2499448 0 0.0
.bss 142664 142664 0 0.0
.data 2776 2776 0 0.0
.text 1457712 1457712 0 0.0
light-app default (read/write) 2430176 2430176 0 0.0
.bss 134744 134744 0 0.0
.data 2592 2592 0 0.0
.text 1388440 1388440 0 0.0
lock-app default (read/write) 2450832 2450832 0 0.0
.bss 134568 134568 0 0.0
.data 2600 2600 0 0.0
.text 1409096 1409096 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 789040 789040 0 0.0
bss 69892 69892 0 0.0
noinit 40416 40416 0 0.0
text 559626 559628 2 0.0
lighting-app tlsr9518adk80d (read/write) 808736 808736 0 0.0
bss 70140 70140 0 0.0
noinit 40416 40416 0 0.0
text 576080 576080 0 0.0

@bzbarsky-apple bzbarsky-apple force-pushed the fix-contains-unsigned branch from 27b4b2b to 66a7511 Compare June 18, 2022 04:19
@github-actions
Copy link

github-actions bot commented Jun 18, 2022

PR #19730: Size comparison from 2c7105c to 66a7511

Increases (3 builds for linux, telink)
platform target config section 2c7105c 66a7511 change % change
linux chip-tool debug (read only) 10141773 10142301 528 0.0
.text 8226741 8227269 528 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 9882612 9882980 368 0.0
.text 7873860 7874228 368 0.0
telink lighting-app tlsr9518adk80d text 576116 576118 2 0.0
Decreases (4 builds for cc13x2_26x2, cyw30739, telink)
platform target config section 2c7105c 66a7511 change % change
cc13x2_26x2 all-clusters-minimal-app LP_CC2652R7 (read only) 648023 648015 -8 -0.0
.text 557296 557288 -8 -0.0
cyw30739 light cyw930739m2evb_01 (read/write) 612734 612726 -8 -0.0
.app_xip_area 469400 469392 -8 -0.0
lock cyw930739m2evb_01 (read/write) 610090 610082 -8 -0.0
.app_xip_area 466580 466572 -8 -0.0
telink light-switch-app tlsr9518adk80d text 559660 559658 -2 -0.0
Full report (39 builds for cc13x2_26x2, cyw30739, efr32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 2c7105c 66a7511 change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 659527 659527 0 0.0
(read/write) 191336 191336 0 0.0
.bss 73756 73756 0 0.0
.data 3356 3356 0 0.0
.rodata 87087 87087 0 0.0
.text 572128 572128 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 648023 648015 -8 -0.0
(read/write) 157316 157316 0 0.0
.bss 73044 73044 0 0.0
.data 3356 3356 0 0.0
.rodata 90407 90407 0 0.0
.text 557296 557288 -8 -0.0
lock-ftd LP_CC2652R7 (read only) 690491 690491 0 0.0
(read/write) 150484 150484 0 0.0
.bss 70756 70756 0 0.0
.data 3280 3280 0 0.0
.rodata 99163 99163 0 0.0
.text 590844 590844 0 0.0
lock-mtd LP_CC2652R7 (read only) 639891 639891 0 0.0
(read/write) 143888 143888 0 0.0
.bss 66492 66492 0 0.0
.data 3280 3280 0 0.0
.rodata 99043 99043 0 0.0
.text 540356 540356 0 0.0
pump-app LP_CC2652R7 (read only) 671427 671427 0 0.0
(read/write) 170436 170436 0 0.0
.bss 70876 70876 0 0.0
.data 3280 3280 0 0.0
.rodata 87259 87259 0 0.0
.text 583684 583684 0 0.0
pump-controller-app LP_CC2652R7 (read only) 657319 657319 0 0.0
(read/write) 184656 184656 0 0.0
.bss 70988 70988 0 0.0
.data 3276 3276 0 0.0
.rodata 83103 83103 0 0.0
.text 573736 573736 0 0.0
shell LP_CC2652R7 (read only) 688954 688954 0 0.0
(read/write) 157404 157404 0 0.0
.bss 76052 76052 0 0.0
.data 3360 3360 0 0.0
.rodata 109658 109658 0 0.0
.text 578984 578984 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 612734 612726 -8 -0.0
.app_xip_area 469400 469392 -8 -0.0
.bss 86288 86288 0 0.0
.data 728 728 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 610090 610082 -8 -0.0
.app_xip_area 466580 466572 -8 -0.0
.bss 86464 86464 0 0.0
.data 732 732 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 616090 616090 0 0.0
.app_xip_area 473644 473644 0 0.0
.bss 85456 85456 0 0.0
.data 672 672 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 924012 924012 0 0.0
(read/write) 132416 132416 0 0.0
.bss 130336 130336 0 0.0
.data 2080 2080 0 0.0
.text 924004 924004 0 0.0
BRD4161A+rpc (read only) 959716 959716 0 0.0
(read/write) 149292 149292 0 0.0
.bss 147008 147008 0 0.0
.data 2284 2284 0 0.0
.text 959708 959708 0 0.0
BRD4161A+rs911x (read only) 799408 799408 0 0.0
(read/write) 128692 128692 0 0.0
.bss 126604 126604 0 0.0
.data 2088 2088 0 0.0
.text 799400 799400 0 0.0
lock-app BRD4161A+wf200 (read only) 965828 965828 0 0.0
(read/write) 129068 129068 0 0.0
.bss 126980 126980 0 0.0
.data 2088 2088 0 0.0
.text 965820 965820 0 0.0
window-app BRD4161A (read only) 909172 909172 0 0.0
(read/write) 132516 132516 0 0.0
.bss 130408 130408 0 0.0
.data 2108 2108 0 0.0
.text 909164 909164 0 0.0
k32w light k32w061+release (read/write) 658892 658892 0 0.0
.bss 68756 68756 0 0.0
.data 1992 1992 0 0.0
.text 582344 582344 0 0.0
lock k32w061+release (read/write) 720884 720884 0 0.0
.bss 69196 69196 0 0.0
.data 2000 2000 0 0.0
.text 643888 643888 0 0.0
linux all-clusters-app debug (read only) 2931273 2931273 0 0.0
(read/write) 188656 188656 0 0.0
.bss 95744 95744 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 84664 84664 0 0.0
.dynamic 608 608 0 0.0
.got 4536 4536 0 0.0
.init 27 27 0 0.0
.init_array 1032 1032 0 0.0
.rodata 260029 260029 0 0.0
.text 2494802 2494802 0 0.0
all-clusters-minimal-app debug (read only) 2784985 2784985 0 0.0
(read/write) 180560 180560 0 0.0
.bss 95072 95072 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 77304 77304 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 1032 1032 0 0.0
.rodata 261565 261565 0 0.0
.text 2349154 2349154 0 0.0
bridge-app debug+rpc (read only) 2287569 2287569 0 0.0
(read/write) 159424 159424 0 0.0
.bss 83136 83136 0 0.0
.data 3792 3792 0 0.0
.data.rel.ro 66728 66728 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 194848 194848 0 0.0
.text 1931634 1931634 0 0.0
chip-tool debug (read only) 10141773 10142301 528 0.0
(read/write) 609544 609544 0 0.0
.bss 24352 24352 0 0.0
.data 1088 1088 0 0.0
.data.rel.ro 577808 577808 0 0.0
.dynamic 624 624 0 0.0
.got 5008 5008 0 0.0
.init 27 27 0 0.0
.init_array 640 640 0 0.0
.rodata 509301 509301 0 0.0
.text 8226741 8227269 528 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 9882612 9882980 368 0.0
(read/write) 674225 674225 0 0.0
.bss 42641 42641 0 0.0
.data 1152 1152 0 0.0
.data.rel.ro 613208 613208 0 0.0
.dynamic 528 528 0 0.0
.got 13416 13416 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 472324 472324 0 0.0
.text 7873860 7874228 368 0.0
lighting-app debug+rpc (read only) 2520321 2520321 0 0.0
(read/write) 163448 163448 0 0.0
.bss 83616 83616 0 0.0
.data 2064 2064 0 0.0
.data.rel.ro 71896 71896 0 0.0
.dynamic 608 608 0 0.0
.got 4424 4424 0 0.0
.init 27 27 0 0.0
.init_array 816 816 0 0.0
.rodata 210632 210632 0 0.0
.text 2139986 2139986 0 0.0
lock-app debug (read only) 2459001 2459001 0 0.0
(read/write) 158096 158096 0 0.0
.bss 82016 82016 0 0.0
.data 1680 1680 0 0.0
.data.rel.ro 68568 68568 0 0.0
.dynamic 608 608 0 0.0
.got 4424 4424 0 0.0
.init 27 27 0 0.0
.init_array 776 776 0 0.0
.rodata 224328 224328 0 0.0
.text 2070370 2070370 0 0.0
ota-provider-app debug (read only) 2296881 2296881 0 0.0
(read/write) 152232 152232 0 0.0
.bss 81696 81696 0 0.0
.data 1912 1912 0 0.0
.data.rel.ro 62840 62840 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 200504 200504 0 0.0
.text 1934226 1934226 0 0.0
ota-requestor-app debug (read only) 2412609 2412609 0 0.0
(read/write) 158976 158976 0 0.0
.bss 84000 84000 0 0.0
.data 2200 2200 0 0.0
.data.rel.ro 66936 66936 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 204192 204192 0 0.0
.text 2038034 2038034 0 0.0
shell debug (read only) 2604753 2604753 0 0.0
(read/write) 219288 219288 0 0.0
.bss 134504 134504 0 0.0
.data 1232 1232 0 0.0
.data.rel.ro 77808 77808 0 0.0
.dynamic 608 608 0 0.0
.got 4168 4168 0 0.0
.init 27 27 0 0.0
.init_array 936 936 0 0.0
.rodata 230290 230290 0 0.0
.text 2214706 2214706 0 0.0
thermostat-no-ble arm64 (read only) 2571484 2571484 0 0.0
(read/write) 192193 192193 0 0.0
.bss 99489 99489 0 0.0
.data 1688 1688 0 0.0
.data.rel.ro 82928 82928 0 0.0
.dynamic 528 528 0 0.0
.got 5072 5072 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 163340 163340 0 0.0
.text 2169024 2169024 0 0.0
tv-app debug (read only) 3068753 3068753 0 0.0
(read/write) 289352 289352 0 0.0
.bss 199240 199240 0 0.0
.data 4656 4656 0 0.0
.data.rel.ro 79016 79016 0 0.0
.dynamic 608 608 0 0.0
.got 4840 4840 0 0.0
.init 27 27 0 0.0
.init_array 952 952 0 0.0
.rodata 246176 246176 0 0.0
.text 2635714 2635714 0 0.0
tv-casting-app debug (read only) 5534417 5534417 0 0.0
(read/write) 195664 195664 0 0.0
.bss 84424 84424 0 0.0
.data 2448 2448 0 0.0
.data.rel.ro 102576 102576 0 0.0
.dynamic 608 608 0 0.0
.got 4712 4712 0 0.0
.init 27 27 0 0.0
.init_array 864 864 0 0.0
.rodata 340137 340137 0 0.0
.text 4918050 4918050 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2438040 2438040 0 0.0
.bss 208204 208204 0 0.0
.data 5864 5864 0 0.0
.text 1400684 1400684 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1198699 1198699 0 0.0
bss 141598 141598 0 0.0
rodata 155676 155676 0 0.0
text 822516 822516 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1146671 1146671 0 0.0
bss 140850 140850 0 0.0
rodata 132200 132200 0 0.0
text 794740 794740 0 0.0
p6 all-clusters-app default (read/write) 2553880 2553880 0 0.0
.bss 143384 143384 0 0.0
.data 2776 2776 0 0.0
.text 1512144 1512144 0 0.0
all-clusters-minimal-app default (read/write) 2499728 2499728 0 0.0
.bss 142664 142664 0 0.0
.data 2776 2776 0 0.0
.text 1457992 1457992 0 0.0
light-app default (read/write) 2430488 2430488 0 0.0
.bss 134744 134744 0 0.0
.data 2592 2592 0 0.0
.text 1388752 1388752 0 0.0
lock-app default (read/write) 2451184 2451184 0 0.0
.bss 134568 134568 0 0.0
.data 2600 2600 0 0.0
.text 1409448 1409448 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 789072 789072 0 0.0
bss 69892 69892 0 0.0
noinit 40416 40416 0 0.0
text 559660 559658 -2 -0.0
lighting-app tlsr9518adk80d (read/write) 808776 808776 0 0.0
bss 70140 70140 0 0.0
noinit 40416 40416 0 0.0
text 576116 576118 2 0.0

Two changes here:

1) In chip_tests_iterate_expected_list, we were marking each individual value as
   an array (because "this.isArray" would be true in general when this helper is
   used).  That caused asTypedLiteral to fail to map it to an integer basic type
   and hence we were not adding with the proper suffixes, and that lead to
   signed-to-unsigned comparison errors.  This is the actual bugfix.

2) In asTypedLiteral, we really should be suffixing uint8_t with "U".  It's not
   clear why compilers don't complain about signed-to-unsigned compares for that
   type the way they do for uint16/32/64_t, but conceptually this is the right
   thing to do.

Fixes project-chip#19726
@bzbarsky-apple bzbarsky-apple force-pushed the fix-contains-unsigned branch from 66a7511 to b8535db Compare June 18, 2022 05:15
@github-actions
Copy link

github-actions bot commented Jun 18, 2022

PR #19730: Size comparison from 2c7105c to b8535db

Increases (4 builds for linux, nrfconnect, telink)
platform target config section 2c7105c b8535db change % change
linux chip-tool debug (read only) 10141773 10142301 528 0.0
.text 8226741 8227269 528 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 9882612 9882980 368 0.0
.text 7873860 7874228 368 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1198699 1198715 16 0.0
text 822516 822520 4 0.0
telink lighting-app tlsr9518adk80d text 576116 576118 2 0.0
Decreases (3 builds for cyw30739, esp32, telink)
platform target config section 2c7105c b8535db change % change
cyw30739 lock cyw930739m2evb_01 (read/write) 610090 610082 -8 -0.0
.app_xip_area 466580 466572 -8 -0.0
esp32 all-clusters-app c3devkit (read only) 1012942 1012940 -2 -0.0
.flash.text 1012942 1012940 -2 -0.0
telink light-switch-app tlsr9518adk80d text 559660 559658 -2 -0.0
Full report (41 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 2c7105c b8535db change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 659527 659527 0 0.0
(read/write) 191336 191336 0 0.0
.bss 73756 73756 0 0.0
.data 3356 3356 0 0.0
.rodata 87087 87087 0 0.0
.text 572128 572128 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 648023 648023 0 0.0
(read/write) 157316 157316 0 0.0
.bss 73044 73044 0 0.0
.data 3356 3356 0 0.0
.rodata 90407 90407 0 0.0
.text 557296 557296 0 0.0
lock-ftd LP_CC2652R7 (read only) 690491 690491 0 0.0
(read/write) 150484 150484 0 0.0
.bss 70756 70756 0 0.0
.data 3280 3280 0 0.0
.rodata 99163 99163 0 0.0
.text 590844 590844 0 0.0
lock-mtd LP_CC2652R7 (read only) 639891 639891 0 0.0
(read/write) 143888 143888 0 0.0
.bss 66492 66492 0 0.0
.data 3280 3280 0 0.0
.rodata 99043 99043 0 0.0
.text 540356 540356 0 0.0
pump-app LP_CC2652R7 (read only) 671427 671427 0 0.0
(read/write) 170436 170436 0 0.0
.bss 70876 70876 0 0.0
.data 3280 3280 0 0.0
.rodata 87259 87259 0 0.0
.text 583684 583684 0 0.0
pump-controller-app LP_CC2652R7 (read only) 657319 657319 0 0.0
(read/write) 184656 184656 0 0.0
.bss 70988 70988 0 0.0
.data 3276 3276 0 0.0
.rodata 83103 83103 0 0.0
.text 573736 573736 0 0.0
shell LP_CC2652R7 (read only) 688954 688954 0 0.0
(read/write) 157404 157404 0 0.0
.bss 76052 76052 0 0.0
.data 3360 3360 0 0.0
.rodata 109658 109658 0 0.0
.text 578984 578984 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 612734 612734 0 0.0
.app_xip_area 469400 469400 0 0.0
.bss 86288 86288 0 0.0
.data 728 728 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 610090 610082 -8 -0.0
.app_xip_area 466580 466572 -8 -0.0
.bss 86464 86464 0 0.0
.data 732 732 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 616090 616090 0 0.0
.app_xip_area 473644 473644 0 0.0
.bss 85456 85456 0 0.0
.data 672 672 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 924012 924012 0 0.0
(read/write) 132416 132416 0 0.0
.bss 130336 130336 0 0.0
.data 2080 2080 0 0.0
.text 924004 924004 0 0.0
BRD4161A+rpc (read only) 959716 959716 0 0.0
(read/write) 149292 149292 0 0.0
.bss 147008 147008 0 0.0
.data 2284 2284 0 0.0
.text 959708 959708 0 0.0
BRD4161A+rs911x (read only) 799408 799408 0 0.0
(read/write) 128692 128692 0 0.0
.bss 126604 126604 0 0.0
.data 2088 2088 0 0.0
.text 799400 799400 0 0.0
lock-app BRD4161A+wf200 (read only) 965828 965828 0 0.0
(read/write) 129068 129068 0 0.0
.bss 126980 126980 0 0.0
.data 2088 2088 0 0.0
.text 965820 965820 0 0.0
window-app BRD4161A (read only) 909172 909172 0 0.0
(read/write) 132516 132516 0 0.0
.bss 130408 130408 0 0.0
.data 2108 2108 0 0.0
.text 909164 909164 0 0.0
esp32 all-clusters-app c3devkit (read only) 1012942 1012940 -2 -0.0
(read/write) 1482898 1482898 0 0.0
.dram0.bss 69392 69392 0 0.0
.dram0.data 14632 14632 0 0.0
.flash.rodata 213440 213440 0 0.0
.flash.text 1012942 1012940 -2 -0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1067419 1067419 0 0.0
(read/write) 485016 485016 0 0.0
.dram0.bss 74912 74912 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 243964 243964 0 0.0
.flash.text 1062035 1062035 0 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 658892 658892 0 0.0
.bss 68756 68756 0 0.0
.data 1992 1992 0 0.0
.text 582344 582344 0 0.0
lock k32w061+release (read/write) 720884 720884 0 0.0
.bss 69196 69196 0 0.0
.data 2000 2000 0 0.0
.text 643888 643888 0 0.0
linux all-clusters-app debug (read only) 2931273 2931273 0 0.0
(read/write) 188656 188656 0 0.0
.bss 95744 95744 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 84664 84664 0 0.0
.dynamic 608 608 0 0.0
.got 4536 4536 0 0.0
.init 27 27 0 0.0
.init_array 1032 1032 0 0.0
.rodata 260029 260029 0 0.0
.text 2494802 2494802 0 0.0
all-clusters-minimal-app debug (read only) 2784985 2784985 0 0.0
(read/write) 180560 180560 0 0.0
.bss 95072 95072 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 77304 77304 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 1032 1032 0 0.0
.rodata 261565 261565 0 0.0
.text 2349154 2349154 0 0.0
bridge-app debug+rpc (read only) 2287569 2287569 0 0.0
(read/write) 159424 159424 0 0.0
.bss 83136 83136 0 0.0
.data 3792 3792 0 0.0
.data.rel.ro 66728 66728 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 194848 194848 0 0.0
.text 1931634 1931634 0 0.0
chip-tool debug (read only) 10141773 10142301 528 0.0
(read/write) 609544 609544 0 0.0
.bss 24352 24352 0 0.0
.data 1088 1088 0 0.0
.data.rel.ro 577808 577808 0 0.0
.dynamic 624 624 0 0.0
.got 5008 5008 0 0.0
.init 27 27 0 0.0
.init_array 640 640 0 0.0
.rodata 509301 509301 0 0.0
.text 8226741 8227269 528 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 9882612 9882980 368 0.0
(read/write) 674225 674225 0 0.0
.bss 42641 42641 0 0.0
.data 1152 1152 0 0.0
.data.rel.ro 613208 613208 0 0.0
.dynamic 528 528 0 0.0
.got 13416 13416 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 472324 472324 0 0.0
.text 7873860 7874228 368 0.0
lighting-app debug+rpc (read only) 2520321 2520321 0 0.0
(read/write) 163448 163448 0 0.0
.bss 83616 83616 0 0.0
.data 2064 2064 0 0.0
.data.rel.ro 71896 71896 0 0.0
.dynamic 608 608 0 0.0
.got 4424 4424 0 0.0
.init 27 27 0 0.0
.init_array 816 816 0 0.0
.rodata 210632 210632 0 0.0
.text 2139986 2139986 0 0.0
lock-app debug (read only) 2459001 2459001 0 0.0
(read/write) 158096 158096 0 0.0
.bss 82016 82016 0 0.0
.data 1680 1680 0 0.0
.data.rel.ro 68568 68568 0 0.0
.dynamic 608 608 0 0.0
.got 4424 4424 0 0.0
.init 27 27 0 0.0
.init_array 776 776 0 0.0
.rodata 224328 224328 0 0.0
.text 2070370 2070370 0 0.0
ota-provider-app debug (read only) 2296881 2296881 0 0.0
(read/write) 152232 152232 0 0.0
.bss 81696 81696 0 0.0
.data 1912 1912 0 0.0
.data.rel.ro 62840 62840 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 200504 200504 0 0.0
.text 1934226 1934226 0 0.0
ota-requestor-app debug (read only) 2412609 2412609 0 0.0
(read/write) 158976 158976 0 0.0
.bss 84000 84000 0 0.0
.data 2200 2200 0 0.0
.data.rel.ro 66936 66936 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 204192 204192 0 0.0
.text 2038034 2038034 0 0.0
shell debug (read only) 2604753 2604753 0 0.0
(read/write) 219288 219288 0 0.0
.bss 134504 134504 0 0.0
.data 1232 1232 0 0.0
.data.rel.ro 77808 77808 0 0.0
.dynamic 608 608 0 0.0
.got 4168 4168 0 0.0
.init 27 27 0 0.0
.init_array 936 936 0 0.0
.rodata 230290 230290 0 0.0
.text 2214706 2214706 0 0.0
thermostat-no-ble arm64 (read only) 2571484 2571484 0 0.0
(read/write) 192193 192193 0 0.0
.bss 99489 99489 0 0.0
.data 1688 1688 0 0.0
.data.rel.ro 82928 82928 0 0.0
.dynamic 528 528 0 0.0
.got 5072 5072 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 163340 163340 0 0.0
.text 2169024 2169024 0 0.0
tv-app debug (read only) 3068753 3068753 0 0.0
(read/write) 289352 289352 0 0.0
.bss 199240 199240 0 0.0
.data 4656 4656 0 0.0
.data.rel.ro 79016 79016 0 0.0
.dynamic 608 608 0 0.0
.got 4840 4840 0 0.0
.init 27 27 0 0.0
.init_array 952 952 0 0.0
.rodata 246176 246176 0 0.0
.text 2635714 2635714 0 0.0
tv-casting-app debug (read only) 5534417 5534417 0 0.0
(read/write) 195664 195664 0 0.0
.bss 84424 84424 0 0.0
.data 2448 2448 0 0.0
.data.rel.ro 102576 102576 0 0.0
.dynamic 608 608 0 0.0
.got 4712 4712 0 0.0
.init 27 27 0 0.0
.init_array 864 864 0 0.0
.rodata 340137 340137 0 0.0
.text 4918050 4918050 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2438040 2438040 0 0.0
.bss 208204 208204 0 0.0
.data 5864 5864 0 0.0
.text 1400684 1400684 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1198699 1198715 16 0.0
bss 141598 141598 0 0.0
rodata 155676 155676 0 0.0
text 822516 822520 4 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1146671 1146671 0 0.0
bss 140850 140850 0 0.0
rodata 132200 132200 0 0.0
text 794740 794740 0 0.0
p6 all-clusters-app default (read/write) 2553880 2553880 0 0.0
.bss 143384 143384 0 0.0
.data 2776 2776 0 0.0
.text 1512144 1512144 0 0.0
all-clusters-minimal-app default (read/write) 2499728 2499728 0 0.0
.bss 142664 142664 0 0.0
.data 2776 2776 0 0.0
.text 1457992 1457992 0 0.0
light-app default (read/write) 2430488 2430488 0 0.0
.bss 134744 134744 0 0.0
.data 2592 2592 0 0.0
.text 1388752 1388752 0 0.0
lock-app default (read/write) 2451184 2451184 0 0.0
.bss 134568 134568 0 0.0
.data 2600 2600 0 0.0
.text 1409448 1409448 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 789072 789072 0 0.0
bss 69892 69892 0 0.0
noinit 40416 40416 0 0.0
text 559660 559658 -2 -0.0
lighting-app tlsr9518adk80d (read/write) 808776 808776 0 0.0
bss 70140 70140 0 0.0
noinit 40416 40416 0 0.0
text 576116 576118 2 0.0

@jmartinez-silabs jmartinez-silabs merged commit 597a710 into project-chip:master Jun 21, 2022
@bzbarsky-apple bzbarsky-apple deleted the fix-contains-unsigned branch June 21, 2022 19:03
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.

The YAML "contains" does not seem to work when used to validate AttributeList
4 participants