Merge pull request #788 from jordancarlin/main

New test framework

Author: davidharrishmc

.gitignore

@@ -53,3 +53,7 @@ testplans/Vx.csv
 
 wkdir
 fcov_ucdb
+
+*.trace
+*.tracelist
+*.mk

.pre-commit-config.yaml

@@ -30,7 +30,7 @@ repos:
 
   # Ruff python linter
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.10
+    rev: v0.12.11
     hooks:
       # Run the linter.
       - id: ruff-check

.python-version

@@ -0,0 +1 @@
+3.12

Makefile

@@ -30,11 +30,6 @@ UNPRIVOBJECTS   = $(UNPRIV_SOURCES:.$(SRCEXT)=.$(OBJEXT))
 
 # Main targets
 all: unpriv priv
-Vx  : riscv-arch-Vx8  riscv-arch-Vx16  riscv-arch-Vx32  riscv-arch-Vx64
-Vls : riscv-arch-Vls8 riscv-arch-Vls16 riscv-arch-Vls32 riscv-arch-Vls64
-Vf  : riscv-arch-Vf16 riscv-arch-Vf32  riscv-arch-Vf64
-V   : Vx Vls Vf
-
 
 unpriv: testgen
 	$(MAKE) $(UNPRIVOBJECTS)
@@ -48,21 +43,8 @@ covergroupgen: bin/covergroupgen.py
 
 testgen: covergroupgen bin/vector-testgen-unpriv.py bin/combinetests.py bin/testgen.py
 	bin/testgen.py
-	bin/vector-testgen-unpriv.py
+# 	bin/vector-testgen-unpriv.py
 	rm -rf ${TESTDIR}/rv32/E ${TESTDIR}/rv64/E # E tests are not used in the regular (I) suite
