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

Fix RR_1_1 to match spec and bring all-clusters app inline with minimums requirements #25789

Merged

Conversation

tehampson
Copy link
Contributor

@tehampson tehampson commented Mar 22, 2023

Fixes: #25532

Changes to RR_1.1:
This bring code in line to what is actually written in the RR_1.1 spec. There was a bug in add_all_groups that wrote all wrote all the groups to each of the endpoints instead, leading to writing more then the maximum of supported groups per fabric. This also incorporates test spec changes from https://github.com/CHIP-Specifications/chip-test-plans/pull/2503

Changes outside of RR_1.1:

  • Changes required to bring all clusters up to compliance with minimum spec based on it having 3 Groups clusters
  • Changes to yaml test run against all clusters app in CI now that there are more groups per fabric

@github-actions
Copy link

PR #25789: Size comparison from 2ea6746 to 5d40ed1

Increases (1 build for cc32xx)
platform target config section 2ea6746 5d40ed1 change % change
cc32xx lock CC3235SF_LAUNCHXL .debug_info 20251230 20251231 1 0.0
Full report (1 build for cc32xx)
platform target config section 2ea6746 5d40ed1 change % change
cc32xx lock CC3235SF_LAUNCHXL 0 0 0 0.0
(read only) 645825 645825 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 930286 930286 0 0.0
.debug_aranges 87400 87400 0 0.0
.debug_frame 300336 300336 0 0.0
.debug_info 20251230 20251231 1 0.0
.debug_line 2661959 2661959 0 0.0
.debug_loc 2806733 2806733 0 0.0
.debug_ranges 283424 283424 0 0.0
.debug_str 3027534 3027534 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 380469 380469 0 0.0
.symtab 257408 257408 0 0.0
.text 537712 537712 0 0.0

@github-actions
Copy link

PR #25789: Size comparison from 2ea6746 to c2eb315

Increases (1 build for cc32xx)
platform target config section 2ea6746 c2eb315 change % change
cc32xx lock CC3235SF_LAUNCHXL .debug_info 20251230 20251231 1 0.0
Full report (1 build for cc32xx)
platform target config section 2ea6746 c2eb315 change % change
cc32xx lock CC3235SF_LAUNCHXL 0 0 0 0.0
(read only) 645825 645825 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 930286 930286 0 0.0
.debug_aranges 87400 87400 0 0.0
.debug_frame 300336 300336 0 0.0
.debug_info 20251230 20251231 1 0.0
.debug_line 2661959 2661959 0 0.0
.debug_loc 2806733 2806733 0 0.0
.debug_ranges 283424 283424 0 0.0
.debug_str 3027534 3027534 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 380469 380469 0 0.0
.symtab 257408 257408 0 0.0
.text 537712 537712 0 0.0

@github-actions
Copy link

PR #25789: Size comparison from 2ea6746 to c243280

Full report (1 build for cc32xx)
platform target config section 2ea6746 c243280 change % change
cc32xx lock CC3235SF_LAUNCHXL 0 0 0 0.0
(read only) 645825 645825 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 930286 930286 0 0.0
.debug_aranges 87400 87400 0 0.0
.debug_frame 300336 300336 0 0.0
.debug_info 20251230 20251230 0 0.0
.debug_line 2661959 2661959 0 0.0
.debug_loc 2806733 2806733 0 0.0
.debug_ranges 283424 283424 0 0.0
.debug_str 3027534 3027534 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 380469 380469 0 0.0
.symtab 257408 257408 0 0.0
.text 537712 537712 0 0.0

@github-actions
Copy link

PR #25789: Size comparison from 2ea6746 to 6894824

Increases (1 build for linux)
platform target config section 2ea6746 6894824 change % change
linux chip-tool-ipv6only arm64 (read only) 12132580 12132884 304 0.0
.text 9784676 9784980 304 0.0
Full report (5 builds for cc32xx, linux, qpg)
platform target config section 2ea6746 6894824 change % change
cc32xx lock CC3235SF_LAUNCHXL 0 0 0 0.0
(read only) 645825 645825 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 930286 930286 0 0.0
.debug_aranges 87400 87400 0 0.0
.debug_frame 300336 300336 0 0.0
.debug_info 20251230 20251230 0 0.0
.debug_line 2661959 2661959 0 0.0
.debug_loc 2806733 2806733 0 0.0
.debug_ranges 283424 283424 0 0.0
.debug_str 3027534 3027534 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 380469 380469 0 0.0
.symtab 257408 257408 0 0.0
.text 537712 537712 0 0.0
linux chip-tool-ipv6only arm64 (read only) 12132580 12132884 304 0.0
(read/write) 742648 742648 0 0.0
.bss 34392 34392 0 0.0
.data 3008 3008 0 0.0
.data.rel.ro 684520 684520 0 0.0
.dynamic 560 560 0 0.0
.got 15512 15512 0 0.0
.init 24 24 0 0.0
.init_array 216 216 0 0.0
.rodata 585588 585588 0 0.0
.text 9784676 9784980 304 0.0
thermostat-no-ble arm64 (read only) 2524524 2524524 0 0.0
(read/write) 145240 145240 0 0.0
.bss 56344 56344 0 0.0
.data 1784 1784 0 0.0
.data.rel.ro 77696 77696 0 0.0
.dynamic 560 560 0 0.0
.got 5368 5368 0 0.0
.init 24 24 0 0.0
.init_array 432 432 0 0.0
.rodata 150904 150904 0 0.0
.text 2111232 2111232 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1152888 1152888 0 0.0
.bss 96036 96036 0 0.0
.data 852 852 0 0.0
.text 599984 599984 0 0.0
lock-app qpg6105+debug (read/write) 1121448 1121448 0 0.0
.bss 91172 91172 0 0.0
.data 856 856 0 0.0
.text 568548 568548 0 0.0

