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.

Sign up for GitHub

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

Jump to bottom

[cmake] Common Cmake sources for Matter build #25654

Merged
merged 8 commits into from
Mar 24, 2023
Merged

[cmake] Common Cmake sources for Matter build #25654

merged 8 commits into from
Mar 24, 2023

Conversation

ATmobica
Copy link
Contributor

@ATmobica ATmobica commented Mar 13, 2023 •
edited
Loading

Main changes:

  • Create common Cmake sources for configuring and building the Matter libraries.
  • Adapt OIS, nrfconnect, mbed, Zepyth and Telink platforms to use shared code.

Additional changes:

  • Add necessary defines in unit-tests code to fix unused-function issues.

@github-actions
Copy link

PR #25654: Size comparison from bc8c9ec to 0f58595

Decreases (1 build for cc32xx)
platform target config section bc8c9ec 0f58595 change % change
cc32xx lock CC3235SF_LAUNCHXL .debug_info 20275632 20275631 -1 -0.0
Full report (3 builds for cc32xx, qpg)
platform target config section bc8c9ec 0f58595 change % change
cc32xx lock CC3235SF_LAUNCHXL 0 0 0 0.0
(read only) 645097 645097 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 930293 930293 0 0.0
.debug_aranges 87384 87384 0 0.0
.debug_frame 300248 300248 0 0.0
.debug_info 20275632 20275631 -1 -0.0
.debug_line 2660982 2660982 0 0.0
.debug_loc 2804957 2804957 0 0.0
.debug_ranges 283168 283168 0 0.0
.debug_str 3026158 3026158 0 0.0
.ramVecs 780 780 0 0.0
.resetVecs 64 64 0 0.0
.rodata 105993 105993 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 379204 379204 0 0.0
.symtab 256912 256912 0 0.0
.text 536984 536984 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1153460 1153460 0 0.0
.bss 100076 100076 0 0.0
.data 852 852 0 0.0
.text 600556 600556 0 0.0
lock-app qpg6105+debug (read/write) 1120100 1120100 0 0.0
.bss 96468 96468 0 0.0
.data 864 864 0 0.0
.text 567200 567200 0 0.0

@ATmobica ATmobica marked this pull request as ready for review March 13, 2023 14:45
@ATmobica ATmobica force-pushed the upstream/cmake-unify branch from e1d676c to 69806c1 Compare March 17, 2023 11:30
@github-actions
Copy link

PR #25654: Size comparison from 379cde1 to 69806c1

Full report (1 build for cc32xx)
platform target config section 379cde1 69806c1 change % change
cc32xx lock CC3235SF_LAUNCHXL 0 0 0 0.0
(read only) 645489 645489 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 930289 930289 0 0.0
.debug_aranges 87392 87392 0 0.0
.debug_frame 300284 300284 0 0.0
.debug_info 2024602 2024602 0 0.0
.debug_line 2661031 2661031 0 0.0
.debug_loc 2804874 2804874 0 0.0
.debug_ranges 283152 283152 0 0.0
.debug_str 3027037 3027037 0 0.0
.ramVecs 780 780 0 0.0
.resetVecs 64 64 0 0.0
.rodata 105993 105993 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 380331 380331 0 0.0
.symtab 257376 257376 0 0.0
.text 537376 537376 0 0.0

@ATmobica ATmobica force-pushed the upstream/cmake-unify branch from 69806c1 to 832a31a Compare March 17, 2023 12:08
@github-actions
Copy link

PR #25654: Size comparison from 379cde1 to 832a31a

Decreases (1 build for cc32xx)
platform target config section 379cde1 832a31a change % change
cc32xx lock CC3235SF_LAUNCHXL .debug_info 2024602 20246022 -2 -0.0
Full report (1 build for cc32xx)
platform target config section 379cde1 832a31a change % change
cc32xx lock CC3235SF_LAUNCHXL 0 0 0 0.0
(read only) 645489 645489 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 930289 930289 0 0.0
.debug_aranges 87392 87392 0 0.0
.debug_frame 300284 300284 0 0.0
.debug_info 2024602 20246022 -2 -0.0
.debug_line 2661031 2661031 0 0.0
.debug_loc 2804874 2804874 0 0.0
.debug_ranges 283152 283152 0 0.0
.debug_str 3027037 3027037 0 0.0
.ramVecs 780 780 0 0.0
.resetVecs 64 64 0 0.0
.rodata 105993 105993 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 380331 380331 0 0.0
.symtab 257376 257376 0 0.0
.text 537376 537376 0 0.0

