[Doc] add Controller tests to testplanner overview

Signed-off-by: Angelo Nujic <anujic@antmicro.com>

Author: anujic

.github/workflows/tests-and-docs.yml

@@ -216,7 +216,7 @@ jobs:
         with:
           name: test-results-ahb-${{ steps.sanitize.outputs.name }}
           path: |
-            verification/cocotb/**/results*.xml
+            verification/cocotb/**/*.xml
             verification/cocotb/**/*.log
 
   # ===========================================================================
@@ -299,7 +299,7 @@ jobs:
         with:
           name: test-results-axi-${{ steps.sanitize.outputs.name }}
           path: |
-            verification/cocotb/**/results*.xml
+            verification/cocotb/**/*.xml
             verification/cocotb/**/*.log
 
   # ===========================================================================
@@ -386,7 +386,7 @@ jobs:
         with:
           name: test-results-axi-controller-${{ steps.sanitize.outputs.name }}
           path: |
-            verification/cocotb/**/results*.xml
+            verification/cocotb/**/*.xml
             verification/cocotb/**/*.log
 
   # ===========================================================================

Makefile

@@ -124,8 +124,8 @@ build-verilator:
 # Testplanning
 #
 
-BLOCKS_VERIFICATION_PLANS = $(shell find $(TESTPLAN_DIR) -type f -name "*.hjson" ! -name "target*.hjson" | sort)
-CORE_VERIFICATION_PLANS = $(shell find $(TESTPLAN_DIR) -type f -name "*target*.hjson" | sort)
+BLOCKS_VERIFICATION_PLANS = $(shell find $(TESTPLAN_DIR) -type f -path "*/block/*.hjson" | sort)
+CORE_VERIFICATION_PLANS   = $(shell find $(TESTPLAN_DIR) -type f -path "*/top/*.hjson" | sort)
 verification-docs:
 	testplanner $(BLOCKS_VERIFICATION_PLANS) -ot $(TESTPLAN_DIR)/generated/testplans_blocks.md --project-root $(I3C_ROOT_DIR) --testplan-file-map $(TESTPLAN_DIR)/source-maps.yml --source-url-prefix $(REPO_URL)
 	testplanner $(CORE_VERIFICATION_PLANS) -ot $(TESTPLAN_DIR)/generated/testplans_core.md --project-root $(I3C_ROOT_DIR) --testplan-file-map $(TESTPLAN_DIR)/source-maps.yml --source-url-prefix $(REPO_URL)
@@ -134,8 +134,8 @@ cocotbxml-to-hjson-sim-results:
 	cocotbxml-to-hjson -i $(TESTS_RESULTS_DIR) -t $(BLOCKS_VERIFICATION_PLANS) -o $(TESTS_RESULTS_DIR) --xml-root-dir $(TESTS_XML_BASE_PATH) --tests-ignore-dirs venv .venv .pyenv --test-tracking-summary-dir ./blocks --testplan-file-map $(TESTPLAN_DIR)/source-maps.yml
 	cocotbxml-to-hjson -i $(TESTS_RESULTS_DIR) -t $(CORE_VERIFICATION_PLANS) -o $(TESTS_RESULTS_DIR) --xml-root-dir $(TESTS_XML_BASE_PATH) --tests-ignore-dirs venv .venv .pyenv --test-tracking-summary-dir ./core --testplan-file-map $(TESTPLAN_DIR)/source-maps.yml
 
-BLOCKS_VERIFICATION_SIM_RESULTS = $(shell find $(TESTS_RESULTS_DIR) -type f -name "*.hjson" ! -name "target*.hjson" | sort)
-CORE_VERIFICATION_SIM_RESULTS = $(shell find $(TESTS_RESULTS_DIR) -type f -name "*target*.hjson" | sort)
+BLOCKS_VERIFICATION_SIM_RESULTS = $(shell find $(TESTS_RESULTS_DIR) -type f -path "*/block/*.hjson" | sort)
+CORE_VERIFICATION_SIM_RESULTS   = $(shell find $(TESTS_RESULTS_DIR) -type f -path "*/top/*.hjson" | sort)
 verification-docs-with-sim: cocotbxml-to-hjson-sim-results
 	testplanner $(BLOCKS_VERIFICATION_PLANS) -s $(BLOCKS_VERIFICATION_SIM_RESULTS) -ot $(TESTPLAN_DIR)/generated/testplans_blocks.md -os $(TESTPLAN_DIR)/generated/sim-results --output-summary-title "Tests for individual blocks" --output-summary $(TESTPLAN_DIR)/generated/sim-results/index-blocks.html --project-root $(I3C_ROOT_DIR) --testplan-file-map $(TESTPLAN_DIR)/source-maps.yml --source-url-prefix $(REPO_URL)
 	testplanner $(CORE_VERIFICATION_PLANS) -s $(CORE_VERIFICATION_SIM_RESULTS) -ot $(TESTPLAN_DIR)/generated/testplans_core.md -os $(TESTPLAN_DIR)/generated/sim-results --output-summary-title "Tests for the core" --output-summary $(TESTPLAN_DIR)/generated/sim-results/index-top.html --project-root $(I3C_ROOT_DIR) --testplan-file-map $(TESTPLAN_DIR)/source-maps.yml --source-url-prefix $(REPO_URL)

