[Silabs] Refactor/Cleanup Si917 examples build files #25682

sharad-patil24 · 2023-03-14T13:28:12Z

Silabs Sample apps GN build is convoluted and duplicates a lot of args and conditions in each example's BUILD.gn.
This PR aims to reduce this duplication, regroup board or sdk arguments, and common example platform sources building to a common location.

Platforms affected by the refactoring:
SiWx917 ( SOC )

adds fix to the Bluez disconnection as well in separate commit.

github-actions · 2023-03-14T13:43:15Z

PR #25682: Size comparison from fa2e709 to 3befe23

Increases (1 build for cc32xx)

platform	target	config	section	`fa2e709`	`3befe23`	change	% change
cc32xx	lock	CC3235SF_LAUNCHXL	.debug_info	20245969	20245970	1	0.0

Full report (1 build for cc32xx)

platform	target	config	section	`fa2e709`	`3befe23`	change
cc32xx	lock	CC3235SF_LAUNCHXL		0	0	0
			(read only)	645489	645489	0
			(read/write)	203848	203848	0
			.ARM.attributes	44	44	0
			.ARM.exidx	8	8	0
			.bss	197248	197248	0
			.comment	194	194	0
			.data	1480	1480	0
			.debug_abbrev	930293	930293	0
			.debug_aranges	87384	87384	0
			.debug_frame	300248	300248	0
			.debug_info	20245969	20245970	1
			.debug_line	`2660979`	`2660979`	0
			.debug_loc	2804911	2804911	0
			.debug_ranges	283168	283168	0
			.debug_str	`3026947`	`3026947`	0
			.ramVecs	780	780	0
			.resetVecs	64	64	0
			.rodata	106009	106009	0
			.shstrtab	232	232	0
			.stab	204	204	0
			.stabstr	441	441	0
			.stack	2048	2048	0
			.strtab	380271	380271	0
			.symtab	257312	257312	0
			.text	537360	537360	0

examples/platform/silabs/SiWx917/BUILD.gn

src/platform/silabs/Logging.cpp

third_party/silabs/SiWx917_sdk.gni

src/platform/silabs/SiWx917/BUILD.gn

examples/light-switch-app/silabs/SiWx917/args.gni

examples/light-switch-app/silabs/SiWx917/build_for_wifi_args.gni

src/platform/silabs/SiWx917/BUILD.gn

src/platform/silabs/SiWx917/wifi_args.gni

jmartinez-silabs

For SiWx917 Soc example all the

build_for_wifi_args.gni and build_for_wifi_gnfile.gni should be remove and their content should replace the default .gn and .args.gni of the example. Those files were created to support alternating between the required structure for Thread or Wifi.

With 917 SOC you don't have a thread option so no need to maintain both file structures.

You seem to have done the right thing for the lighting-app but not for the other apps.

third_party/silabs/SiWx917_sdk.gni

src/platform/silabs/SiWx917/BUILD.gn

src/platform/silabs/Logging.cpp

scripts/examples/gn_efr32_example.sh

examples/lock-app/silabs/SiWx917/BUILD.gn

examples/light-switch-app/silabs/SiWx917/BUILD.gn

examples/lighting-app/silabs/SiWx917/.gn

examples/lighting-app/silabs/SiWx917/args.gni

examples/platform/silabs/SiWx917/BUILD.gn

src/platform/silabs/BLEManagerImpl.h

examples/lighting-app/silabs/SiWx917/BUILD.gn

src/platform/silabs/SiWx917/BUILD.gn

third_party/silabs/siwx917_executable.gni

examples/platform/silabs/SiWx917/BUILD.gn

third_party/silabs/BUILD.gn

third_party/silabs/SiWx917_sdk.gni

github-actions · 2023-03-19T10:46:37Z

PR #25682: Size comparison from 3edd101 to 7ce105d

Decreases (1 build for cc32xx)

