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

cleanup cmake data model build rules / remove ARG_INCLUDE_SERVER #35542

Merged

Conversation

andy31415
Copy link
Contributor

The data model seems to do a lot more than just data mode as it includes more source files that are generally defaults within apps. For now make things more consistent:

Changes

  • remove (default to true) ARG_INCLUDE_SERVER as virtually every single CMakeLists.txt would set this and the places where it is not used seems to be some mbed and ameba where it likely will be without sideffects (extra files built only).
  • Separate out the ICD and cluster-object dependencies as they are separate in GN. Ideally we should separate out cmake targets/gn targets from code-generator dependent targets.

Copy link

Review changes with SemanticDiff.

Copy link

github-actions bot commented Sep 11, 2024

PR #35542: Size comparison from e64ab71 to 5f1e348

Full report (90 builds for bl602, bl702, bl702l, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section e64ab71 5f1e348 change % change
bl602 lighting-app bl602 FLASH 1278156 1278156 0 0.0
RAM 95832 95832 0 0.0
bl602+mfd FLASH 1292010 1292010 0 0.0
RAM 95968 95968 0 0.0
bl602+rpc FLASH 1317120 1317120 0 0.0
RAM 104256 104256 0 0.0
bl702 lighting-app bl702 FLASH 943860 943860 0 0.0
RAM 15153 15153 0 0.0
bl702+mfd FLASH 946260 946260 0 0.0
RAM 15305 15305 0 0.0
bl702+rpc FLASH 1039180 1039180 0 0.0
RAM 24173 24173 0 0.0
bl706-eth FLASH 646056 646056 0 0.0
RAM 25241 25241 0 0.0
bl706-wifi FLASH 894048 894048 0 0.0
RAM 14477 14477 0 0.0
bl702l lighting-app bl702l FLASH 960520 960520 0 0.0
RAM 16812 16812 0 0.0
bl702l+mfd FLASH 963142 963142 0 0.0
RAM 16964 16964 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 677089 677089 0 0.0
RAM 78484 78484 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 696941 696941 0 0.0
RAM 81124 81124 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 696941 696941 0 0.0
RAM 81124 81124 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 653877 653877 0 0.0
RAM 73552 73552 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 613273 613273 0 0.0
RAM 71460 71460 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 632909 632909 0 0.0
RAM 74004 74004 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 632909 632909 0 0.0
RAM 74004 74004 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 632385 632385 0 0.0
RAM 74508 74508 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 652101 652101 0 0.0
RAM 77052 77052 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 652101 652101 0 0.0
RAM 77052 77052 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 607897 607897 0 0.0
RAM 68596 68596 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 627749 627749 0 0.0
RAM 71236 71236 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 627749 627749 0 0.0
RAM 71236 71236 0 0.0
efr32 lighting-app BRD4187C FLASH 932464 932464 0 0.0
RAM 135060 135060 0 0.0
lock-app BRD4338a FLASH 740572 740564 -8 -0.0
RAM 231244 231244 0 0.0
window-app BRD4187C FLASH 1015500 1015492 -8 -0.0
RAM 127000 127000 0 0.0
esp32 all-clusters-app c3devkit DRAM 94168 94168 0 0.0
FLASH 1539596 1539596 0 0.0
IRAM 82538 82538 0 0.0
m5stack DRAM 115112 115112 0 0.0
FLASH 1549894 1549894 0 0.0
IRAM 117039 117039 0 0.0
linux air-purifier-app debug unknown 4688 4688 0 0.0
FLASH 2771087 2771087 0 0.0
RAM 128928 128928 0 0.0
all-clusters-app debug unknown 5456 5456 0 0.0
FLASH 6082720 6082720 0 0.0
RAM 514432 514432 0 0.0
all-clusters-minimal-app debug unknown 5352 5352 0 0.0
FLASH 5406670 5406670 0 0.0
RAM 240784 240784 0 0.0
bridge-app debug unknown 5336 5336 0 0.0
FLASH 4740144 4740144 0 0.0
RAM 217824 217824 0 0.0
chip-tool debug unknown 5888 5888 0 0.0
FLASH 12676350 12676350 0 0.0
RAM 562250 562250 0 0.0
chip-tool-ipv6only arm64 unknown 20384 20384 0 0.0
FLASH 11341524 11341524 0 0.0
RAM 612376 612376 0 0.0
fabric-admin debug unknown 5720 5720 0 0.0
FLASH 10978929 10978929 0 0.0
RAM 561306 561306 0 0.0
fabric-bridge-app debug unknown 4568 4568 0 0.0
FLASH 4562880 4562880 0 0.0
RAM 204440 204440 0 0.0
lighting-app debug+rpc+ui unknown 5984 5984 0 0.0
FLASH 5676465 5676465 0 0.0
RAM 228112 228112 0 0.0
lock-app debug unknown 5272 5272 0 0.0
FLASH 4789428 4789428 0 0.0
RAM 203912 203912 0 0.0
ota-provider-app debug unknown 4648 4648 0 0.0
FLASH 4422812 4422812 0 0.0
RAM 197616 197616 0 0.0
ota-requestor-app debug unknown 4584 4584 0 0.0
FLASH 4561356 4561356 0 0.0
RAM 202184 202184 0 0.0
shell debug unknown 4216 4216 0 0.0
FLASH 3107773 3107773 0 0.0
RAM 159624 159624 0 0.0
thermostat-no-ble arm64 unknown 9336 9336 0 0.0
FLASH 4333156 4333156 0 0.0
RAM 242400 242400 0 0.0
tv-app debug unknown 5552 5552 0 0.0
FLASH 6022229 6022229 0 0.0
RAM 587104 587104 0 0.0
tv-casting-app debug unknown 5208 5208 0 0.0
FLASH 10883789 10883789 0 0.0
RAM 650224 650224 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 915168 915168 0 0.0
RAM 142272 142272 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 886472 886464 -8 -0.0
RAM 140411 140411 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 846520 846520 0 0.0
RAM 141090 141090 0 0.0
light-switch-app nrf52840dk_nrf52840 FLASH 790480 790480 0 0.0
RAM 132155 132155 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 934820 934820 0 0.0
RAM 130720 130720 0 0.0
lighting-app nrf52840dk_nrf52840+rpc FLASH 882016 882016 0 0.0
RAM 146574 146574 0 0.0
nrf52840dongle_nrf52840 FLASH 823108 823108 0 0.0
RAM 154436 154436 0 0.0
nrf5340dk_nrf5340_cpuapp FLASH 779376 779376 0 0.0
RAM 145584 145584 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 934820 934820 0 0.0
RAM 130720 130720 0 0.0
lock-app nrf52840dk_nrf52840 FLASH 805564 805564 0 0.0
RAM 132710 132710 0 0.0
nrf5340dk_nrf5340_cpuapp FLASH 731108 731108 0 0.0
RAM 132840 132840 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 950832 950832 0 0.0
RAM 131275 131275 0 0.0
pump-app nrf52840dk_nrf52840 FLASH 758372 758372 0 0.0
RAM 131493 131493 0 0.0
pump-controller-app nrf52840dk_nrf52840 FLASH 743568 743568 0 0.0
RAM 131252 131252 0 0.0
nxp contact k32w0+release FLASH 580324 580324 0 0.0
RAM 70704 70704 0 0.0
k32w1+release FLASH 593176 593176 0 0.0
RAM 62536 62536 0 0.0
mcxw71+release FLASH 592936 592936 0 0.0
RAM 62536 62536 0 0.0
light k32w0+release FLASH 616120 616120 0 0.0
RAM 70168 70168 0 0.0
k32w1+release FLASH 679448 679448 0 0.0
RAM 48160 48160 0 0.0
mcxw71+release FLASH 679464 679464 0 0.0
RAM 48160 48160 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1646988 1646988 0 0.0
RAM 210968 210968 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1550612 1550612 0 0.0
RAM 207680 207680 0 0.0
light cy8ckit_062s2_43012 FLASH 1466436 1466436 0 0.0
RAM 200672 200672 0 0.0
lock cy8ckit_062s2_43012 FLASH 1462956 1462956 0 0.0
RAM 225024 225024 0 0.0
qpg lighting-app qpg6105+debug FLASH 658924 658924 0 0.0
RAM 105220 105220 0 0.0
lock-app qpg6105+debug FLASH 616864 616864 0 0.0
RAM 99680 99680 0 0.0
stm32 light STM32WB5MM-DK FLASH 480544 480544 0 0.0
RAM 144676 144676 0 0.0
telink air-quality-sensor-app tlsr9528a_retention FLASH 621718 621718 0 0.0
RAM 50964 50964 0 0.0
all-clusters-app tlsr9118bdk40d FLASH 687326 687326 0 0.0
RAM 149608 149608 0 0.0
all-clusters-minimal-app tlsr9528a FLASH 779908 779908 0 0.0
RAM 110768 110768 0 0.0
bridge-app tlsr9258a FLASH 680802 680802 0 0.0
RAM 91620 91620 0 0.0
contact-sensor-app tlsr9528a_retention FLASH 621482 621482 0 0.0
RAM 50916 50916 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a FLASH 707514 707514 0 0.0
RAM 74256 74256 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 623742 623742 0 0.0
RAM 145500 145500 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 810036 810036 0 0.0
RAM 99424 99424 0 0.0
lock-app-dfu tlsr9528a FLASH 655346 655346 0 0.0
RAM 66976 66976 0 0.0
ota-requestor-app tlsr9258a FLASH 696778 696776 -2 -0.0
RAM 91212 91212 0 0.0
pump-app-usb tlsr9518adk80d FLASH 633094 633094 0 0.0
RAM 55784 55784 0 0.0
pump-controller-app tlsr9518adk80d FLASH 610282 610282 0 0.0
RAM 53028 53028 0 0.0
shell tlsr9518adk80d FLASH 467196 467196 0 0.0
RAM 68668 68668 0 0.0
smoke_co_alarm-app tlsr9528a_retention FLASH 628260 628264 4 0.0
RAM 52636 52636 0 0.0
temperature-measurement-app-mars-ota tlsr9518adk80d FLASH 652418 652418 0 0.0
RAM 56576 56576 0 0.0
thermostat tlsr9518adk80d FLASH 637014 637014 0 0.0
RAM 53432 53432 0 0.0
window-covering tlsr9118bdk40d FLASH 522258 522276 18 0.0
RAM 98476 98476 0 0.0
tizen all-clusters-app arm unknown 4852 4852 0 0.0
FLASH 1724808 1724808 0 0.0
RAM 89608 89608 0 0.0
chip-tool-ubsan arm unknown 10284 10284 0 0.0
FLASH 17532394 17532394 0 0.0
RAM 7609864 7609864 0 0.0

@Damian-Nordic Damian-Nordic merged commit f36ffd6 into project-chip:master Sep 12, 2024
68 checks passed
yyzhong-g pushed a commit to yyzhong-g/connectedhomeip that referenced this pull request Dec 12, 2024
…ject-chip#35542)

* Separate out the cmake logic a bit. Still somewhat broken through as the codegen data model is not built

* Fix build and remove INCLUDE_SERVER cmake argument
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