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

Update global data types to use the new XML representation #34680

Merged
merged 4 commits into from
Aug 2, 2024

Conversation

hicklin
Copy link
Contributor

@hicklin hicklin commented Jul 31, 2024

This PR

  • updates the definitions for global data types in global-structs.xml and semantic-tag-namespace-enums.xml
  • regenerates code via zap
  • fixes the SDK code that used these types as they where previously defined

Copy link

semanticdiff-com bot commented Jul 31, 2024

Review changes with SemanticDiff.

Analyzed 2 of 107 files.

Overall, the semantic diff is 88% smaller than the GitHub diff.

File Information
Filename Status
zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp Unsupported file format
zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h Unsupported file format
zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp Unsupported file format
zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h Unsupported file format
zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h Unsupported file format
zzz_generated/app-common/app-common/zap-generated/cluster-enums.h Unsupported file format
zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp Unsupported file format
zzz_generated/app-common/app-common/zap-generated/cluster-objects.h Unsupported file format
src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm Unsupported file format
src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h Unsupported file format
src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h Unsupported file format
src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm Unsupported file format
✔️ src/controller/python/chip/clusters/Objects.py 78.76% smaller
✔️ src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java 98.68% smaller
src/controller/data_model/controller-clusters.matter Unsupported file format
src/app/zap-templates/zcl/data-model/chip/global-structs.xml Unsupported file format
src/app/zap-templates/zcl/data-model/chip/semantic-tag-namespace-enums.xml Unsupported file format
src/app/clusters/service-area-server/service-area-cluster-objects.h Unsupported file format
src/app/clusters/service-area-server/service-area-server.cpp Unsupported file format
src/app/clusters/service-area-server/service-area-server.h Unsupported file format
examples/window-app/common/window-app.matter Unsupported file format
examples/virtual-device-app/virtual-device-common/virtual-device-app.matter Unsupported file format
examples/tv-casting-app/tv-casting-common/tv-casting-app.matter Unsupported file format
examples/tv-app/tv-common/tv-app.matter Unsupported file format
examples/thermostat/thermostat-common/thermostat.matter Unsupported file format
examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter Unsupported file format
examples/thermostat/nxp/zap/thermostat_matter_thread.matter Unsupported file format
examples/thermostat/nxp/zap/thermostat_matter_wifi.matter Unsupported file format
examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter Unsupported file format
examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter Unsupported file format
examples/rvc-app/rvc-common/rvc-app.matter Unsupported file format
examples/rvc-app/rvc-common/src/rvc-service-area-delegate.cpp Unsupported file format
examples/refrigerator-app/refrigerator-common/refrigerator-app.matter Unsupported file format
examples/pump-controller-app/pump-controller-common/pump-controller-app.matter Unsupported file format
examples/pump-app/silabs/data_model/pump-thread-app.matter Unsupported file format
examples/pump-app/silabs/data_model/pump-wifi-app.matter Unsupported file format
examples/pump-app/pump-common/pump-app.matter Unsupported file format
examples/placeholder/linux/apps/app2/config.matter Unsupported file format
examples/placeholder/linux/apps/app1/config.matter Unsupported file format
examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter Unsupported file format
examples/ota-provider-app/ota-provider-common/ota-provider-app.matter Unsupported file format
examples/network-manager-app/network-manager-common/network-manager-app.matter Unsupported file format
examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter Unsupported file format
examples/log-source-app/log-source-common/log-source-app.matter Unsupported file format
examples/lock-app/qpg/zap/lock.matter Unsupported file format
examples/lock-app/nxp/zap/lock-app.matter Unsupported file format
examples/lock-app/lock-common/lock-app.matter Unsupported file format
examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter Unsupported file format
examples/lighting-app/silabs/data_model/lighting-thread-app.matter Unsupported file format
examples/lighting-app/silabs/data_model/lighting-wifi-app.matter Unsupported file format
examples/lighting-app/qpg/zap/light.matter Unsupported file format
examples/lighting-app/nxp/zap/lighting-on-off.matter Unsupported file format
examples/lighting-app/lighting-common/lighting-app.matter Unsupported file format
examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter Unsupported file format
examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter Unsupported file format
examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter Unsupported file format
examples/light-switch-app/qpg/zap/switch.matter Unsupported file format
examples/light-switch-app/light-switch-common/light-switch-app.matter Unsupported file format
examples/laundry-washer-app/nxp/zap/laundry-washer-app.matter Unsupported file format
examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter Unsupported file format
examples/energy-management-app/energy-management-common/energy-management-app.matter Unsupported file format
examples/dishwasher-app/dishwasher-common/dishwasher-app.matter Unsupported file format
examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter Unsupported file format
examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter Unsupported file format
examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter Unsupported file format
examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter Unsupported file format
examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter Unsupported file format
examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter Unsupported file format
examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter Unsupported file format
examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter Unsupported file format
examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter Unsupported file format
examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter Unsupported file format
examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter Unsupported file format
examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter Unsupported file format
examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.matter Unsupported file format
examples/chef/devices/rootnode_dishwasher_cc105034fe.matter Unsupported file format
examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter Unsupported file format
examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter Unsupported file format
examples/chef/devices/rootnode_fan_7N2TobIlOX.matter Unsupported file format
examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter Unsupported file format
examples/chef/devices/rootnode_genericswitch_2dfff6e516.matter Unsupported file format
examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter Unsupported file format
examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter Unsupported file format
examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter Unsupported file format
examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter Unsupported file format
examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter Unsupported file format
examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter Unsupported file format
examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter Unsupported file format
examples/chef/devices/rootnode_onofflight_samplemei.matter Unsupported file format
examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter Unsupported file format
examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter Unsupported file format
examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter Unsupported file format
examples/chef/devices/rootnode_pump_5f904818cc.matter Unsupported file format
examples/chef/devices/rootnode_pump_a811bb33a0.matter Unsupported file format
examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter Unsupported file format
examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter Unsupported file format
examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter Unsupported file format
examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter Unsupported file format
examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter Unsupported file format
examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter Unsupported file format
examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter Unsupported file format
examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter Unsupported file format
examples/bridge-app/bridge-common/bridge-app.matter Unsupported file format
examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter Unsupported file format
examples/all-clusters-app/all-clusters-common/all-clusters-app.matter Unsupported file format
examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter Unsupported file format
examples/air-purifier-app/air-purifier-common/air-purifier-app.matter Unsupported file format

