From d7edeef79a93e0b2107dada336144b542bc6fe67 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Fri, 20 Sep 2024 16:28:05 -0700
Subject: [PATCH] Update top level floating point test Makefile to build all
 vectors and testfloat binaries

---
 tests/fp/Makefile | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/tests/fp/Makefile b/tests/fp/Makefile
index 129bbd51d..25057f490 100755
--- a/tests/fp/Makefile
+++ b/tests/fp/Makefile
@@ -1,34 +1,29 @@
 # Jordan Carlin, jcarlin@hmc.edu, August 2024
-# Testfloat vector Makefile for CORE-V-Wally
+# Floating Point Tests Makefile for CORE-V-Wally
 # SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
 
-SOFTFLOAT_DIR := ${WALLY}/addins/berkeley-softfloat-3/build/Linux-x86_64-GCC
-TESTFLOAT_DIR := ${WALLY}/addins/berkeley-testfloat-3/build/Linux-x86_64-GCC
+TESTFLOATS := testfloat/ieee/testfloat_gen testfloat/riscv/testfloat_gen
 
-.PHONY: all softfloat testfloat vectors combined_IF_vectors clean
+.PHONY: all vectors combined_IF_vectors testfloat clean
 
 all: vectors combined_IF_vectors
 
-softfloat: ${SOFTFLOAT_DIR}/softfloat.a
-
-testfloat: ${TESTFLOAT_DIR}/testfloat
-
-vectors: testfloat
+vectors: ${TESTFLOATS}
 	$(MAKE) -C ${WALLY}/tests/fp/vectors
 
 combined_IF_vectors: ${WALLY}/tests/riscof/work/riscv-arch-test/rv32i_m/M/src vectors
 	cd ${WALLY}/tests/fp/combined_IF_vectors \
 	&& ./create_IF_vectors.sh
 
+${TESTFLOATS}: testfloat
+
+testfloat:
+	$(MAKE) -C testfloat
+
 clean:
-	$(MAKE) -C ${WALLY}/tests/fp/vectors clean
+	$(MAKE) -C vectors clean
+	$(MAKE) -C testfloat clean
 	rm -f ${WALLY}/tests/fp/combined_IF_vectors/IF_vectors/*.tv
 
-${SOFTFLOAT_DIR}/softfloat.a:
-	$(MAKE) -C ${SOFTFLOAT_DIR}
-
-${TESTFLOAT_DIR}/testfloat: ${SOFTFLOAT_DIR}/softfloat.a
-	$(MAKE) -C ${TESTFLOAT_DIR}
-
 ${WALLY}/tests/riscof/work/riscv-arch-test/rv32i_m/M/src:
 	@$(error "riscv-arch-tests must be generated first. Run make from $$WALLY")