From 685d47b64eb75807c952494d540d676712b2be3c Mon Sep 17 00:00:00 2001
From: Jackson Brough <jacksontbrough@gmail.com>
Date: Thu, 10 Oct 2024 19:57:13 -0600
Subject: [PATCH] Try switching to clang-18

---
 Makefile                            | 1 +
 infra/platforms-eval.sh             | 1 +
 infra/platforms/platforms/avx.py    | 2 +-
 infra/platforms/platforms/c.py      | 2 +-
 infra/platforms/platforms/fdlibm.py | 2 +-
 infra/platforms/platforms/vdt.py    | 2 +-
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index aefd5422f..f6cb71fe7 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ clean:
 	raco pkg remove --force --no-docs egg-herbie-linux && echo "Uninstalled old egg-herbie" || :
 	raco pkg remove --force --no-docs egg-herbie-windows && echo "Uninstalled old egg-herbie" || :
 	raco pkg remove --force --no-docs egg-herbie-osx && echo "Uninstalled old egg-herbie" || :
+	raco pkg remove --force --no-docs avx-herbie fdlimb-herbie vdt-herbie && echo "Uninstalled old avx-, fdlibm-, and vdt-herbie" || :
 
 update:
 	raco pkg install --skip-installed --no-docs --auto --name herbie src/
diff --git a/infra/platforms-eval.sh b/infra/platforms-eval.sh
index c38d5d59a..3674e4c1d 100644
--- a/infra/platforms-eval.sh
+++ b/infra/platforms-eval.sh
@@ -62,6 +62,7 @@ function run() {
 }
 
 # Run configs
+
 run $BENCH_DIR/hamming hamming $NUM_SEEDS
 run $BENCH_DIR/mathematics mathematics $NUM_SEEDS
 python3 $INFRA_DIR/platforms/cross-plot.py "$OUTDIR/platforms/output"
diff --git a/infra/platforms/platforms/avx.py b/infra/platforms/platforms/avx.py
index 9b1464d78..9d985d25a 100644
--- a/infra/platforms/platforms/avx.py
+++ b/infra/platforms/platforms/avx.py
@@ -12,7 +12,7 @@
 binary_ops = ['+', '-', '*', '/', 'fmax', 'fmin']
 ternary_ops = ['fma', 'fmsub', 'fnmadd', 'fnmsub']
 
-compiler = 'clang'
+compiler = 'clang-18'
 c_flags = ['-std=gnu11', '-ffp-contract=off', '-O2', '-mavx', '-mfma']
 ld_flags = ['-lm']
 driver_name = 'main.c'
diff --git a/infra/platforms/platforms/c.py b/infra/platforms/platforms/c.py
index cde6f6159..352d5ecff 100644
--- a/infra/platforms/platforms/c.py
+++ b/infra/platforms/platforms/c.py
@@ -15,7 +15,7 @@
 
 # C lang
 target_lang = 'c'
-compiler = 'clang'
+compiler = 'clang-18'
 c_flags = ['-std=gnu11', '-ffp-contract=off', '-O2']
 ld_flags = ['-lm']
 driver_name = 'main.c'
diff --git a/infra/platforms/platforms/fdlibm.py b/infra/platforms/platforms/fdlibm.py
index c542120de..ed92f63c3 100644
--- a/infra/platforms/platforms/fdlibm.py
+++ b/infra/platforms/platforms/fdlibm.py
@@ -130,7 +130,7 @@
 
 # C lang
 target_lang = 'c'
-compiler = 'clang'
+compiler = 'clang-18'
 c_flags = ['-std=gnu11', '-ffp-contract=off', '-O2']
 ld_flags = ['-lm']
 driver_name = 'main.c'
diff --git a/infra/platforms/platforms/vdt.py b/infra/platforms/platforms/vdt.py
index df25db932..b103365c9 100644
--- a/infra/platforms/platforms/vdt.py
+++ b/infra/platforms/platforms/vdt.py
@@ -15,7 +15,7 @@
 
 # C lang
 target_lang = 'c'
-compiler = 'clang++'
+compiler = 'clang-18++'
 c_flags = ['-O3','-ffp-contract=off']
 ld_flags = ['-lm']
 driver_name = 'main.cpp'