test: Rename isa -> binary

Author: hansungk

.github/workflows/ci.yml

@@ -141,94 +141,94 @@ jobs:
                testOnly radiance.muon.SequencerTest; \
                testOnly radiance.muon.ScoreboardTest"
 
-  run-soc-isa-tests:
-    name: Run SoC ISA tests
+  run-soc-binary-tests:
+    name: Run SoC binary tests
     runs-on: as4
     needs: build
     steps:
-      - name: Run ISA tests on SoC config
+      - name: Run binary tests on SoC config
         run: |
           cd "${CHIPYARD_DIR}"
           source env.sh
           source /ecad/tools/vlsi.bashrc
           cd generators/radiance
-          python3 test/run_isa_tests.py -j "$(nproc)" \
-            --json-out test/isa-test-logs/soc/results.json
-      - name: Render ISA test report
+          python3 test/run_binary.py -j "$(nproc)" \
+            --json-out test/binary-test-logs/soc/results.json
+      - name: Render binary test report
         if: always()
         run: |
           cd "${CHIPYARD_DIR}/generators/radiance"
-          python3 test/render_isa_test_report.py \
-            test/isa-test-logs/soc/results.json \
+          python3 test/render_binary_test_report.py \
+            test/binary-test-logs/soc/results.json \
             --github-step-summary
 
-  run-core-isa-tests:
-    name: Run Core-standalone ISA tests
+  run-core-binary-tests:
+    name: Run Core-standalone binary tests
     runs-on: as4
     needs: build
     steps:
-      - name: Run ISA tests on core-as-top config
+      - name: Run binary tests on core-as-top config
         run: |
           cd "${CHIPYARD_DIR}"
           source env.sh
           source /ecad/tools/vlsi.bashrc
           cd generators/radiance
-          python3 test/run_isa_tests.py -j "$(nproc)" -c core \
-            --json-out test/isa-test-logs/core/results.json
-      - name: Render ISA test report
+          python3 test/run_binary_tests.py -j "$(nproc)" -c core \
+            --json-out test/binary-test-logs/core/results.json
+      - name: Render binary test report
         if: always()
         run: |
           cd "${CHIPYARD_DIR}/generators/radiance"
-          python3 test/render_isa_test_report.py \
-            test/isa-test-logs/core/results.json \
+          python3 test/render_binary_test_report.py \
+            test/binary-test-logs/core/results.json \
             --github-step-summary
 
-  run-cosim-isa-tests:
-    name: Run Cyclotron-as-a-Tile Co-sim ISA tests
+  run-cosim-binary-tests:
+    name: Run Cyclotron-as-a-Tile Co-sim binary tests
     runs-on: as4
     needs: build
     steps:
-      - name: Run ISA tests on backend co-sim config
+      - name: Run binary tests on backend co-sim config
         run: |
           cd "${CHIPYARD_DIR}"
           source env.sh
           source /ecad/tools/vlsi.bashrc
           cd generators/radiance
-          python3 test/run_isa_tests.py -j "$(nproc)" -c cosim \
-            --json-out test/isa-test-logs/cosim/results.json
-      - name: Render ISA test report
+          python3 test/run_binary_tests.py -j "$(nproc)" -c cosim \
+            --json-out test/binary-test-logs/cosim/results.json
+      - name: Render binary test report
         if: always()
         run: |
           cd "${CHIPYARD_DIR}/generators/radiance"
-          python3 test/render_isa_test_report.py \
-            test/isa-test-logs/cosim/results.json \
+          python3 test/render_binary_test_report.py \
+            test/binary-test-logs/cosim/results.json \
             --github-step-summary
 
-  # run-backend-cosim-isa-tests:
-  #   name: Run Backend Co-sim ISA tests
+  # run-backend-cosim-binary-tests:
+  #   name: Run Backend Co-sim binary tests
   #   runs-on: as4
   #   needs: build
   #   steps:
-  #     - name: Run ISA tests on backend co-sim config
+  #     - name: Run binary tests on backend co-sim config
   #       run: |
   #         cd "${CHIPYARD_DIR}"
   #         source env.sh
   #         source /ecad/tools/vlsi.bashrc
   #         cd generators/radiance
-  #         python3 test/run_isa_tests.py -j "$(nproc)" -c backend \
-  #           --json-out test/isa-test-logs/backend/results.json
-  #     - name: Render ISA test report
+  #         python3 test/run_binary_tests.py -j "$(nproc)" -c backend \
+  #           --json-out test/binary-test-logs/backend/results.json
+  #     - name: Render binary test report
   #       if: always()
   #       run: |
   #         cd "${CHIPYARD_DIR}/generators/radiance"
-  #         python3 test/render_isa_test_report.py \
-  #           test/isa-test-logs/backend/results.json \
+  #         python3 test/render_binary_test_report.py \
+  #           test/binary-test-logs/backend/results.json \
   #           --github-step-summary
 
   clean:
     name: Clean
     runs-on: as4
-    needs: [build, run-unit-tests, run-soc-isa-tests, run-core-isa-tests, run-cosim-isa-tests]
+    needs: [build, run-unit-tests, run-soc-binary-tests, run-core-binary-tests, run-cosim-binary-tests]
     if: always()
     steps:
       - name: Cleanup workspace, chipyard and conda

test/render_isa_test_report.py test/render_binary_test_report.pytest/render_isa_test_report.py renamed to test/render_binary_test_report.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-"""Run Cyclotron ISA tests via the VCS simulator."""
+"""Run ELF binary tests via the VCS simulator."""
 
 import argparse
 import json
@@ -277,7 +277,7 @@ def iter_elfs(elf_dir):
 
 
 def sweep(config, binary, log_dir, script_dir, chipyard_dir, sim_dir, jobs):
-    print(f"[{myname}] sweeping all ISA tests using {jobs} parallel jobs")
+    print(f"[{myname}] sweeping all ELF tests using {jobs} parallel jobs")
 
     radiance_dir = script_dir.parent
     cyclotron_dir = radiance_dir / "cyclotron"
@@ -364,7 +364,7 @@ def discover_chipyard(script_dir):
 def parse_args():
     parser = argparse.ArgumentParser(
         description=(
-            "Run integration tests on the RTL using muon-isa-test ELF binaries.\n"
+            "Run integration tests on the RTL using ELF binaries.\n"
             "ELF binaries can either be given explicitly, or searched in the filesystem to do a sweep.\n"
             "Requires VCS simulation binary to be built."
         ),
@@ -374,8 +374,8 @@ def parse_args():
                         help="ELF to run; if omitted, sweeps found ELFs on its own")
     parser.add_argument('-c', '--config', default='soc',
                         help="testbench config to run; (soc|core|cosim|backend). default is 'soc'")
-    parser.add_argument('--log-dir', default='isa-test-logs',
-                        help="directory to be created to place the logs. default is 'isa-test-logs'")
+    parser.add_argument('--log-dir', default='binary-test-logs',
+                        help="directory to be created to place the logs. default is 'binary-test-logs'")
     parser.add_argument('--json-out',
                         help="write machine-readable test results to this JSON path. "
                              "default is <log-dir>/<config>/results.json")