@ATmobica ATmobica force-pushed the upstream/cmake-unify branch from 832a31a to 930800e Compare March 17, 2023 15:00
@github-actions
Copy link

PR #25654: Size comparison from 379cde1 to 930800e

Decreases (1 build for cc32xx)
platform target config section 379cde1 930800e change % change
cc32xx lock CC3235SF_LAUNCHXL .debug_info 2024602 20246022 -2 -0.0
Full report (1 build for cc32xx)
platform target config section 379cde1 930800e change % change
cc32xx lock CC3235SF_LAUNCHXL 0 0 0 0.0
(read only) 645489 645489 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 930289 930289 0 0.0
.debug_aranges 87392 87392 0 0.0
.debug_frame 300284 300284 0 0.0
.debug_info 2024602 20246022 -2 -0.0
.debug_line 2661031 2661031 0 0.0
.debug_loc 2804874 2804874 0 0.0
.debug_ranges 283152 283152 0 0.0
.debug_str 3027037 3027037 0 0.0
.ramVecs 780 780 0 0.0
.resetVecs 64 64 0 0.0
.rodata 105993 105993 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 380331 380331 0 0.0
.symtab 257376 257376 0 0.0
.text 537376 537376 0 0.0

@ATmobica ATmobica force-pushed the upstream/cmake-unify branch 3 times, most recently from 83ed5b4 to 2f27c06 Compare March 20, 2023 22:34
@github-actions
Copy link

PR #25654: Size comparison from a8242ff to 2f27c06

Increases (1 build for cc32xx)
platform target config section a8242ff 2f27c06 change % change
cc32xx lock CC3235SF_LAUNCHXL .debug_info 20248021 20248023 2 0.0
Full report (1 build for cc32xx)
platform target config section a8242ff 2f27c06 change % change
cc32xx lock CC3235SF_LAUNCHXL 0 0 0 0.0
(read only) 645601 645601 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 930292 930292 0 0.0
.debug_aranges 87400 87400 0 0.0
.debug_frame 300320 300320 0 0.0
.debug_info 20248021 20248023 2 0.0
.debug_line 2661345 2661345 0 0.0
.debug_loc 2805489 2805489 0 0.0
.debug_ranges 283264 283264 0 0.0
.debug_str 3027174 3027174 0 0.0
.ramVecs 780 780 0 0.0
.resetVecs 64 64 0 0.0
.rodata 105993 105993 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 380421 380421 0 0.0
.symtab 257408 257408 0 0.0
.text 537488 537488 0 0.0

@ATmobica ATmobica force-pushed the upstream/cmake-unify branch 2 times, most recently from cc42a02 to 563be05 Compare March 21, 2023 16:51
ATmobica added 8 commits March 23, 2023 21:47
@ATmobica
[lwip] Add skip LwIP init flag
7df2dd9 
Add CHIP_SYSTEM_CONFIG_LWIP_SKIP_INIT define to skip
LwIP initalization during network setup.
The platform can provide its own LwIP initialization.
This option allows skipping initialization steps in network setup
e.g. in unit tests.
Apply skipping LwIP initalization to Open IoT SDK platform.

Signed-off-by: ATmobica <[email protected]>
@ATmobica
[Fix] Fix unused functions call in unit-tests
73ec3db 
Add necessary defines in unit-tests code to fix unused-function
issues.

Signed-off-by: ATmobica <[email protected]>
@ATmobica
[OIS] Create common cmake source in platform config
1168f03 
Add Cmake files that create GN args file and build
the CHIP library with ExternalProject.
At the end the 'chip' is defined. It exposes CHIP headers
and libraries to the application.
Add CMake utilities for managing and retrieving build configuration.
Add Python script to generate the args.gn file in a correct format.

