ACT4: add Spike support and cvw-rv32gch/rv64gch configs by TnnsBeast · Pull Request #1048 · riscv/riscv-arch-test

TnnsBeast · 2026-03-07T02:43:55Z

Enable Spike support for self checking usage in H tests, and create new cvw core configs with H enabled.

Notes

As recommended by Prof. Harris, generating ref_model_args from UDB extension list is not included and is saved as a TODO for later
This PR does not include h test generators. This will be included in a separate PR.

Copilot

Pull request overview

This PR adds Spike reference model support to the ACT4 framework and introduces two new Core-V Wally configurations (cvw-rv32gch and cvw-rv64gch) with the H (hypervisor) extension enabled. The framework changes generalize the Makefile generation to work with multiple reference models instead of being Sail-specific.

Changes:

Added SPIKE as a reference model type in RefModelType enum with corresponding signature and debug flags, plus a new ref_model_args config field
Refactored makefile_gen.py to make ref model invocation generic (moved Sail-specific config handling into conditional branches, added caching for generated Sail configs)
Added complete config directories for cvw-rv32gch and cvw-rv64gch (test_config, UDB YAML, sail.json, linker script, rvmodel_macros, rvtest_config files) and excluded H extension from QEMU regression

Reviewed changes

Copilot reviewed 17 out of 17 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
framework/src/act/config.py	Added `SPIKE` enum member, `debug_flags()` method, and `ref_model_args` field
framework/src/act/makefile_gen.py	Generalized ref model handling in Makefile generation; moved Sail config generation inline; added caching
config/cores/cvw/cvw-rv64gch/*	New 64-bit CVW config with H extension, using Spike
config/cores/cvw/cvw-rv32gch/*	New 32-bit CVW config with H extension, using Spike
.github/workflows/regress.yml	Excluded H extension from QEMU regression tests

framework/src/act/config.py

config/cores/cvw/cvw-rv64gch/rvmodel_macros.h

config/cores/cvw/cvw-rv32gch/rvmodel_macros.h

config/cores/cvw/cvw-rv64gch/sail.json

config/cores/cvw/cvw-rv32gch/sail.json

framework/src/act/makefile_gen.py

davidharrishmc

Minor comments. Ready to go when @jordancarlin approves.

config/cores/cvw/cvw-rv32gch/rvmodel_macros.h

config/cores/cvw/cvw-rv32gch/rvtest_config.h

config/cores/cvw/cvw-rv32gch/rvtest_config.svh

…hash

…s for rvmodel_macros.h to ensure they don't fall out of date

jordancarlin

The common test compilation logic seems like it is broken for Spike. If you have a config using Spike as the reference model with rv32imc and another with rv32imfdc it would compile all of the tests separately even though it should be possible to reuse the I, M, and C tests for both of them.

jordancarlin · 2026-03-10T05:53:52Z

.github/workflows/regress.yml

          FAST=True \
          EXTENSIONS= \
-          EXCLUDE_EXTENSIONS=Sm,ExceptionsZc,S,Zalrsc,Zacas,ZacasZabha \
+          EXCLUDE_EXTENSIONS=Sm,ExceptionsZc,S,Zalrsc,Zacas,ZacasZabha,H \


There are no H tests being generated. Is this necessary?

jordancarlin · 2026-03-10T05:55:00Z

config/cores/cvw/cvw-rv32gch/cvw-rv32gch.yaml

+  # - { name: Svade, version: "= 1.0.0" }
+  # - { name: Svadu, version: "= 1.0.0" } # TODO: Re-enable when https://github.com/riscv/riscv-unified-db/issues/1217 is fixed


This seems to be based on an old UDB config. These extensions both work now and are enabled in the other CVW configs. Please update this to match the other CVW configs and just add H (and any other params/extensions) on top of it.

jordancarlin · 2026-03-10T05:55:24Z

config/cores/cvw/cvw-rv32gch/link.ld

This is an old version of the linker script. Please update to match what is currently used by other CVW configs.

jordancarlin · 2026-03-10T05:57:50Z

framework/src/act/config.py

+        """Get the debug/trace flags for this reference model."""
+        flags_map = {
+            RefModelType.SAIL: "--trace-all --trace-output {sig_trace_file}",
+            RefModelType.SPIKE: "-l --log={sig_trace_file}",


Might be nice to add the --log-commits flag to this. It prints out all register and memory updates in Spike and is useful for debugging.

jordancarlin · 2026-03-10T05:59:31Z

framework/src/act/makefile_gen.py


+    # Hash reference model settings that affect signature generation command lines
+    hasher.update(config.ref_model_type.value.encode())
+    hasher.update((config.ref_model_args or "").encode())


Suggested change

hasher.update((config.ref_model_args or "").encode())

if config.ref_model_args is not None:

hasher.update((config.ref_model_args).encode())

jordancarlin · 2026-03-10T06:08:33Z

framework/src/act/makefile_gen.py

    xlen: int,
    config: Config,
-    sail_config_path: Path,
+    common_e_ext: bool | None = None,


bool | None is a strange type and I am having trouble following the logic around this. It seem like right now it is overloaded such that None means it is not a common test, true means it is a common test with E, and false means it is a common test without E. What about instead passing in config_flag or something and for sail common tests it can pass the generated sail config, for sail not common tests it can pass the DUT sail config, and for spike tests it can pass the spike ISA string?

jordancarlin · 2026-03-10T06:09:30Z

framework/src/act/makefile_gen.py

    flen = test_metadata.flen
    test_path = test_metadata.test_path
    ref_model_sig_flags = config.ref_model_type.signature_flags.format(sig_file=sig_file, granularity=int(xlen / 8))
+    ref_model_args_line = f"\t\t{config.ref_model_args} \\\n" if config.ref_model_args else ""


Seems like we should combine (and rename) ref_model_args and ref_model_config. Right now one is used to configure Spike and the other is used to configure Sail. No need for them to be separate.

ACT4: add Spike support and cvw rv32gch/rv64gch configs

4d907a0

Copilot AI review requested due to automatic review settings March 7, 2026 02:43

Copilot started reviewing on behalf of TnnsBeast March 7, 2026 02:44 View session

Copilot AI reviewed Mar 7, 2026

View reviewed changes

CVW gch: fix interrupt macro signatures

9401c9d

davidharrishmc requested changes Mar 10, 2026

View reviewed changes

config/cores/cvw/cvw-rv32gch/rvmodel_macros.h Outdated Show resolved Hide resolved

config/cores/cvw/cvw-rv32gch/rvtest_config.h Show resolved Hide resolved

config/cores/cvw/cvw-rv32gch/rvtest_config.svh Show resolved Hide resolved

davidharrishmc requested a review from jordancarlin March 10, 2026 04:59

TnnsBeast added 2 commits March 9, 2026 22:04

Implement copilot suggestions for debug_flags and using ref_model in …

bfe6f51

…hash

Add H_SUPPORTED to rvtest_config.h and rvtest_config.svh, use symlink…

fc2d6b7

…s for rvmodel_macros.h to ensure they don't fall out of date

jordancarlin requested changes Mar 10, 2026

View reviewed changes

		# - { name: Svade, version: "= 1.0.0" }
		# - { name: Svadu, version: "= 1.0.0" } # TODO: Re-enable when https://github.com/riscv/riscv-unified-db/issues/1217 is fixed

	hasher.update((config.ref_model_args or "").encode())
	if config.ref_model_args is not None:
	hasher.update((config.ref_model_args).encode())

Conversation

TnnsBeast commented Mar 7, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

davidharrishmc left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jordancarlin left a comment

Choose a reason for hiding this comment

Uh oh!

jordancarlin Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

jordancarlin Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

jordancarlin Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

jordancarlin Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

jordancarlin Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

jordancarlin Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

jordancarlin Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants