diff --git a/addins/riscv-arch-test b/addins/riscv-arch-test index 8a52b016d..8a0cdceca 160000 --- a/addins/riscv-arch-test +++ b/addins/riscv-arch-test @@ -1 +1 @@ -Subproject commit 8a52b016dbe1e2733cc168b9d6e5c93e39059d4d +Subproject commit 8a0cdceca9f0b91b81905eb8497f6586bf8d1c6b diff --git a/benchmarks/coremark/Makefile b/benchmarks/coremark/Makefile index a73dc6eea..9ac905950 100644 --- a/benchmarks/coremark/Makefile +++ b/benchmarks/coremark/Makefile @@ -28,7 +28,8 @@ PORT_CFLAGS = -g -mabi=$(ABI) -march=$(ARCH) -static -falign-functions=16 \ all: $(work_dir)/coremark.bare.riscv.elf.memfile run: - (cd ../../sim && (time vsim -c -do "do wally-batch.do rv$(XLEN)gc coremark" 2>&1 | tee $(work_dir)/coremark.sim.log)) + time wsim rv$(XLEN)gc coremark 2>&1 | tee $(work_dir)/coremark.sim.log + #(cd ../../sim && (time vsim -c -do "do wally-batch.do rv$(XLEN)gc coremark" 2>&1 | tee $(work_dir)/coremark.sim.log)) $(work_dir)/coremark.bare.riscv.elf.memfile: $(work_dir)/coremark.bare.riscv riscv64-unknown-elf-objdump -D $< > $<.elf.objdump diff --git a/benchmarks/coremark/coremark_sweep.py b/benchmarks/coremark/coremark_sweep.py index 82a596604..045121a46 100755 --- a/benchmarks/coremark/coremark_sweep.py +++ b/benchmarks/coremark/coremark_sweep.py @@ -73,6 +73,7 @@ with open('coremark_results.csv', mode='w', newline='') as csvfile: os.system(make_all) make_run = f"make run XLEN={xlen_value} ARCH={arch}" + print("Running: " + make_run) output = os.popen(make_run).read() # Capture the output of the command # Extract the Coremark values using regular expressions diff --git a/bin/regression-wally b/bin/regression-wally index 4236afc9a..c161a9340 100755 --- a/bin/regression-wally +++ b/bin/regression-wally @@ -306,7 +306,7 @@ if (testfloat): tc = TestCase( name=test, variant=config, - cmd="wsim --tb testbench_fp --sim questa " + config + " " + test, + cmd="wsim --tb testbench_fp " + config + " " + test, grepstr="All Tests completed with 0 errors") configs.append(tc)