Copy link

github-actions bot commented Jul 31, 2024

PR #34680: Size comparison from 6da66b7 to 1cab752

Full report (85 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, mbed, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section 6da66b7 1cab7528 change % change
bl602 lighting-app bl602 FLASH 1277128 1277128 0 0.0
RAM 95888 95888 0 0.0
bl602+mfd FLASH 1291386 1291386 0 0.0
RAM 96040 96040 0 0.0
bl602+rpc FLASH 1316096 1316096 0 0.0
RAM 104312 104312 0 0.0
bl702 lighting-app bl702 FLASH 1098280 1098280 0 0.0
RAM 15241 15241 0 0.0
bl702+mfd FLASH 1108974 1108974 0 0.0
RAM 15385 15385 0 0.0
bl702+rpc FLASH 1188346 1188346 0 0.0
RAM 24237 24237 0 0.0
bl706-eth FLASH 881314 881314 0 0.0
RAM 27344 27344 0 0.0
bl706-wifi FLASH 1134412 1134412 0 0.0
RAM 14677 14677 0 0.0
bl702l lighting-app bl702l FLASH 1085434 1085434 0 0.0
RAM 21796 21796 0 0.0
bl702l+mfd FLASH 1096440 1096440 0 0.0
RAM 21948 21948 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 802368 802368 0 0.0
RAM 109844 109844 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 817044 817044 0 0.0
RAM 117444 117444 0 0.0
lock-mtd LP_EM_CC1354P10_6 FLASH 809040 809040 0 0.0
RAM 111724 111724 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 762804 762804 0 0.0
RAM 105864 105864 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 747456 747456 0 0.0
RAM 106056 106056 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 610142 610142 0 0.0
RAM 205380 205380 0 0.0
lock CC3235SF_LAUNCHXL FLASH 652622 652622 0 0.0
RAM 205620 205620 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 671425 671425 0 0.0
RAM 78348 78348 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 691285 691285 0 0.0
RAM 80980 80980 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 691285 691285 0 0.0
RAM 80980 80980 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 648213 648213 0 0.0
RAM 73416 73416 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 610065 610065 0 0.0
RAM 71340 71340 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 629701 629701 0 0.0
RAM 73892 73892 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 629701 629701 0 0.0
RAM 73892 73892 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 625777 625777 0 0.0
RAM 74356 74356 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 645485 645485 0 0.0
RAM 76908 76908 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 645485 645485 0 0.0
RAM 76908 76908 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 599533 599533 0 0.0
RAM 68372 68372 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 619393 619393 0 0.0
RAM 71004 71004 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 619393 619393 0 0.0
RAM 71004 71004 0 0.0
efr32 lighting-app BRD4187C FLASH 929456 929456 0 0.0
RAM 135148 135148 0 0.0
lock-app BRD4338a FLASH 735108 735108 0 0.0
RAM 208436 208436 0 0.0
window-app BRD4187C FLASH 1015188 1015188 0 0.0
RAM 127084 127084 0 0.0
esp32 all-clusters-app c3devkit DRAM 91580 91580 0 0.0
FLASH 1492470 1492470 0 0.0
IRAM 75570 75570 0 0.0
m5stack DRAM 118068 118068 0 0.0
FLASH 1561391 1561391 0 0.0
IRAM 125403 125403 0 0.0
linux air-purifier-app debug unknown 4632 4632 0 0.0
FLASH 2729823 2729823 0 0.0
RAM 128272 128272 0 0.0
all-clusters-app debug unknown 5416 5416 0 0.0
FLASH 5991832 5991832 0 0.0
RAM 508752 508752 0 0.0
all-clusters-minimal-app debug unknown 5312 5312 0 0.0
FLASH 5333156 5333156 0 0.0
RAM 239632 239632 0 0.0
bridge-app debug unknown 5296 5296 0 0.0
FLASH 4710604 4710604 0 0.0
RAM 216960 216960 0 0.0
chip-tool debug unknown 5832 5832 0 0.0
FLASH 12404462 12404458 -4 -0.0
RAM 556122 556122 0 0.0
chip-tool-ipv6only arm64 unknown 20264 20264 0 0.0
FLASH 11090460 11090460 0 0.0
RAM 606008 606008 0 0.0
fabric-admin debug unknown 5672 5672 0 0.0
FLASH 11384595 11384595 0 0.0
RAM 552858 552858 0 0.0
fabric-bridge-app debug unknown 4568 4568 0 0.0
FLASH 4466624 4466624 0 0.0
RAM 202128 202128 0 0.0
lighting-app debug+rpc+ui unknown 5968 5968 0 0.0
FLASH 5644513 5644513 0 0.0
RAM 228048 228048 0 0.0
lock-app debug unknown 5232 5232 0 0.0
FLASH 4761390 4761390 0 0.0
RAM 203616 203616 0 0.0
ota-provider-app debug unknown 4608 4608 0 0.0
FLASH 4405812 4405812 0 0.0
RAM 197760 197760 0 0.0
ota-requestor-app debug unknown 4544 4544 0 0.0
FLASH 4543926 4543926 0 0.0
RAM 202296 202296 0 0.0
shell debug unknown 4176 4176 0 0.0
FLASH 3032397 3032397 0 0.0
RAM 158536 158536 0 0.0
thermostat-no-ble arm64 unknown 9344 9344 0 0.0
FLASH 4343716 4343716 0 0.0
RAM 242128 242128 0 0.0
tv-app debug unknown 5504 5504 0 0.0
FLASH 5987701 5987701 0 0.0
RAM 582720 582720 0 0.0
tv-casting-app debug unknown 5168 5168 0 0.0
FLASH 10608061 10608061 0 0.0
RAM 642920 642920 0 0.0
mbed lock-app-release cy8cproto_062_4343w FLASH 1503780 1503780 0 0.0
RAM 227296 227296 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 904976 904976 0 0.0
RAM 142103 142103 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 878124 878124 0 0.0
RAM 140242 140242 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 836728 836728 0 0.0
RAM 140944 140944 0 0.0
nxp contact k32w0+release FLASH 576412 576412 0 0.0
RAM 70416 70416 0 0.0
k32w1+release FLASH 592136 592136 0 0.0
RAM 74456 74456 0 0.0
light k32w0+release FLASH 612056 612056 0 0.0
RAM 69920 69920 0 0.0
k32w1+release FLASH 676968 676968 0 0.0
RAM 83232 83232 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1633292 1633292 0 0.0
RAM 210784 210784 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1538484 1538484 0 0.0
RAM 207536 207536 0 0.0
light cy8ckit_062s2_43012 FLASH 1463124 1463124 0 0.0
RAM 200776 200776 0 0.0
lock cy8ckit_062s2_43012 FLASH 1460148 1460148 0 0.0
RAM 225120 225120 0 0.0
qpg lighting-app qpg6105+debug FLASH 655124 655124 0 0.0
RAM 105148 105148 0 0.0
lock-app qpg6105+debug FLASH 612560 612560 0 0.0
RAM 99632 99632 0 0.0
stm32 light STM32WB5MM-DK FLASH 477496 477496 0 0.0
RAM 144756 144756 0 0.0
telink air-quality-sensor-app tlsr9528a_retention FLASH 619336 619336 0 0.0
RAM 50936 50936 0 0.0
all-clusters-app tlsr9118bdk40d FLASH 676384 676384 0 0.0
RAM 149432 149432 0 0.0
all-clusters-minimal-app tlsr9528a FLASH 769618 769618 0 0.0
RAM 110612 110612 0 0.0
bridge-app tlsr9258a FLASH 677950 677950 0 0.0
RAM 91624 91624 0 0.0
contact-sensor-app tlsr9528a_retention FLASH 620928 620928 0 0.0
RAM 50980 50980 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a FLASH 706792 706792 0 0.0
RAM 74316 74316 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 619716 619716 0 0.0
RAM 145580 145580 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 805802 805802 0 0.0
RAM 99504 99504 0 0.0
lock-app-dfu tlsr9528a FLASH 652706 652706 0 0.0
RAM 67012 67012 0 0.0
ota-requestor-app tlsr9258a FLASH 695984 695984 0 0.0
RAM 91308 91308 0 0.0
pump-app-usb tlsr9518adk80d FLASH 630284 630284 0 0.0
RAM 55756 55756 0 0.0
pump-controller-app tlsr9518adk80d FLASH 607884 607884 0 0.0
RAM 53000 53000 0 0.0
shell tlsr9518adk80d FLASH 466810 466810 0 0.0
RAM 68660 68660 0 0.0
smoke_co_alarm-app tlsr9528a_retention FLASH 627696 627696 0 0.0
RAM 52696 52696 0 0.0
temperature-measurement-app-mars-ota tlsr9518adk80d FLASH 651706 651706 0 0.0
RAM 56636 56636 0 0.0
thermostat tlsr9518adk80d FLASH 631472 631472 0 0.0
RAM 53376 53376 0 0.0
window-covering tlsr9118bdk40d FLASH 521846 521846 0 0.0
RAM 98536 98536 0 0.0
tizen all-clusters-app arm unknown 1588 1588 0 0.0
FLASH 1690788 1690788 0 0.0
RAM 51692 51692 0 0.0
chip-tool-ubsan arm unknown 2404 2404 0 0.0
FLASH 16464378 16464378 0 0.0
RAM 7230388 7230388 0 0.0

@mergify mergify bot merged commit c124b81 into project-chip:master Aug 2, 2024
70 checks passed
w8floosh pushed a commit to w8floosh/chip-fuzzing that referenced this pull request Aug 4, 2024
…hip#34680)

* Updated the golabl data type's XMLs, removing the cluster entries.

* Zap generated after XML update.

* Fixed namespaces used of global structs.

* Restyled by clang-format

---------

Co-authored-by: Restyled.io <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants