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

Remove duplicate declarations of build variables #17711

Merged
merged 1 commit into from
Apr 27, 2022

Conversation

mspang
Copy link
Contributor

@mspang mspang commented Apr 25, 2022

Problem

Each argument should be declared in exactly one build file. The args.gni
files are for setting arguments, not declaring them.

Using declare_args() in these files doesn't do anything except for
suppress "unused argument" diagnostics, which isn't desirable (those
diagnostics are already opt-in).

Change overview

Remove errant declare_args() from args.gni files.

Testing

CI

@github-actions
Copy link

github-actions bot commented Apr 25, 2022

PR #17711: Size comparison from 8f45a9e to 8fac0f1

Full report (31 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, p6, telink)
platform target config section 8f45a9e 8fac0f1 change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 692123 692123 0 0.0
(read/write) 159900 159900 0 0.0
.bss 75008 75008 0 0.0
.data 3396 3396 0 0.0
.rodata 105995 105995 0 0.0
.text 585648 585648 0 0.0
lock-ftd LP_CC2652R7 (read only) 678647 678647 0 0.0
(read/write) 164688 164688 0 0.0
.bss 73376 73376 0 0.0
.data 3220 3220 0 0.0
.rodata 98831 98831 0 0.0
.text 579332 579332 0 0.0
lock-mtd LP_CC2652R7 (read only) 627391 627391 0 0.0
(read/write) 146172 146172 0 0.0
.bss 69096 69096 0 0.0
.data 3220 3220 0 0.0
.rodata 98711 98711 0 0.0
.text 528188 528188 0 0.0
pump-app LP_CC2652R7 (read only) 651123 651123 0 0.0
(read/write) 151684 151684 0 0.0
.bss 73552 73552 0 0.0
.data 3252 3252 0 0.0
.rodata 75723 75723 0 0.0
.text 574912 574912 0 0.0
pump-controller-app LP_CC2652R7 (read only) 644175 644175 0 0.0
(read/write) 151440 151440 0 0.0
.bss 73600 73600 0 0.0
.data 3216 3216 0 0.0
.rodata 78839 78839 0 0.0
.text 564848 564848 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 623486 623486 0 0.0
.app_xip_area 526364 526364 0 0.0
.bss 79780 79780 0 0.0
.data 692 692 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 618442 618442 0 0.0
.app_xip_area 522792 522792 0 0.0
.bss 78340 78340 0 0.0
.data 656 656 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 571158 571158 0 0.0
.app_xip_area 465872 465872 0 0.0
.bss 87680 87680 0 0.0
.data 568 568 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 907616 907616 0 0.0
(read/write) 134912 134912 0 0.0
.bss 132864 132864 0 0.0
.data 2044 2044 0 0.0
.text 907608 907608 0 0.0
BRD4161A+rpc (read only) 942032 942032 0 0.0
(read/write) 151592 151592 0 0.0
.bss 149344 149344 0 0.0
.data 2248 2248 0 0.0
.text 942024 942024 0 0.0
window-app BRD4161A (read only) 845000 845000 0 0.0
(read/write) 133000 133000 0 0.0
.bss 131040 131040 0 0.0
.data 1956 1956 0 0.0
.text 844992 844992 0 0.0
esp32 all-clusters-app c3devkit (read only) 999398 999398 0 0.0
(read/write) 1473658 1473658 0 0.0
.dram0.bss 68176 68176 0 0.0
.dram0.data 14428 14428 0 0.0
.flash.rodata 206608 206608 0 0.0
.flash.text 999398 999398 0 0.0
.iram0.text 62020 62020 0 0.0
m5stack (read only) 1053627 1053627 0 0.0
(read/write) 475656 475656 0 0.0
.dram0.bss 73696 73696 0 0.0
.dram0.data 34168 34168 0 0.0
.flash.rodata 235956 235956 0 0.0
.flash.text 1048243 1048243 0 0.0
.iram0.text 123107 123107 0 0.0
k32w light k32w061+release (read/write) 688740 688740 0 0.0
.bss 81112 81112 0 0.0
.data 2000 2000 0 0.0
.text 599828 599828 0 0.0
lock k32w061+release (read/write) 729632 729632 0 0.0
.bss 81520 81520 0 0.0
.data 1960 1960 0 0.0
.text 640352 640352 0 0.0
linux all-clusters-app debug (read only) 2735009 2735009 0 0.0
(read/write) 172872 172872 0 0.0
.bss 83168 83168 0 0.0
.data 1984 1984 0 0.0
.data.rel.ro 81640 81640 0 0.0
.dynamic 608 608 0 0.0
.got 4464 4464 0 0.0
.init 27 27 0 0.0
.init_array 992 992 0 0.0
.rodata 233861 233861 0 0.0
.text 2326306 2326306 0 0.0
bridge-app debug+rpc (read only) 1891009 1891009 0 0.0
(read/write) 120304 120304 0 0.0
.bss 71168 71168 0 0.0
.data 3424 3424 0 0.0
.data.rel.ro 40392 40392 0 0.0
.dynamic 592 592 0 0.0
.got 4032 4032 0 0.0
.init 27 27 0 0.0
.init_array 680 680 0 0.0
.rodata 159633 159633 0 0.0
.text 1608594 1608594 0 0.0
chip-tool debug (read only) 10944717 10944717 0 0.0
(read/write) 375792 375792 0 0.0
.bss 22592 22592 0 0.0
.data 1136 1136 0 0.0
.data.rel.ro 345808 345808 0 0.0
.dynamic 624 624 0 0.0
.got 4952 4952 0 0.0
.init 27 27 0 0.0
.init_array 648 648 0 0.0
.rodata 547349 547349 0 0.0
.text 9557413 9557413 0 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 10556092 10556092 0 0.0
(read/write) 497697 497697 0 0.0
.bss 40897 40897 0 0.0
.data 1192 1192 0 0.0
.data.rel.ro 393104 393104 0 0.0
.dynamic 560 560 0 0.0
.got 58680 58680 0 0.0
.init 24 24 0 0.0
.init_array 184 184 0 0.0
.rodata 521228 521228 0 0.0
.text 8917012 8917012 0 0.0
lighting-app debug+rpc (read only) 2326465 2326465 0 0.0
(read/write) 151256 151256 0 0.0
.bss 73216 73216 0 0.0
.data 1984 1984 0 0.0
.data.rel.ro 70328 70328 0 0.0
.dynamic 608 608 0 0.0
.got 4320 4320 0 0.0
.init 27 27 0 0.0
.init_array 784 784 0 0.0
.rodata 183729 183729 0 0.0
.text 1976098 1976098 0 0.0
lock-app debug (read only) 2206801 2206801 0 0.0
(read/write) 145640 145640 0 0.0
.bss 71808 71808 0 0.0
.data 1504 1504 0 0.0
.data.rel.ro 66664 66664 0 0.0
.dynamic 592 592 0 0.0
.got 4312 4312 0 0.0
.init 27 27 0 0.0
.init_array 736 736 0 0.0
.rodata 192193 192193 0 0.0
.text 1854610 1854610 0 0.0
ota-provider-app debug (read only) 2059521 2059521 0 0.0
(read/write) 138888 138888 0 0.0
.bss 71232 71232 0 0.0
.data 1672 1672 0 0.0
.data.rel.ro 60216 60216 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 640 640 0 0.0
.rodata 174235 174235 0 0.0
.text 1727778 1727778 0 0.0
ota-requestor-app debug (read only) 2090785 2090785 0 0.0
(read/write) 141696 141696 0 0.0
.bss 71872 71872 0 0.0
.data 1928 1928 0 0.0
.data.rel.ro 62264 62264 0 0.0
.dynamic 592 592 0 0.0
.got 4320 4320 0 0.0
.init 27 27 0 0.0
.init_array 664 664 0 0.0
.rodata 170588 170588 0 0.0
.text 1761202 1761202 0 0.0
shell debug (read only) 2560809 2560809 0 0.0
(read/write) 196840 196840 0 0.0
.bss 113768 113768 0 0.0
.data 1360 1360 0 0.0
.data.rel.ro 75992 75992 0 0.0
.dynamic 592 592 0 0.0
.got 4184 4184 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 215570 215570 0 0.0
.text 2183330 2183330 0 0.0
thermostat-no-ble arm64 (read only) 2367884 2367884 0 0.0
(read/write) 174369 174369 0 0.0
.bss 86097 86097 0 0.0
.data 1488 1488 0 0.0
.data.rel.ro 79008 79008 0 0.0
.dynamic 560 560 0 0.0
.got 4744 4744 0 0.0
.init 24 24 0 0.0
.init_array 368 368 0 0.0
.rodata 145484 145484 0 0.0
.text 1993296 1993296 0 0.0
tv-app debug (read only) 2844569 2844569 0 0.0
(read/write) 276536 276536 0 0.0
.bss 189112 189112 0 0.0
.data 4640 4640 0 0.0
.data.rel.ro 76568 76568 0 0.0
.dynamic 592 592 0 0.0
.got 4696 4696 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 216011 216011 0 0.0
.text 2446098 2446098 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2411436 2411436 0 0.0
.bss 205660 205660 0 0.0
.data 5848 5848 0 0.0
.text 1374036 1374036 0 0.0
p6 all-clusters-app default (read/write) 2526936 2526936 0 0.0
.bss 139040 139040 0 0.0
.data 2784 2784 0 0.0
.text 1485200 1485200 0 0.0
light-app default (read/write) 2418688 2418688 0 0.0
.bss 132520 132520 0 0.0
.data 2584 2584 0 0.0
.text 1376952 1376952 0 0.0
lock-app default (read/write) 2422864 2422864 0 0.0
.bss 132320 132320 0 0.0
.data 2544 2544 0 0.0
.text 1381128 1381128 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 807948 807948 0 0.0
bss 75216 75216 0 0.0
noinit 40416 40416 0 0.0
text 571718 571718 0 0.0

