From 10b6ff39a820b1aff272ddd046e42004cf13201a Mon Sep 17 00:00:00 2001 From: slmnemo Date: Tue, 21 Jun 2022 16:10:18 -0700 Subject: [PATCH] changed order of makefiles and fixed warnings when running makes --- pipelined/regression/Makefile | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/pipelined/regression/Makefile b/pipelined/regression/Makefile index 5cf4d408..5ad72172 100644 --- a/pipelined/regression/Makefile +++ b/pipelined/regression/Makefile @@ -1,24 +1,9 @@ -make allclean: - make clean - make all - -make clean: - make clean -C ../../tests/riscof - make clean -C ../../tests/wally-riscv-arch-test -# make allclean -C ../../tests/imperas-riscv-tests - -make all: - make archtests - make wallytests - make memfiles +all: archtests wallytests memfiles # *** Build old tests/imperas-riscv-tests for now; # Delete this part when the privileged tests transition over to tests/wally-riscv-arch-test # DH: 2/27/22 temporarily commented out imperas-riscv-tests because license expired #make -C ../../tests/imperas-riscv-tests --jobs #make -C ../../tests/imperas-riscv-tests XLEN=64 --jobs - - - # Only compile Imperas tests if they are installed locally. # They are usually a symlink to $RISCV/imperas-riscv-tests and only # get compiled there manually during installation @@ -30,15 +15,22 @@ make all: # Link Linux test vectors (fix this later***) #cd ../../tests/linux-testgen/linux-testvectors/;./tvLinker.sh -make archtests: +allclean: clean all + +clean: + make clean -C ../../tests/riscof + make clean -C ../../tests/wally-riscv-arch-test +# make allclean -C ../../tests/imperas-riscv-tests + +archtests: # Build riscv-arch-test 64 and 32-bit versions make -C ../../tests/riscof/ --jobs make -C ../../tests/riscof/ XLEN=32 --jobs -make wallytests: +wallytests: # Build wally-riscv-arch-test make -C ../../tests/wally-riscv-arch-test/ --jobs make -C ../../tests/wally-riscv-arch-test/ XLEN=32 --jobs -make memfiles: +memfiles: make -f makefile-memfile wally-sim-files --jobs