Rename silabs/types.xml to silabs/types-silabs.xml to prevent it to b… #24710
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…e loaded before chip/chip-types.xml since zcl-loader-silabs.js::parseZclFiles reorder the files if it match types.xml
vivien-apple
force-pushed
the
ZAP_Avoid_silabs_types.xml_to_load_before_chip_chip_types.xml
branch
from
98dc5ec to
3f1c6c6
Compare
pullapprove
bot
requested review from
amitnj,
anush-apple,
arkq,
Byungjoo-Lee,
bzbarsky-apple,
carol-apple,
chrisdecenzo,
chshu,
chulspro,
CodeChronos928,
Damian-Nordic,
dhrishi,
electrocucaracha,
franck-apple,
gjc13,
harimau-qirex,
harsha-rajendran,
hawk248,
jelderton,
jepenven-silabs,
jmartinez-silabs,
jmeg-sfy and
jtung-apple
pullapprove
bot
requested review from
ksperling-apple,
lazarkov,
lpbeliveau-silabs,
LuDuda,
mlepage-google,
mrjerryjohns,
msandstedt,
mspang,
pjzander-signify,
robszewczyk,
saurabhst,
selissia,
tcarmelveilleux,
tecimovic,
tehampson,
turon,
vijs,
woody-apple,
xylophone21 and
yufengwangca
|
PR #24710: Size comparison from 42d0ac8 to 3f1c6c6 Increases (9 builds for bl602, bl702, nrfconnect, psoc6, qpg, telink)
Decreases (1 build for cc13x2_26x2)
Full report (54 builds for bl602, bl702, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
|
andy31415
approved these changes
Jan 27, 2023
bzbarsky-apple
approved these changes
Jan 27, 2023
shchen-Lab
added a commit
to bouffalolab/connectedhomeip-1
that referenced
this pull request
Feb 6, 2023
* tag 'TE_23_02/rc2': (374 commits) Fix placeholder app shutdown to actually do a clean stack shutdown. (project-chip#24714) [chip-repl tests] Update tests that can pass (project-chip#24708) [repl tests] Allow the ability to run all tests in the test suite (including manual) (project-chip#24707) Rename silabs/types.xml to silabs/types-silabs.xml to prevent it to be loaded before chip/chip-types.xml since zcl-loader-silabs.js::parseZclFiles reorder the files if it match types.xml (project-chip#24710) Replace more arm64 nodeps-clang variants with just nodeps as they are mutually exclusive (project-chip#24704) Fix cloudbuild targets: It is "all-clusters" and not "all-clusters-app" (project-chip#24703) [Telink] Improve the Identify Implementation & Update every image to 0.6.35 (project-chip#24690) Add ability to list all YAML tests and manually run them from the test runner (project-chip#24629) silabs_fix_lighting_app_lcd (project-chip#24661) TC-ACE-1.4 automation (project-chip#24157) Update TC_RR_1_1.py to match test spec changes. (project-chip#24664) [nrfconnect] Fixed window covering compilation failure (project-chip#24700) [Telink] Logs optimization (project-chip#24693) [tv-app + YAML tests] Update the yaml tests to use the correct formatting for the responses since CurrentChannel is a struct (project-chip#24696) [YAML tests] Add PICS code to Color Control WaitForDelay steps (project-chip#24699) chip-repl tests: xml parsing to report location of where unrecognized handlers reside (project-chip#24674) Remove Basic SWBuildId extension from zll.xml since there is no cluster with this code (0x0000) (project-chip#24689) [Thermostat Cluster] Move related bitmaps/enums from silabs/types.xml to chip/thermostat-cluster.xml (project-chip#24694) [darwin] Add [WiFi/Ethernet]NetworkDiagnosticsFeature bitmaps and their values to darwin availability register (project-chip#24692) Less XML parsing, resulting in less errors (project-chip#24667) ...
lecndav
pushed a commit
to lecndav/connectedhomeip
that referenced
this pull request
Mar 22, 2023
…e loaded before chip/chip-types.xml since zcl-loader-silabs.js::parseZclFiles reorder the files if it match types.xml (project-chip#24710)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…e loaded before chip/chip-types.xml since zcl-loader-silabs.js::parseZclFiles reorder the files if it match types.xml
Problem
I was trying to remove some enums/bitmaps from
rc/app/zap-templates/zcl/data-model/silabs/types.xmland ends up onto a very strange behaviour.After having removed a certain amount of enums and/or bitmaps, running
./scripts/tools/zap/generate.py src/controller/data_model/controller-clusters.zap -t examples/chip-tool/templates/templates.json -o zzz_generated/chip-tool/zap-generatedwas failing 100% of the time with errors in such as:Both of those types are currently defined in
silabs/types.xml.This errors happens a lot on ToT and it seems to touch darwin more specifically.
While debugging I found that the size of the bitmap/enum was reported as
nullinsrc-electron/generator/matter/app/zap-templates/common/ClustersHelper.jsand the underlying reason is because, despite beeing at the end of the list,types.xmlis loaded concurrently withchip-types.xml. So removing content, likely makes it faster to parse, and it ends up resolving beforechip-types.xml.And
LevelControlOptionsis defined as:The type is
BITMAP8but this type is defined inchip-types.xmlwhich contains all the base types !The code that loads them concurrently is located at https://github.com/project-chip/zap/blob/7f47fc19f39a4e1af038bbfd9c059b69bb93345b/src-electron/zcl/zcl-loader-silabs.js#LL1830C16-L1830C29 and basically move files ending with
types.xmlto be loaded first...So, the simplest things for now is just to rename
silabs/types.xmltosilabs/types-silabs.xml, moved it at the top ofzcl.jsonand slowly deprecated this file...