platform	target	config	section	`3edd101`	`7ce105d`	change	% change
cc32xx	lock	CC3235SF_LAUNCHXL	.debug_info	20265057	20265056	-1	-0.0

Full report (1 build for cc32xx)

platform	target	config	section	`3edd101`	`7ce105d`	change	% change
cc32xx	lock	CC3235SF_LAUNCHXL		0	0	0	0.0
			(read only)	645945	645945	0	0.0
			(read/write)	203848	203848	0	0.0
			.ARM.attributes	44	44	0	0.0
			.ARM.exidx	8	8	0	0.0
			.bss	197248	197248	0	0.0
			.comment	194	194	0	0.0
			.data	1480	1480	0	0.0
			.debug_abbrev	930399	930399	0	0.0
			.debug_aranges	87520	87520	0	0.0
			.debug_frame	300716	300716	0	0.0
			.debug_info	20265057	20265056	-1	-0.0
			.debug_line	2663587	2663587	0	0.0
			.debug_loc	2808805	2808805	0	0.0
			.debug_ranges	283608	283608	0	0.0
			.debug_str	`3036926`	`3036926`	0	0.0
			.ramVecs	780	780	0	0.0
			.resetVecs	64	64	0	0.0
			.rodata	106009	106009	0	0.0
			.shstrtab	232	232	0	0.0
			.stab	204	204	0	0.0
			.stabstr	441	441	0	0.0
			.stack	2048	2048	0	0.0
			.strtab	381423	381423	0	0.0
			.symtab	257664	257664	0	0.0
			.text	537816	537816	0	0.0

github-actions · 2023-03-19T11:03:35Z

PR #25682: Size comparison from 3edd101 to 2fc873c

Full report (1 build for cc32xx)

platform	target	config	section	`3edd101`	`2fc873c`
cc32xx	lock	CC3235SF_LAUNCHXL		0	0
			(read only)	645945	645945
			(read/write)	203848	203848
			.ARM.attributes	44	44
			.ARM.exidx	8	8
			.bss	197248	197248
			.comment	194	194
			.data	1480	1480
			.debug_abbrev	930399	930399
			.debug_aranges	87520	87520
			.debug_frame	300716	300716
			.debug_info	20265057	20265057
			.debug_line	2663587	2663587
			.debug_loc	2808805	2808805
			.debug_ranges	283608	283608
			.debug_str	`3036926`	`3036926`
			.ramVecs	780	780
			.resetVecs	64	64
			.rodata	106009	106009
			.shstrtab	232	232
			.stab	204	204
			.stabstr	441	441
			.stack	2048	2048
			.strtab	381423	381423
			.symtab	257664	257664
			.text	537816	537816

github-actions · 2023-03-19T11:48:21Z

PR #25682: Size comparison from 3edd101 to 1d696f7

Decreases (1 build for cc32xx)

platform	target	config	section	`3edd101`	`1d696f7`	change	% change
cc32xx	lock	CC3235SF_LAUNCHXL	.debug_info	20265057	20265056	-1	-0.0

Full report (1 build for cc32xx)

platform	target	config	section	`3edd101`	`1d696f7`	change	% change
cc32xx	lock	CC3235SF_LAUNCHXL		0	0	0	0.0
			(read only)	645945	645945	0	0.0
			(read/write)	203848	203848	0	0.0
			.ARM.attributes	44	44	0	0.0
			.ARM.exidx	8	8	0	0.0
			.bss	197248	197248	0	0.0
			.comment	194	194	0	0.0
			.data	1480	1480	0	0.0
			.debug_abbrev	930399	930399	0	0.0
			.debug_aranges	87520	87520	0	0.0
			.debug_frame	300716	300716	0	0.0
			.debug_info	20265057	20265056	-1	-0.0
			.debug_line	2663587	2663587	0	0.0
			.debug_loc	2808805	2808805	0	0.0
			.debug_ranges	283608	283608	0	0.0
			.debug_str	`3036926`	`3036926`	0	0.0
			.ramVecs	780	780	0	0.0
			.resetVecs	64	64	0	0.0
			.rodata	106009	106009	0	0.0
			.shstrtab	232	232	0	0.0
			.stab	204	204	0	0.0
			.stabstr	441	441	0	0.0
			.stack	2048	2048	0	0.0
			.strtab	381423	381423	0	0.0
			.symtab	257664	257664	0	0.0
			.text	537816	537816	0	0.0