-# bin/combinetests.py
-
-riscv-arch: testgen
-	cp -r ${TESTDIR}/rv32/* ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/rv32i/
-	cp -r ${TESTDIR}/rv64/* ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/rv64i/
-
-riscv-arch-%: testgen
-	rm -rf ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/rv32i/$*
-	rm -rf ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/rv64i/$*
-	mkdir -p ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/rv32i/$*
-	mkdir -p ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/rv64i/$*
-	cp -r ${TESTDIR}/rv32/$* ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/rv32i/$*
-	cp -r ${TESTDIR}/rv64/$* ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/rv64i/$*
 
 privheaders: bin/csrtests.py bin/illegalinstrtests.py | $(PRIVHEADERSDIR)
 	bin/csrtests.py
@@ -108,7 +90,7 @@ sim:
 
 interrupts:
 	rm -f ${WALLY}/sim/questa/fcov_ucdb/*
-	cd ${WALLY}/tests/riscof/riscof_work/cvw-arch64/privileged/interrupts/src/InterruptsM.S/ref;riscv64-unknown-elf-gcc -march=rv64i_zicsr          -static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles         -T ${WALLY}/tests/riscof/sail_cSim/env/link.ld         -I ${WALLY}/tests/riscof/sail_cSim/env/         -I ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/env -mabi=lp64  ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/privileged/interrupts/src/InterruptsM.S -o ref.elf -Drvtest_mtrap_routine=True -Drvtest_strap_routine=True -Drvtest_dtrap_routine=True -DTEST_CASE_1=True -DXLEN=64
+	cd ${WALLY}/tests/riscof/riscof_work/cvw-arch64/privileged/interrupts/src/InterruptsM.S/ref;riscv64-unknown-elf-gcc -march=rv64i_zicsr                -static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles         -T ${WALLY}/tests/riscof/sail_cSim/env/link.ld         -I ${WALLY}/tests/riscof/sail_cSim/env/         -I ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/env -mabi=lp64  ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/privileged/interrupts/src/InterruptsM.S -o ref.elf -Drvtest_mtrap_routine=True -Drvtest_strap_routine=True -Drvtest_dtrap_routine=True -DTEST_CASE_1=True -DXLEN=64
 	cd ${WALLY}/tests/riscof/riscof_work/cvw-arch64/privileged/interrupts/src/InterruptsS_Mmode.S/ref;riscv64-unknown-elf-gcc -march=rv64i_zicsr          -static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles         -T ${WALLY}/tests/riscof/sail_cSim/env/link.ld         -I ${WALLY}/tests/riscof/sail_cSim/env/         -I ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/env -mabi=lp64  ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/privileged/interrupts/src/InterruptsS_Mmode.S -o ref.elf -Drvtest_mtrap_routine=True -Drvtest_strap_routine=True -Drvtest_dtrap_routine=True -DTEST_CASE_1=True -DXLEN=64
 	cd ${WALLY}/tests/riscof/riscof_work/cvw-arch64/privileged/interrupts/src/InterruptsS_Smode.S/ref;riscv64-unknown-elf-gcc -march=rv64i_zicsr          -static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles         -T ${WALLY}/tests/riscof/sail_cSim/env/link.ld         -I ${WALLY}/tests/riscof/sail_cSim/env/         -I ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/env -mabi=lp64  ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/privileged/interrupts/src/InterruptsS_Smode.S -o ref.elf -Drvtest_mtrap_routine=True -Drvtest_strap_routine=True -Drvtest_dtrap_routine=True -DTEST_CASE_1=True -DXLEN=64
 	cd ${WALLY}/tests/riscof/riscof_work/cvw-arch64/privileged/interrupts/src/InterruptsS_Umode.S/ref;riscv64-unknown-elf-gcc -march=rv64i_zicsr          -static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles         -T ${WALLY}/tests/riscof/sail_cSim/env/link.ld         -I ${WALLY}/tests/riscof/sail_cSim/env/         -I ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/env -mabi=lp64  ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/privileged/interrupts/src/InterruptsS_Umode.S -o ref.elf -Drvtest_mtrap_routine=True -Drvtest_strap_routine=True -Drvtest_dtrap_routine=True -DTEST_CASE_1=True -DXLEN=64
@@ -154,8 +136,6 @@ $(SRCDIR64) $(SRCDIR32) $(PRIVDIR) $(PRIVHEADERSDIR) $(PRIVDIR64) $(PRIVDIR32) $
 clean:
 	rm -rf fcov/unpriv/*
 	rm -rf $(SRCDIR64) $(SRCDIR32) $(PRIVHEADERSDIR) $(PRIVDIR64) $(PRIVDIR32) $(WORK)
-	rm -rf ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/rv32i/*
-	rm -rf ${WALLY}/addins/cvw-riscv-arch-test/riscv-test-suite/rv64i/*
 
 lint:
 	uvx ruff check

bin/makefilegen.py

@@ -30,33 +30,34 @@ def insertTemplate(name, is_custom=False):
     ext_parts = re.findall(r'Z[a-z]+|[A-Z]', extension)
     ext_parts_no_I = [ext for ext in ext_parts if ext != "I"]
     if 'D' in ext_parts_no_I or 'Zcd' in ext_parts_no_I:
-      ext_parts_no_I = ['D']+ext_parts_no_I
+        ext_parts_no_I = ['D']+ext_parts_no_I
     if 'M' in ext_parts_no_I:
-      ext_parts_no_I = ['M']+ext_parts_no_I
-    if 'Zalrsc' in ext_parts_no_I: #Adding this until gcc15 is updated bc currently no support for this extension
-      ext_parts_no_I = ['A']#+ext_parts_no_I
-    if 'Zaamo' in ext_parts_no_I: #Adding this until gcc15 is updated bc currently no support for this extension
-      ext_parts_no_I = ['A']#+ext_parts_no_I
+        ext_parts_no_I = ['M']+ext_parts_no_I
     if 'F' in ext_parts_no_I or any('f' in ext for ext in ext_parts_no_I):
-      ext_parts_no_I = ['F']+ext_parts_no_I
+        ext_parts_no_I = ['F']+ext_parts_no_I
     if len(ext_parts_no_I) != 0:
-      if ext_parts_no_I[-1] == 'D':
-        ext_parts_no_I = ext_parts_no_I[:-1]
-      if ext_parts_no_I[-1] == 'M':
-        ext_parts_no_I = ext_parts_no_I[:-1]
-      if ext_parts_no_I[-1] == 'F':
-        ext_parts_no_I = ext_parts_no_I[:-1]
-    #ISAEXT = f"RV{xlen}I{''.join(ext_parts_no_I)}"
-    raw_ISAEXT = f"RV{xlen}I{''.join(ext_parts_no_I)}"
-    ISAEXT = insert_all_Z_underscores_after_first(raw_ISAEXT)
-    # Construct the regex part
-    ext_regex = ".*I.*" + "".join([f"{ext}.*" for ext in ext_parts_no_I])
-    test_case_line = f"//check ISA:=regex(.*{xlen}.*);check ISA:=regex({ext_regex});def TEST_CASE_1=True;"
+        if ext_parts_no_I[-1] == 'D':
+            ext_parts_no_I = ext_parts_no_I[:-1]
+        if ext_parts_no_I[-1] == 'M':
+            ext_parts_no_I = ext_parts_no_I[:-1]
+        if ext_parts_no_I[-1] == 'F':
+            ext_parts_no_I = ext_parts_no_I[:-1]
+    if "I" not in ext_parts_no_I and "E" not in ext_parts_no_I:
+        ext_parts_no_I = ['I'] + ext_parts_no_I
+    # Join single char items with no separator, multi-char items with underscore
+    ext_str = ""
+    for ext in ext_parts_no_I:
+        if len(ext) > 1:
+            ext_str += "_"
+        ext_str += ext
+    march = f"rv{xlen}{ext_str.lower()}"
+    march = march.replace("zaamo", "a").replace("zalrsc", "a") # gcc 14 does not accept Zaamo/Zalrsc
     # Replace placeholders
+    template = template.replace("@EXTENSION_LIST@", f"{ext_parts_no_I}")
+    template = template.replace("@MARCH@", march)
+    template = template.replace("@XLEN@", str(xlen))
+    template = template.replace("@CONFIG_DEPENDENT@", "false") # TODO: Make this configurable for some tests (e.g. Zimop)
     template = template.replace("sigupd_count", str(signatureWords))
-    template = template.replace("ISAEXT", ISAEXT)
-    template = template.replace("TestCase", test_case_line)
-    template = template.replace("Instruction", test)
 
     if is_custom:
       # Count SIGUPD macros