From 09a24f7240aa3544e95628d23d5e6027cef8cc55 Mon Sep 17 00:00:00 2001
From: David Harris <david_harris@hmc.edu>
Date: Tue, 21 Dec 2021 05:10:14 +0000
Subject: [PATCH] Improving Wally installation makefile

---
 Makefile | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index d715d72d..35da3a5e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,23 @@
-make all:
-# move these parts into compiling archtest separtately
-#	cp -r addins/riscv-isa-sim/arch_test_target/spike/device/rv32i_m/I addins/riscv-isa-sim/arch_test_target/spike/device/rv32i_m/F
-#	cp -r addins/riscv-isa-sim/arch_test_target/spike/device/rv64i_m/I addins/riscv-isa-sim/arch_test_target/spike/device/rv64i_m/D
-#	sed -i 's/--isa=rv32i /--isa=32if/' addins/riscv-isa-sim/arch_test_target/spike/device/rv32i_m/F/Makefile.include
-#	sed -i 's/--isa=rv64i /--isa=64id/' addins/riscv-isa-sim/arch_test_target/spike/device/rv64i_m/D/Makefile.include
-#	if [ -d "addins/riscv-isa-sim/build" ]; then echo "Build exists"; else mkdir addins/riscv-isa-sim/build; fi
-#	cd addins/riscv-isa-sim/build; ../configure --prefix=/cad/riscv/gcc/bin
-#	make -C addins/riscv-isa-sim/build
-#	sudo make install -C addins/riscv-isa-sim/build
-#	cp addins/riscv-isa-sim/arch_test_target/spike/Makefile.include addins/riscv-arch-test/
-# update with path including $RISCV_TOOLS
-# separate into make tests and make regression
-    cp $RISCV/riscv-isa-sim/arch_test_target/spike/Makefile.include addins/riscv-arch-test/
-	sed -i '/export TARGETDIR ?=/c\export TARGETDIR ?= $RISCV/riscv-isa-sim/arch_test_target' tests/wally-riscv-arch-test/Makefile.include
-	echo export RISCV_PREFIX = riscv64-unknown-elf- >> tests/wally-riscv-arch-test/Makefile.include
+all:
+	install
+	compile
+	regression
+
+# install copies over the Makefile.include from riscv-isa-sim
+# And corrects the TARGETDIR path and the RISCV_PREFIXZ
+
+install:
+	cp ${RISCV}/riscv-isa-sim/arch_test_target/spike/Makefile.include addins/riscv-arch-test/
+	sed -i '/export TARGETDIR ?=/c\export TARGETDIR ?= ${RISCV}/riscv-isa-sim/arch_test_target' addins/riscv-arch-test/Makefile.include
+	echo export RISCV_PREFIX = riscv64-unknown-elf- >> addins/riscv-arch-test/Makefile.include
+
+compile:
 	make -C addins/riscv-arch-test
 	make -C addins/riscv-arch-test XLEN=32
 	cd tests/wally-riscv-arch-test; exe2memfile.pl work/*/*/*.elf
+
+regression:
 	make -C wally-pipelined/regression
-