github-actions · 2023-03-19T12:18:38Z

PR #25682: Size comparison from 3edd101 to acab3e3

Decreases (1 build for cc32xx)

platform	target	config	section	`3edd101`	`acab3e3`	change	% change
cc32xx	lock	CC3235SF_LAUNCHXL	.debug_info	20265057	20265056	-1	-0.0

Full report (1 build for cc32xx)

platform	target	config	section	`3edd101`	`acab3e3`	change	% change
cc32xx	lock	CC3235SF_LAUNCHXL		0	0	0	0.0
			(read only)	645945	645945	0	0.0
			(read/write)	203848	203848	0	0.0
			.ARM.attributes	44	44	0	0.0
			.ARM.exidx	8	8	0	0.0
			.bss	197248	197248	0	0.0
			.comment	194	194	0	0.0
			.data	1480	1480	0	0.0
			.debug_abbrev	930399	930399	0	0.0
			.debug_aranges	87520	87520	0	0.0
			.debug_frame	300716	300716	0	0.0
			.debug_info	20265057	20265056	-1	-0.0
			.debug_line	2663587	2663587	0	0.0
			.debug_loc	2808805	2808805	0	0.0
			.debug_ranges	283608	283608	0	0.0
			.debug_str	`3036926`	`3036926`	0	0.0
			.ramVecs	780	780	0	0.0
			.resetVecs	64	64	0	0.0
			.rodata	106009	106009	0	0.0
			.shstrtab	232	232	0	0.0
			.stab	204	204	0	0.0
			.stabstr	441	441	0	0.0
			.stack	2048	2048	0	0.0
			.strtab	381423	381423	0	0.0
			.symtab	257664	257664	0	0.0
			.text	537816	537816	0	0.0

github-actions · 2023-03-19T12:36:05Z

PR #25682: Size comparison from 3edd101 to 245f192

Decreases (1 build for cc32xx)

platform	target	config	section	`3edd101`	`245f192`	change	% change
cc32xx	lock	CC3235SF_LAUNCHXL	.debug_info	20265057	20265055	-2	-0.0

Full report (1 build for cc32xx)

platform	target	config	section	`3edd101`	`245f192`	change	% change
cc32xx	lock	CC3235SF_LAUNCHXL		0	0	0	0.0
			(read only)	645945	645945	0	0.0
			(read/write)	203848	203848	0	0.0
			.ARM.attributes	44	44	0	0.0
			.ARM.exidx	8	8	0	0.0
			.bss	197248	197248	0	0.0
			.comment	194	194	0	0.0
			.data	1480	1480	0	0.0
			.debug_abbrev	930399	930399	0	0.0
			.debug_aranges	87520	87520	0	0.0
			.debug_frame	300716	300716	0	0.0
			.debug_info	20265057	20265055	-2	-0.0
			.debug_line	2663587	2663587	0	0.0
			.debug_loc	2808805	2808805	0	0.0
			.debug_ranges	283608	283608	0	0.0
			.debug_str	`3036926`	`3036926`	0	0.0
			.ramVecs	780	780	0	0.0
			.resetVecs	64	64	0	0.0
			.rodata	106009	106009	0	0.0
			.shstrtab	232	232	0	0.0
			.stab	204	204	0	0.0
			.stabstr	441	441	0	0.0
			.stack	2048	2048	0	0.0
			.strtab	381423	381423	0	0.0
			.symtab	257664	257664	0	0.0
			.text	537816	537816	0	0.0

