diff --git a/pipelined/regression/Makefile b/pipelined/regression/Makefile index 0176b7ec..302ee4a9 100644 --- a/pipelined/regression/Makefile +++ b/pipelined/regression/Makefile @@ -5,7 +5,7 @@ make allclean: make clean: make clean -C ../../addins/riscv-arch-test make clean -C ../../tests/wally-riscv-arch-test - make allclean -C ../../tests/imperas-riscv-tests +# make allclean -C ../../tests/imperas-riscv-tests make all: # *** Build old tests/imperas-riscv-tests for now; diff --git a/pipelined/regression/makefile-memfile b/pipelined/regression/makefile-memfile index 030cf8d5..33af1953 100644 --- a/pipelined/regression/makefile-memfile +++ b/pipelined/regression/makefile-memfile @@ -2,8 +2,10 @@ ROOT := ../.. SUFFIX := work ARCHDIR := $(ROOT)/addins/riscv-arch-test WALLYDIR:= $(ROOT)/tests/wally-riscv-arch-test +# IMPERASDIR := $(ROOT)/tests/imperas-riscv-tests +# ALLDIRS := $(ARCHDIR)/$(SUFFIX) $(WALLYDIR)/$(SUFFIX) $(IMPERASDIR)/$(SUFFIX) IMPERASDIR := $(ROOT)/tests/imperas-riscv-tests -ALLDIRS := $(ARCHDIR)/$(SUFFIX) $(WALLYDIR)/$(SUFFIX) $(IMPERASDIR)/$(SUFFIX) +ALLDIRS := $(ARCHDIR)/$(SUFFIX) $(WALLYDIR)/$(SUFFIX) ELFFILES ?= $(shell find $(ALLDIRS) -type f -regex ".*\.elf") MEMFILES ?= $(ELFFILES:.elf=.elf.memfile) diff --git a/pipelined/src/fma/fma.do b/pipelined/src/fma/fma.do index 001ae973..9a7de126 100644 --- a/pipelined/src/fma/fma.do +++ b/pipelined/src/fma/fma.do @@ -8,7 +8,7 @@ onbreak {resume} # create library vlib worklib -vlog -lint -work worklib fma16.sv testbench.sv +vlog -lint -work worklib fma16.sv testbench.v vopt +acc worklib.testbench_fma16 -work worklib -o testbenchopt vsim -lib worklib testbenchopt diff --git a/pipelined/src/fma/testbench.sv b/pipelined/src/fma/testbench.v similarity index 100% rename from pipelined/src/fma/testbench.sv rename to pipelined/src/fma/testbench.v