From aa1a86c70e1379c1da5ed1613f5ab6828194afa1 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Thu, 19 Sep 2024 15:34:16 -0700
Subject: [PATCH] More testfloat Makefile refactoring and fix using the wrong
 softfloat

---
 tests/fp/testfloat/Makefile | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/tests/fp/testfloat/Makefile b/tests/fp/testfloat/Makefile
index f281cbbeb..0cd9805ed 100755
--- a/tests/fp/testfloat/Makefile
+++ b/tests/fp/testfloat/Makefile
@@ -6,24 +6,25 @@
 
 # Disable parallel execution because both versions of softfloat/testfloat use the same build directory
 .NOTPARALLEL:
+.SECONDEXPANSION:
 
-TESTFLOATS := ieee-testfloat riscv-testfloat
-SOFTFLOAT_BUILD_DIR := ${WALLY}/addins/berkeley-softfloat-3/build/Linux-x86_64-GCC
-TESTFLOAT_BUILD_DIR := ${WALLY}/addins/berkeley-testfloat-3/build/Linux-x86_64-GCC
-TESTFLOAT_EXECUTABLES := ${TESTFLOAT_BUILD_DIR}/testfloat ${TESTFLOAT_BUILD_DIR}/testfloat_gen \
-                         ${TESTFLOAT_BUILD_DIR}/testfloat_ver ${TESTFLOAT_BUILD_DIR}/testsoftfloat \
-												 ${TESTFLOAT_BUILD_DIR}/timesoftfloat
+TESTFLOATS := ieee riscv
+SOFTFLOAT_BUILD_DIR := ${WALLY}/addins/berkeley-softfloat-3/build/Linux-x86_64-GCC/
+TESTFLOAT_BUILD_DIR := ${WALLY}/addins/berkeley-testfloat-3/build/Linux-x86_64-GCC/
+TESTFLOAT_EXECUTABLES := testfloat testfloat_gen testfloat_ver testsoftfloat timesoftfloat
+ORIGINAL_TESTFLOAT_EXECUTABLES := $(foreach item,${TESTFLOAT_EXECUTABLES},$(patsubst %,${TESTFLOAT_BUILD_DIR}%,${item}))
 
-.PHONY: all ieee-softfloat riscv-softfloat clean
+.PHONY: all ieee-softfloat riscv-softfloat ${TESTFLOATS} testfloat clean
 
-all: $(TESTFLOATS)
+all: riscv ieee
 
-%-testfloat:
-	$(MAKE) -C $(TESTFLOAT_BUILD_DIR) clean
+${TESTFLOATS}: dir_$$@ $$@/testfloat_gen
+
+.PRECIOUS: %/testfloat_gen
+%/testfloat_gen:
 	$(MAKE) $*-softfloat
-	$(MAKE) -C ${TESTFLOAT_BUILD_DIR}
-	mkdir -p $*
-	cp -r ${TESTFLOAT_EXECUTABLES} $*/
+	$(MAKE) testfloat
+	cp -r ${ORIGINAL_TESTFLOAT_EXECUTABLES} $*/
 
 ieee-softfloat:
 	$(MAKE) -C $(SOFTFLOAT_BUILD_DIR) clean
@@ -33,6 +34,13 @@ riscv-softfloat:
 	$(MAKE) -C $(SOFTFLOAT_BUILD_DIR) clean
 	$(MAKE) SPECIALIZE_TYPE=RISCV -C $(SOFTFLOAT_BUILD_DIR)
 
+testfloat:
+	$(MAKE) -C $(TESTFLOAT_BUILD_DIR) clean
+	$(MAKE) -C $(TESTFLOAT_BUILD_DIR)
+
+dir_%:
+	mkdir -p $*
+
 clean:
 	$(MAKE) -C $(SOFTFLOAT_BUILD_DIR) clean
 	$(MAKE) -C $(TESTFLOAT_BUILD_DIR) clean