github-actions · 2023-03-20T09:57:05Z

PR #25682: Size comparison from 3edd101 to e88ea18

Decreases (1 build for cc32xx)

platform	target	config	section	`3edd101`	`e88ea18`	change	% change
cc32xx	lock	CC3235SF_LAUNCHXL	(read only)	645945	645601	-344	-0.1
			.debug_abbrev	930399	930289	-110	-0.0
			.debug_aranges	87520	87400	-120	-0.1
			.debug_frame	300716	300316	-400	-0.1
			.debug_info	20265057	20248010	-17047	-0.1
			.debug_line	2663587	2661469	-2118	-0.1
			.debug_loc	2808805	2805592	-3213	-0.1
			.debug_ranges	283608	283208	-400	-0.1
			.debug_str	`3036926`	3027174	-9752	-0.3
			.rodata	106009	105993	-16	-0.0
			.strtab	381423	380421	-1002	-0.3
			.symtab	257664	257408	-256	-0.1
			.text	537816	537488	-328	-0.1

Full report (1 build for cc32xx)

platform	target	config	section	`3edd101`	`e88ea18`	change	% change
cc32xx	lock	CC3235SF_LAUNCHXL		0	0	0	0.0
			(read only)	645945	645601	-344	-0.1
			(read/write)	203848	203848	0	0.0
			.ARM.attributes	44	44	0	0.0
			.ARM.exidx	8	8	0	0.0
			.bss	197248	197248	0	0.0
			.comment	194	194	0	0.0
			.data	1480	1480	0	0.0
			.debug_abbrev	930399	930289	-110	-0.0
			.debug_aranges	87520	87400	-120	-0.1
			.debug_frame	300716	300316	-400	-0.1
			.debug_info	20265057	20248010	-17047	-0.1
			.debug_line	2663587	2661469	-2118	-0.1
			.debug_loc	2808805	2805592	-3213	-0.1
			.debug_ranges	283608	283208	-400	-0.1
			.debug_str	`3036926`	3027174	-9752	-0.3
			.ramVecs	780	780	0	0.0
			.resetVecs	64	64	0	0.0
			.rodata	106009	105993	-16	-0.0
			.shstrtab	232	232	0	0.0
			.stab	204	204	0	0.0
			.stabstr	441	441	0	0.0
			.stack	2048	2048	0	0.0
			.strtab	381423	380421	-1002	-0.3
			.symtab	257664	257408	-256	-0.1
			.text	537816	537488	-328	-0.1

… review comments

…m and silabs_executable

…wisemcu files

github-actions · 2023-03-22T19:51:05Z

PR #25682: Size comparison from 2ea6746 to 4e198e0

Increases (1 build for cc32xx)

platform	target	config	section	`2ea6746`	`4e198e0`	change	% change
cc32xx	lock	CC3235SF_LAUNCHXL	.debug_info	20251230	20251231	1	0.0

Full report (1 build for cc32xx)

platform	target	config	section	`2ea6746`	`4e198e0`	change
cc32xx	lock	CC3235SF_LAUNCHXL		0	0	0
			(read only)	645825	645825	0
			(read/write)	203848	203848	0
			.ARM.attributes	44	44	0
			.ARM.exidx	8	8	0
			.bss	197248	197248	0
			.comment	194	194	0
			.data	1480	1480	0
			.debug_abbrev	930286	930286	0
			.debug_aranges	87400	87400	0
			.debug_frame	300336	300336	0
			.debug_info	20251230	20251231	1
			.debug_line	2661959	2661959	0
			.debug_loc	2806733	2806733	0
			.debug_ranges	283424	283424	0
			.debug_str	3027534	3027534	0
			.ramVecs	780	780	0
			.resetVecs	64	64	0
			.rodata	105993	105993	0
			.shstrtab	232	232	0
			.stab	204	204	0
			.stabstr	441	441	0
			.stack	2048	2048	0
			.strtab	380469	380469	0
			.symtab	257408	257408	0
			.text	537712	537712	0

