From 14b630a403f3500952a7df3eb73814cf7d92bfbe Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sat, 28 Sep 2024 20:56:58 -0700
Subject: [PATCH] More testfloat fixups

---
 .gitignore                                      | 3 ++-
 tests/fp/Makefile                               | 7 ++++---
 tests/fp/{testfloat => berkeley-float}/Makefile | 0
 tests/fp/vectors/ieee/Makefile                  | 4 ++--
 tests/fp/vectors/riscv/Makefile                 | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)
 rename tests/fp/{testfloat => berkeley-float}/Makefile (100%)

diff --git a/.gitignore b/.gitignore
index bd3235578..4757d62cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,8 @@ tests/riscof/riscof_work/
 tests/wally-riscv-arch-test/riscv-test-suite/*/I/*/**
 tests/fp/vectors/**/*.tv
 tests/fp/vectors/**/sed*
-tests/fp/testfloat/*
+tests/fp/berkeley-float/*
+!tests/fp/berkeley-float/Makefile
 tests/fp/combined_IF_vectors/IF_vectors/*.tv
 tests/custom/*/*/
 tests/custom/*/*/*.memfile
diff --git a/tests/fp/Makefile b/tests/fp/Makefile
index 25057f490..d6359f249 100755
--- a/tests/fp/Makefile
+++ b/tests/fp/Makefile
@@ -2,7 +2,8 @@
 # Floating Point Tests Makefile for CORE-V-Wally
 # SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
 
-TESTFLOATS := testfloat/ieee/testfloat_gen testfloat/riscv/testfloat_gen
+TESTFLOAT := testfloat/build/Linux-x86_64-GCC/testfloat_gen
+TESTFLOATS := berkeley-float/ieee/${TESTFLOAT} berkeley-float/riscv/${TESTFLOAT}
 
 .PHONY: all vectors combined_IF_vectors testfloat clean
 
@@ -18,11 +19,11 @@ combined_IF_vectors: ${WALLY}/tests/riscof/work/riscv-arch-test/rv32i_m/M/src ve
 ${TESTFLOATS}: testfloat
 
 testfloat:
-	$(MAKE) -C testfloat
+	$(MAKE) -C berkeley-float
 
 clean:
 	$(MAKE) -C vectors clean
-	$(MAKE) -C testfloat clean
+	$(MAKE) -C berkeley-float clean
 	rm -f ${WALLY}/tests/fp/combined_IF_vectors/IF_vectors/*.tv
 
 ${WALLY}/tests/riscof/work/riscv-arch-test/rv32i_m/M/src:
diff --git a/tests/fp/testfloat/Makefile b/tests/fp/berkeley-float/Makefile
similarity index 100%
rename from tests/fp/testfloat/Makefile
rename to tests/fp/berkeley-float/Makefile
diff --git a/tests/fp/vectors/ieee/Makefile b/tests/fp/vectors/ieee/Makefile
index 1a37321d3..a44f54d5d 100755
--- a/tests/fp/vectors/ieee/Makefile
+++ b/tests/fp/vectors/ieee/Makefile
@@ -10,8 +10,8 @@
 SHELL := /bin/bash
 
 VECTOR_TYPE := ieee
-TESTFLOAT_DIR := ${WALLY}/tests/fp/testfloat
-TESTFLOAT_GEN := ${TESTFLOAT_DIR}/${VECTOR_TYPE}/testfloat_gen
+TESTFLOAT_DIR := ../../berkeley-float
+TESTFLOAT_GEN := ${TESTFLOAT_DIR}/${VECTOR_TYPE}/testfloat/build/Linux-x86_64-GCC/testfloat_gen
 
 # List of testvectors to generate. Each rounding mode will be generated for each test.
 cvtint := ui32_to_f16 ui32_to_f32 ui32_to_f64 ui32_to_f128 \
diff --git a/tests/fp/vectors/riscv/Makefile b/tests/fp/vectors/riscv/Makefile
index 91615a349..d3ed6d9a7 100755
--- a/tests/fp/vectors/riscv/Makefile
+++ b/tests/fp/vectors/riscv/Makefile
@@ -10,8 +10,8 @@
 SHELL := /bin/bash
 
 VECTOR_TYPE := riscv
-TESTFLOAT_DIR := ${WALLY}/tests/fp/testfloat
-TESTFLOAT_GEN := ${TESTFLOAT_DIR}/${VECTOR_TYPE}/testfloat_gen
+TESTFLOAT_DIR := ../../berkeley-float
+TESTFLOAT_GEN := ${TESTFLOAT_DIR}/${VECTOR_TYPE}/testfloat/build/Linux-x86_64-GCC/testfloat_gen
 
 # List of testvectors to generate. Each rounding mode will be generated for each test.
 cvtint := ui32_to_f16 ui32_to_f32 ui32_to_f64 ui32_to_f128 \