@github-actions
Copy link

PR #25789: Size comparison from 2ea6746 to a69e428

Increases (1 build for cc32xx)
platform target config section 2ea6746 a69e428 change % change
cc32xx lock CC3235SF_LAUNCHXL .debug_str 3027534 3027815 281 0.0
Decreases (1 build for cc32xx)
platform target config section 2ea6746 a69e428 change % change
cc32xx lock CC3235SF_LAUNCHXL .debug_info 20251230 20239634 -11596 -0.1
.debug_line 2661959 2661958 -1 -0.0
.debug_loc 2806733 2806731 -2 -0.0
Full report (1 build for cc32xx)
platform target config section 2ea6746 a69e428 change % change
cc32xx lock CC3235SF_LAUNCHXL 0 0 0 0.0
(read only) 645825 645825 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 930286 930286 0 0.0
.debug_aranges 87400 87400 0 0.0
.debug_frame 300336 300336 0 0.0
.debug_info 20251230 20239634 -11596 -0.1
.debug_line 2661959 2661958 -1 -0.0
.debug_loc 2806733 2806731 -2 -0.0
.debug_ranges 283424 283424 0 0.0
.debug_str 3027534 3027815 281 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 380469 380469 0 0.0
.symtab 257408 257408 0 0.0
.text 537712 537712 0 0.0

@github-actions
Copy link

PR #25789: Size comparison from 2ea6746 to a1f802b

Increases (1 build for cc32xx)
platform target config section 2ea6746 a1f802b change % change
cc32xx lock CC3235SF_LAUNCHXL .debug_str 3027534 3027815 281 0.0
Decreases (1 build for cc32xx)
platform target config section 2ea6746 a1f802b change % change
cc32xx lock CC3235SF_LAUNCHXL .debug_info 20251230 20239634 -11596 -0.1
.debug_line 2661959 2661958 -1 -0.0
.debug_loc 2806733 2806731 -2 -0.0
Full report (1 build for cc32xx)
platform target config section 2ea6746 a1f802b change % change
cc32xx lock CC3235SF_LAUNCHXL 0 0 0 0.0
(read only) 645825 645825 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 930286 930286 0 0.0
.debug_aranges 87400 87400 0 0.0
.debug_frame 300336 300336 0 0.0
.debug_info 20251230 20239634 -11596 -0.1
.debug_line 2661959 2661958 -1 -0.0
.debug_loc 2806733 2806731 -2 -0.0
.debug_ranges 283424 283424 0 0.0
.debug_str 3027534 3027815 281 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 380469 380469 0 0.0
.symtab 257408 257408 0 0.0
.text 537712 537712 0 0.0

@tehampson tehampson changed the title Fix RR_1_1 to latest understanding Fix RR_1_1 to match spec and bring all-clusters app inline with minimums requirements Mar 23, 2023
@tehampson tehampson merged commit 7326cf8 into project-chip:master Mar 24, 2023
# Step 10: Count all group cluster instances
# Step 10: Reconfig ACL to allow test runner access to Groups clusters on all endpoints.
logging.info("Step 10: Reconfiguring ACL to allow access to Groups Clusters")
self.send_acl(test_step=10, client_by_name=client_by_name, enable_access_to_group_cluster=False, fabric_table=fabric_table)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

enable_access_to_group_cluster shall be True?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ops... that is correct

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've created separate PR to fix that: #25845

admin_targets = [
Clusters.AccessControl.Structs.Target(endpoint=0),
Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC00, deviceType=0xFFF1_BC30),
admin_target_field_2,
Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC01, deviceType=0xFFF1_BC31)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we wanna be precise regarding Master test plan the Targets shall be
Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC00, deviceType=0xFFF1_FC31)

@@ -747,9 +759,13 @@ def build_acl(self):
# Administer ACL entry
admin_subjects = [0xFFFF_FFFD_0001_0001, 0x2000_0000_0000_0001, 0x2000_0000_0000_0002, 0x2000_0000_0000_0003]

admin_target_field_2 = Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC00, deviceType=0xFFF1_BC30)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on Master test plan RR-1.1 definition it should be Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC00, deviceType=0xFFF1_FC30)

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.

[BUG] TC_RR_1_1 group sub-test not run if Groups cluster endpoint is not 0
4 participants