github-actions · 2023-03-22T20:28:30Z

PR #25682: Size comparison from 2ea6746 to 73981c0

Increases (1 build for cc32xx)

platform	target	config	section	`2ea6746`	73981c03	change	% change
cc32xx	lock	CC3235SF_LAUNCHXL	.debug_info	20251230	20251231	1	0.0

Full report (1 build for cc32xx)

platform	target	config	section	`2ea6746`	73981c03	change
cc32xx	lock	CC3235SF_LAUNCHXL		0	0	0
			(read only)	645825	645825	0
			(read/write)	203848	203848	0
			.ARM.attributes	44	44	0
			.ARM.exidx	8	8	0
			.bss	197248	197248	0
			.comment	194	194	0
			.data	1480	1480	0
			.debug_abbrev	930286	930286	0
			.debug_aranges	87400	87400	0
			.debug_frame	300336	300336	0
			.debug_info	20251230	20251231	1
			.debug_line	2661959	2661959	0
			.debug_loc	2806733	2806733	0
			.debug_ranges	283424	283424	0
			.debug_str	3027534	3027534	0
			.ramVecs	780	780	0
			.resetVecs	64	64	0
			.rodata	105993	105993	0
			.shstrtab	232	232	0
			.stab	204	204	0
			.stabstr	441	441	0
			.stack	2048	2048	0
			.strtab	380469	380469	0
			.symtab	257408	257408	0
			.text	537712	537712	0

github-actions · 2023-03-22T20:44:08Z

PR #25682: Size comparison from 2ea6746 to f78bd04

Increases (1 build for cc32xx)

platform	target	config	section	`2ea6746`	`f78bd04`	change	% change
cc32xx	lock	CC3235SF_LAUNCHXL	.debug_info	20251230	20251232	2	0.0

Full report (1 build for cc32xx)

platform	target	config	section	`2ea6746`	`f78bd04`	change
cc32xx	lock	CC3235SF_LAUNCHXL		0	0	0
			(read only)	645825	645825	0
			(read/write)	203848	203848	0
			.ARM.attributes	44	44	0
			.ARM.exidx	8	8	0
			.bss	197248	197248	0
			.comment	194	194	0
			.data	1480	1480	0
			.debug_abbrev	930286	930286	0
			.debug_aranges	87400	87400	0
			.debug_frame	300336	300336	0
			.debug_info	20251230	20251232	2
			.debug_line	2661959	2661959	0
			.debug_loc	2806733	2806733	0
			.debug_ranges	283424	283424	0
			.debug_str	3027534	3027534	0
			.ramVecs	780	780	0
			.resetVecs	64	64	0
			.rodata	105993	105993	0
			.shstrtab	232	232	0
			.stab	204	204	0
			.stabstr	441	441	0
			.stack	2048	2048	0
			.strtab	380469	380469	0
			.symtab	257408	257408	0
			.text	537712	537712	0

github-actions bot added examples platform scripts labels Mar 14, 2023

mkardous-silabs requested changes Mar 14, 2023

View reviewed changes

chirag-silabs reviewed Mar 14, 2023

View reviewed changes

src/platform/silabs/SiWx917/BUILD.gn Outdated Show resolved Hide resolved

chirag-silabs reviewed Mar 14, 2023

View reviewed changes

jmartinez-silabs requested changes Mar 14, 2023

View reviewed changes

jmartinez-silabs marked this pull request as draft March 14, 2023 14:23

mkardous-silabs requested changes Mar 15, 2023

View reviewed changes

jmartinez-silabs reviewed Mar 16, 2023

View reviewed changes

third_party/silabs/siwx917_executable.gni Outdated Show resolved Hide resolved

mkardous-silabs requested changes Mar 16, 2023

View reviewed changes

examples/platform/silabs/SiWx917/BUILD.gn Show resolved Hide resolved