Each argument should be declared in exactly one build file. The args.gni
files are for setting arguments, not declaring them.  Remove errant
declare_args() from args.gni files.

Using declare_args() in these files doesn't do anything except for
suppress "unused argument" diagnostics, which isn't desirable (those
diagnostics are already opt-in).
@mspang mspang force-pushed the for-chip/rm-dup-args branch from 8fac0f1 to 41abc9c Compare April 26, 2022 17:45
@github-actions
Copy link

github-actions bot commented Apr 26, 2022

PR #17711: Size comparison from 6c54ab8 to 41abc9c

Full report (32 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 6c54ab8 41abc9c change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 688215 688215 0 0.0
(read/write) 163824 163824 0 0.0
.bss 75020 75020 0 0.0
.data 3396 3396 0 0.0
.rodata 101583 101583 0 0.0
.text 586152 586152 0 0.0
lock-ftd LP_CC2652R7 (read only) 688783 688783 0 0.0
(read/write) 154568 154568 0 0.0
.bss 73388 73388 0 0.0
.data 3220 3220 0 0.0
.rodata 103175 103175 0 0.0
.text 585124 585124 0 0.0
lock-mtd LP_CC2652R7 (read only) 637535 637535 0 0.0
(read/write) 146188 146188 0 0.0
.bss 69108 69108 0 0.0
.data 3220 3220 0 0.0
.rodata 103055 103055 0 0.0
.text 533988 533988 0 0.0
pump-app LP_CC2652R7 (read only) 661635 661635 0 0.0
(read/write) 182916 182916 0 0.0
.bss 73564 73564 0 0.0
.data 3252 3252 0 0.0
.rodata 80371 80371 0 0.0
.text 580784 580784 0 0.0
pump-controller-app LP_CC2652R7 (read only) 654523 654523 0 0.0
(read/write) 189820 189820 0 0.0
.bss 73612 73612 0 0.0
.data 3216 3216 0 0.0
.rodata 83395 83395 0 0.0
.text 570648 570648 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 626770 626770 0 0.0
.app_xip_area 529648 529648 0 0.0
.bss 79780 79780 0 0.0
.data 692 692 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 621314 621314 0 0.0
.app_xip_area 525664 525664 0 0.0
.bss 78340 78340 0 0.0
.data 656 656 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 574150 574150 0 0.0
.app_xip_area 468856 468856 0 0.0
.bss 87688 87688 0 0.0
.data 568 568 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 907612 907612 0 0.0
(read/write) 134908 134908 0 0.0
.bss 132864 132864 0 0.0
.data 2044 2044 0 0.0
.text 907604 907604 0 0.0
BRD4161A+rpc (read only) 942028 942028 0 0.0
(read/write) 151592 151592 0 0.0
.bss 149344 149344 0 0.0
.data 2248 2248 0 0.0
.text 942020 942020 0 0.0
window-app BRD4161A (read only) 844996 844996 0 0.0
(read/write) 132996 132996 0 0.0
.bss 131040 131040 0 0.0
.data 1956 1956 0 0.0
.text 844988 844988 0 0.0
esp32 all-clusters-app c3devkit (read only) 999324 999324 0 0.0
(read/write) 1473618 1473618 0 0.0
.dram0.bss 68176 68176 0 0.0
.dram0.data 14428 14428 0 0.0
.flash.rodata 206568 206568 0 0.0
.flash.text 999324 999324 0 0.0
.iram0.text 62020 62020 0 0.0
m5stack (read only) 1053619 1053619 0 0.0
(read/write) 475616 475616 0 0.0
.dram0.bss 73696 73696 0 0.0
.dram0.data 34168 34168 0 0.0
.flash.rodata 235916 235916 0 0.0
.flash.text 1048235 1048235 0 0.0
.iram0.text 123107 123107 0 0.0
k32w light k32w061+release (read/write) 688712 688712 0 0.0
.bss 81112 81112 0 0.0
.data 2000 2000 0 0.0
.text 599800 599800 0 0.0
lock k32w061+release (read/write) 729572 729572 0 0.0
.bss 81520 81520 0 0.0
.data 1960 1960 0 0.0
.text 640292 640292 0 0.0
linux all-clusters-app debug (read only) 2734441 2734441 0 0.0
(read/write) 172808 172808 0 0.0
.bss 83168 83168 0 0.0
.data 1984 1984 0 0.0
.data.rel.ro 81576 81576 0 0.0
.dynamic 608 608 0 0.0
.got 4464 4464 0 0.0
.init 27 27 0 0.0
.init_array 992 992 0 0.0
.rodata 233797 233797 0 0.0
.text 2326018 2326018 0 0.0
bridge-app debug+rpc (read only) 1890425 1890425 0 0.0
(read/write) 120240 120240 0 0.0
.bss 71168 71168 0 0.0
.data 3424 3424 0 0.0
.data.rel.ro 40328 40328 0 0.0
.dynamic 592 592 0 0.0
.got 4032 4032 0 0.0
.init 27 27 0 0.0
.init_array 680 680 0 0.0
.rodata 159537 159537 0 0.0
.text 1608322 1608322 0 0.0
chip-tool debug (read only) 8359621 8359621 0 0.0
(read/write) 472624 472624 0 0.0
.bss 22592 22592 0 0.0
.data 1136 1136 0 0.0
.data.rel.ro 442648 442648 0 0.0
.dynamic 624 624 0 0.0
.got 4952 4952 0 0.0
.init 27 27 0 0.0
.init_array 648 648 0 0.0
.rodata 452949 452949 0 0.0
.text 6825109 6825109 0 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 8221580 8221580 0 0.0
(read/write) 537745 537745 0 0.0
.bss 40897 40897 0 0.0
.data 1192 1192 0 0.0
.data.rel.ro 477752 477752 0 0.0
.dynamic 560 560 0 0.0
.got 14080 14080 0 0.0
.init 24 24 0 0.0
.init_array 184 184 0 0.0
.rodata 419388 419388 0 0.0
.text 6588244 6588244 0 0.0
lighting-app debug+rpc (read only) 2325881 2325881 0 0.0
(read/write) 151192 151192 0 0.0
.bss 73216 73216 0 0.0
.data 1984 1984 0 0.0
.data.rel.ro 70248 70248 0 0.0
.dynamic 608 608 0 0.0
.got 4320 4320 0 0.0
.init 27 27 0 0.0
.init_array 784 784 0 0.0
.rodata 183633 183633 0 0.0
.text 1975826 1975826 0 0.0
lock-app debug (read only) 2206265 2206265 0 0.0
(read/write) 145576 145576 0 0.0
.bss 71808 71808 0 0.0
.data 1504 1504 0 0.0
.data.rel.ro 66600 66600 0 0.0
.dynamic 592 592 0 0.0
.got 4312 4312 0 0.0
.init 27 27 0 0.0
.init_array 736 736 0 0.0
.rodata 192129 192129 0 0.0
.text 1854354 1854354 0 0.0
ota-provider-app debug (read only) 2059001 2059001 0 0.0
(read/write) 138824 138824 0 0.0
.bss 71232 71232 0 0.0
.data 1672 1672 0 0.0
.data.rel.ro 60152 60152 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 640 640 0 0.0
.rodata 174171 174171 0 0.0
.text 1727538 1727538 0 0.0
ota-requestor-app debug (read only) 2090217 2090217 0 0.0
(read/write) 141600 141600 0 0.0
.bss 71872 71872 0 0.0
.data 1928 1928 0 0.0
.data.rel.ro 62184 62184 0 0.0
.dynamic 592 592 0 0.0
.got 4320 4320 0 0.0
.init 27 27 0 0.0
.init_array 664 664 0 0.0
.rodata 170492 170492 0 0.0
.text 1760946 1760946 0 0.0
shell debug (read only) 2560257 2560257 0 0.0
(read/write) 196776 196776 0 0.0
.bss 113768 113768 0 0.0
.data 1360 1360 0 0.0
.data.rel.ro 75912 75912 0 0.0
.dynamic 592 592 0 0.0
.got 4184 4184 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 215538 215538 0 0.0
.text 2183026 2183026 0 0.0
thermostat-no-ble arm64 (read only) 2367676 2367676 0 0.0
(read/write) 174337 174337 0 0.0
.bss 86097 86097 0 0.0
.data 1488 1488 0 0.0
.data.rel.ro 78984 78984 0 0.0
.dynamic 560 560 0 0.0
.got 4744 4744 0 0.0
.init 24 24 0 0.0
.init_array 368 368 0 0.0
.rodata 145468 145468 0 0.0
.text 1993184 1993184 0 0.0
tv-app debug (read only) 2844401 2844401 0 0.0
(read/write) 276472 276472 0 0.0
.bss 189112 189112 0 0.0
.data 4640 4640 0 0.0
.data.rel.ro 76488 76488 0 0.0
.dynamic 592 592 0 0.0
.got 4696 4696 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 215947 215947 0 0.0
.text 2446210 2446210 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2411508 2411508 0 0.0
.bss 205660 205660 0 0.0
.data 5848 5848 0 0.0
.text 1374108 1374108 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1179243 1179243 0 0.0
bss 141784 141784 0 0.0
rodata 150204 150204 0 0.0
text 808616 808616 0 0.0
p6 all-clusters-app default (read/write) 2526920 2526920 0 0.0
.bss 139040 139040 0 0.0
.data 2784 2784 0 0.0
.text 1485184 1485184 0 0.0
light-app default (read/write) 2418680 2418680 0 0.0
.bss 132520 132520 0 0.0
.data 2584 2584 0 0.0
.text 1376944 1376944 0 0.0
lock-app default (read/write) 2422856 2422856 0 0.0
.bss 132320 132320 0 0.0
.data 2544 2544 0 0.0
.text 1381120 1381120 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 807864 807864 0 0.0
bss 75216 75216 0 0.0
noinit 40416 40416 0 0.0
text 571682 571682 0 0.0

@pullapprove pullapprove bot requested review from harimau-qirex and turon and removed request for lzgrablic02 and austinh0 April 26, 2022 22:47
@mspang mspang merged commit 11c49af into project-chip:master Apr 27, 2022
@mspang mspang deleted the for-chip/rm-dup-args branch April 27, 2022 20:12
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.

4 participants