verification/testplan/source-maps.yml

@@ -17,27 +17,33 @@ testplans:
     testpoints:
     - name: "^(.*)$"
       source: "verification/cocotb/top/i3c_axi_controller/test_controller_ccc.py"
+      cocotb_xml: ".*verification/cocotb/top/i3c_axi_controller/test_controller_ccc(_[0-9]+)?.xml"
   - name: 'Controller IBI Handling'
     testpoints:
     - name: "^(.*)$"
       source: "verification/cocotb/top/i3c_axi_controller/test_controller_ibi.py"
+      cocotb_xml: ".*verification/cocotb/top/i3c_axi_controller/test_controller_ibi(_[0-9]+)?.xml"
   - name: 'Controller Generate HDR Exit Pattern'
     testpoints:
     - name: "^(.*)$"
       source: "verification/cocotb/top/i3c_axi_controller/test_controller_hdr_exit.py"
+      cocotb_xml: ".*verification/cocotb/top/i3c_axi_controller/test_controller_hdr_exit(_[0-9]+)?.xml"
   - name: 'Controller error generation'
     testpoints:
     - name: "^(.*)$"
       source: "verification/cocotb/top/i3c_axi_controller_err/test_controller_error.py"
+      cocotb_xml: ".*verification/cocotb/top/i3c_axi_controller_err/test_controller_error(_[0-9]+)?.xml"
 
   - name: '(Controller-specific)? ?CSR access check'
     testpoints:
     - name: "^(.*)$"
       tests:
-      - name: "^(.*)$"
+      - name: ".*csr_access.*"
         source: "verification/cocotb/top/lib_i3c_top/test_csr_access.py"
-      - name: "^(.*)$"
+        cocotb_xml: ".*verification/cocotb/top/i3c_axi/test_csr_access(_[0-9]+)?.xml"
+      - name: ".*(configure|stdby).*"
         source: "verification/cocotb/top/i3c_axi_controller/test_configure_i3c_cores.py"
+        cocotb_xml: ".*verification/cocotb/top/i3c_axi_controller/test_configure_i3c_cores(_[0-9]+)?.xml"
   - name: 'Enter and exit HDR mode'
     testpoints:
     - name: "^(.*)$"
@@ -120,18 +126,22 @@ testplans:
     testpoints:
     - name: "^(.*)$"
       tests:
+      - name: ".*write.*"
+        source: "verification/cocotb/top/i3c_axi_controller/test_i3c_controller_repeated_start.py"
+        cocotb_xml: ".*verification/cocotb/top/i3c_axi_controller/test_i3c_controller_repeated_start(_[0-9]+)?.xml"
       - name: "^(.*)$"
         source: "verification/cocotb/top/i3c_axi_controller/test_i3c_controller_write_target_read.py"
-      - name: "*write*"
-        source: "verification/cocotb/top/i3c_axi_controller/test_i3c_controller_repeated_start.py"
+        cocotb_xml: ".*verification/cocotb/top/i3c_axi_controller/test_i3c_controller_write_target_read(_[0-9]+)?.xml"
   - name: 'Controller Private Read'
     testpoints:
     - name: "^(.*)$"
       tests:
+      - name: ".*read.*"
+        source: "verification/cocotb/top/i3c_axi_controller/test_i3c_controller_repeated_start.py"
+        cocotb_xml: ".*verification/cocotb/top/i3c_axi_controller/test_i3c_controller_repeated_start(_[0-9]+)?.xml"
       - name: "^(.*)$"
         source: "verification/cocotb/top/i3c_axi_controller/test_i3c_controller_read_target_write.py"
-      - name: "*read*"
-        source: "verification/cocotb/top/i3c_axi_controller/test_i3c_controller_repeated_start.py"
+        cocotb_xml: ".*verification/cocotb/top/i3c_axi_controller/test_i3c_controller_read_target_write(_[0-9]+)?.xml"
   - name: 'Controller I2C Mode'
     testpoints:
     - name: "^(.*)$"