third_party/silabs/BUILD.gn Show resolved Hide resolved

rosahay-silabs suggested changes Mar 16, 2023

View reviewed changes

third_party/silabs/SiWx917_sdk.gni Outdated Show resolved Hide resolved

chirag-silabs force-pushed the refactor/Wifi_Si917_cleanup_build_files branch from 19094be to 7ce105d Compare March 19, 2023 10:36

github-actions bot added the test driver label Mar 19, 2023

sharad-patil24 marked this pull request as ready for review March 20, 2023 12:16

pullapprove bot requested review from amitnj, andy31415, anush-apple, arkq, bzbarsky-apple, carol-apple, chrisdecenzo and chshu March 20, 2023 12:28

pullapprove bot added review - approved and removed review - changed requested labels Mar 22, 2023

sharad-patil24 force-pushed the refactor/Wifi_Si917_cleanup_build_files branch from 623f709 to 08042f6 Compare March 22, 2023 19:36

sharad-patil24 and others added 19 commits March 23, 2023 01:08

[Silabs] Refactor/Cleanup SiWx917 examples build files

995e1f3

Silabs: [Wifi] fix to the Bluez disconnection issue

866fa84

Silabs : Review comment solved

b4c3990

Silabs : Config cleanup for remaining Si917 Apps

fe511a2

Some more fixes

a5bb000

removing the --wifi SiWx917 flag, removing duplicates and address few…

74c3f9e

… review comments

duplicate args and modifying ipv4 to ipv6

ba35c4b

Restyled by clang-format

6517ad3

Restyled by gn

45c4bab

removing efr32_arm, efr32_executable, siwx917_executable to silabs_ar…

344620c

…m and silabs_executable

Restyled by gn

5b323db

Silabs : Updated new Wiseconnect branch for matter

56368cb

Silabs : Review comments solved

2f09f26

Restyled by clang-format

6023c72

Silabs : 917NCP ble using wiseconnect files, updated gni file to use …

9bb8847

…wisemcu files

Restyled by gn

97cb28a

Review Comments solved

a83e1c8

fixes required to use GSDK lwip

5997be1

Merge conflict solved

f8f0b6f

sharad-patil24 force-pushed the refactor/Wifi_Si917_cleanup_build_files branch from 08042f6 to f8f0b6f Compare March 22, 2023 19:38

Restyled by gn

4e198e0

Solved Build error arise because of Merge Conflict

73981c0

Restyled by gn

f78bd04

jmartinez-silabs merged commit e214d1e into project-chip:master Mar 22, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Silabs] Refactor/Cleanup Si917 examples build files #25682

[Silabs] Refactor/Cleanup Si917 examples build files #25682

sharad-patil24 commented Mar 14, 2023

github-actions bot commented Mar 14, 2023

jmartinez-silabs left a comment

github-actions bot commented Mar 19, 2023

github-actions bot commented Mar 19, 2023

github-actions bot commented Mar 19, 2023

github-actions bot commented Mar 19, 2023

github-actions bot commented Mar 19, 2023

github-actions bot commented Mar 20, 2023

github-actions bot commented Mar 22, 2023

github-actions bot commented Mar 22, 2023

github-actions bot commented Mar 22, 2023

[Silabs] Refactor/Cleanup Si917 examples build files #25682

[Silabs] Refactor/Cleanup Si917 examples build files #25682

Conversation

sharad-patil24 commented Mar 14, 2023

github-actions bot commented Mar 14, 2023

jmartinez-silabs left a comment

Choose a reason for hiding this comment

github-actions bot commented Mar 19, 2023

github-actions bot commented Mar 19, 2023

github-actions bot commented Mar 19, 2023

github-actions bot commented Mar 19, 2023

github-actions bot commented Mar 19, 2023

github-actions bot commented Mar 20, 2023

github-actions bot commented Mar 22, 2023

github-actions bot commented Mar 22, 2023

github-actions bot commented Mar 22, 2023