Signed-off-by: ATmobica <[email protected]>
@ATmobica
[OIS] Adapt Open IoT SDK platform to common cmake sources
50f34d9 
Change OIS cmake files to  the common sources.
Remove redundant files.
Improve paths to Matter files.

Signed-off-by: ATmobica <[email protected]>
@ATmobica
[Mbed] Adapt Mbed platform to common cmake sources
7a1bd5c 
Change mbed cmake files to the common sources.
Remove redundant files.
Improve mbed GN project.
Improve paths to Matter files.

Signed-off-by: ATmobica <[email protected]>
@ATmobica
[nrfconnect] Adapt nrfconnect platform to common cmake sources
4af7808 
Change nrfconnect cmake files to the common sources.
Remove redundant files.

Signed-off-by: ATmobica <[email protected]>
@ATmobica
[Zephyr] Adapt Zephyr platform to common cmake sources
f18c0f3 
Change Zephyr cmake files to the common sources.
Remove redundant files.

Signed-off-by: ATmobica <[email protected]>
@ATmobica
[Telink] Adapt Telink platform to common cmake sources
084f259 
Change Telink cmake files to the common sources.
Remove redundant files.

Signed-off-by: ATmobica <[email protected]>
@ATmobica ATmobica force-pushed the upstream/cmake-unify branch from 563be05 to 084f259 Compare March 23, 2023 21:47
@andy31415 andy31415 merged commit e3cda8b into project-chip:master Mar 24, 2023
@ATmobica ATmobica deleted the upstream/cmake-unify branch May 16, 2023 08:10
@ATmobica ATmobica restored the upstream/cmake-unify branch May 16, 2023 08:10
@ATmobica ATmobica deleted the upstream/cmake-unify branch May 16, 2023 08:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bzbarsky-apple bzbarsky-apple bzbarsky-apple left review comments

@Damian-Nordic Damian-Nordic Damian-Nordic approved these changes

@andy31415 andy31415 andy31415 approved these changes

@pan- pan- pan- approved these changes

@amitnj amitnj Awaiting requested review from amitnj

@anush-apple anush-apple Awaiting requested review from anush-apple

@arkq arkq Awaiting requested review from arkq

@carol-apple carol-apple Awaiting requested review from carol-apple

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@cliffamzn cliffamzn Awaiting requested review from cliffamzn

@CodeChronos928 CodeChronos928 Awaiting requested review from CodeChronos928

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@franck-apple franck-apple Awaiting requested review from franck-apple

@gjc13 gjc13 Awaiting requested review from gjc13

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@hawk248 hawk248 Awaiting requested review from hawk248

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@jmeg-sfy jmeg-sfy Awaiting requested review from jmeg-sfy

@joonhaengHeo joonhaengHeo Awaiting requested review from joonhaengHeo

@jtung-apple jtung-apple Awaiting requested review from jtung-apple

@kcoppock kcoppock Awaiting requested review from kcoppock

@kkasperczyk-no kkasperczyk-no Awaiting requested review from kkasperczyk-no

@ksperling-apple ksperling-apple Awaiting requested review from ksperling-apple

@lazarkov lazarkov Awaiting requested review from lazarkov

@lpbeliveau-silabs lpbeliveau-silabs Awaiting requested review from lpbeliveau-silabs

@LuDuda LuDuda Awaiting requested review from LuDuda

@mlepage-google mlepage-google Awaiting requested review from mlepage-google

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@msandstedt msandstedt Awaiting requested review from msandstedt

@nivi-apple nivi-apple Awaiting requested review from nivi-apple

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@sharadb-amazon sharadb-amazon Awaiting requested review from sharadb-amazon

@tecimovic tecimovic Awaiting requested review from tecimovic

@tehampson tehampson Awaiting requested review from tehampson

@turon turon Awaiting requested review from turon

@vijs vijs Awaiting requested review from vijs

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@woody-apple woody-apple Awaiting requested review from woody-apple

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@younghak-hwang younghak-hwang Awaiting requested review from younghak-hwang

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

@yunhanw-google yunhanw-google Awaiting requested review from yunhanw-google

Assignees
No one assigned
Labels
config examples inet lib platform review - approved support system test driver
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ATmobica @pan- @andy31415 @bzbarsky-apple @Damian-Nordic