Update sail plugin and improve riscof makefile

Author: object-Object

.devcontainer/devcontainer.json

@@ -11,9 +11,8 @@
     ],
 
     "postAttachCommand": {
-        "Fix workspaces permissions": "sudo chown -R vscode /workspaces",
         "Fix commandhistory permissions": "sudo chown -R vscode: /commandhistory",
-        "uv sync": "uv sync"
+        "Fix workspaces permissions and uv sync": "sudo chown -R vscode /workspaces && uv sync"
     },
 
     "customizations": {

.github/.devcontainer/Dockerfile

@@ -14,7 +14,7 @@ RUN mkdir -p /usr/local \
     && cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDOWNLOAD_GMP=FALSE -GNinja \
     && cmake --build build \
     && mkdir -p /opt/sail-riscv \
-    && mv build/c_emulator/* /opt/sail-riscv
+    && mv build/c_emulator/sail_riscv_sim /opt/sail-riscv/sail_riscv_sim
 
 FROM mcr.microsoft.com/devcontainers/rust:bookworm
 

.gitmodules

@@ -3,7 +3,7 @@
 	url = https://github.com/eembc/coremark
 [submodule "riscof/riscv-arch-test"]
 	path = riscof/riscv-arch-test
-	url = https://github.com/riscv-non-isa/riscv-arch-test
+	url = https://github.com/riscv-non-isa/riscv-arch-test.git
 [submodule "micropython/micropython"]
 	path = micropython/micropython
 	url = https://github.com/micropython/micropython

riscof/.gitignore

@@ -1,2 +1,3 @@
 !env/
 riscof_work/
+riscof_db/

riscof/Makefile

@@ -1,14 +1,40 @@
-run:
-	riscof run --config=config.ini --suite=riscv-arch-test/riscv-test-suite/ --env=riscv-arch-test/riscv-test-suite/env --no-browser
+SUITE    ?= riscv-arch-test/riscv-test-suite
+ENV      ?= riscv-arch-test/riscv-test-suite/env
+CONFIG   ?= config.ini
+WORK_DIR ?= riscof_work
+DB_DIR   ?= riscof_db
 
-run-dut:
-	riscof run --config=config.ini --suite=riscv-arch-test/riscv-test-suite/ --env=riscv-arch-test/riscv-test-suite/env --no-ref-run
+ARGS = --suite $(SUITE) --env $(ENV) --config $(CONFIG) --work-dir $(WORK_DIR)
 
-run-ref:
-	riscof run --config=config.ini --suite=riscv-arch-test/riscv-test-suite/ --env=riscv-arch-test/riscv-test-suite/env --no-dut-run
+RUN_DEPS = clean-work $(WORK_DIR)/test_list.yaml
+
+RUN_ARGS = $(ARGS) --testfile $(WORK_DIR)/test_list.yaml --no-clean
+
+.PHONY: run run-dut run-ref validate clean clean-work
+
+run: $(RUN_DEPS)
+	riscof run $(RUN_ARGS) --no-browser
+
+run-dut: $(RUN_DEPS)
+	riscof run $(RUN_ARGS) --no-ref-run
+
+run-ref: $(RUN_DEPS)
+	riscof run $(RUN_ARGS) --no-dut-run
 
 validate:
-	riscof validateyaml --config=config.ini
+	riscof validateyaml --work-dir $(WORK_DIR) --config $(CONFIG)
+
+clean: clean-work
+	rm -rf $(DB_DIR)
+
+clean-work:
+	rm -rf $(WORK_DIR)
+
+$(WORK_DIR)/test_list.yaml: $(DB_DIR)/test_list.yaml
+	mkdir -p $(WORK_DIR)
+	cp -r $(DB_DIR)/* $(WORK_DIR)
 
-testlist:
-	riscof testlist --config=config.ini --suite=riscv-arch-test/riscv-test-suite/ --env=riscv-arch-test/riscv-test-suite/env
+$(DB_DIR)/test_list.yaml: mlogv32/mlogv32_isa.yaml mlogv32/mlogv32_platform.yaml $(CONFIG)
+	rm -rf $(DB_DIR)
+	riscof testlist $(ARGS)
+	mv $(WORK_DIR) $(DB_DIR)

riscof/config.ini

@@ -9,9 +9,11 @@ pluginpath=./mlogv32
 ispec=./mlogv32/mlogv32_isa.yaml
 pspec=./mlogv32/mlogv32_platform.yaml
 target_run=1
+jobs=8
 # change these when running the tests on another computer (FIXME: hack)
 host_repo_path=/Users/object/Git/mlogv32
 riscof_repo_path=/workspaces/mlogv32
 
 [sail_cSim]
 pluginpath=./sail_cSim
+jobs=8

riscof/mlogv32/env/model_test.h

@@ -1,5 +1,8 @@
 #ifndef _COMPLIANCE_MODEL_H
 #define _COMPLIANCE_MODEL_H
+
+#define ALIGNMENT 2
+
 #define RVMODEL_DATA_SECTION \
         .align 8; .global begin_regstate; begin_regstate:               \
         .word 128;                                                      \
@@ -69,12 +72,12 @@ mlogv32_bss_done: \
 //RV_COMPLIANCE_DATA_BEGIN
 #define RVMODEL_DATA_BEGIN                                              \
   RVMODEL_DATA_SECTION                                                        \
-  .align 4;\
+  .align ALIGNMENT;\
   .global begin_signature; begin_signature:
 
 //RV_COMPLIANCE_DATA_END
 #define RVMODEL_DATA_END                                                      \
-  .align 4;\
+  .align ALIGNMENT;\
   .global end_signature; end_signature:  
 
 //RVTEST_IO_INIT