From ef896181532343fda3d52f2a6328c6e0184b2d8e Mon Sep 17 00:00:00 2001
From: Francesco Biscani <bluescarni@gmail.com>
Date: Sun, 19 Nov 2023 15:20:42 +0100
Subject: [PATCH] Again test fixes.

---
 test/acosh.cpp | 8 +++-----
 test/asinh.cpp | 8 +++-----
 test/atan.cpp  | 8 +++-----
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/test/acosh.cpp b/test/acosh.cpp
index bf251deb3..d70ec1bb8 100644
--- a/test/acosh.cpp
+++ b/test/acosh.cpp
@@ -311,7 +311,9 @@ TEST_CASE("vfabi float")
     REQUIRE(outs[2] == approximately(std::acosh(1.3f)));
     REQUIRE(outs[3] == approximately(std::acosh(1.4f)));
 
-#if defined(HEYOKA_WITH_SLEEF)
+    // NOTE: autovec with external scalar functions seems to work
+    // only since LLVM 16.
+#if defined(HEYOKA_WITH_SLEEF) && LLVM_VERSION_MAJOR >= 16
 
     const auto &tf = detail::get_target_features();
 
@@ -334,15 +336,11 @@ TEST_CASE("vfabi float")
         REQUIRE(count == 5u);
     }
 
-#if LLVM_VERSION_MAJOR >= 16
-
     // NOTE: LLVM16 is currently the version tested in the CI on arm64.
     if (tf.aarch64) {
         REQUIRE(count == 5u);
     }
 
-#endif
-
     // NOTE: currently no auto-vectorization happens on ppc64 due apparently
     // to the way the target machine is being set up by orc/lljit (it works
     // fine with the opt tool). When this is resolved, we can test ppc64 too.
diff --git a/test/asinh.cpp b/test/asinh.cpp
index ac36badbe..f44bfe307 100644
--- a/test/asinh.cpp
+++ b/test/asinh.cpp
@@ -311,7 +311,9 @@ TEST_CASE("vfabi float")
     REQUIRE(outs[2] == approximately(std::asinh(1.3f)));
     REQUIRE(outs[3] == approximately(std::asinh(1.4f)));
 
-#if defined(HEYOKA_WITH_SLEEF)
+    // NOTE: autovec with external scalar functions seems to work
+    // only since LLVM 16.
+#if defined(HEYOKA_WITH_SLEEF) && LLVM_VERSION_MAJOR >= 16
 
     const auto &tf = detail::get_target_features();
 
@@ -334,15 +336,11 @@ TEST_CASE("vfabi float")
         REQUIRE(count == 5u);
     }
 
-#if LLVM_VERSION_MAJOR >= 16
-
     // NOTE: LLVM16 is currently the version tested in the CI on arm64.
     if (tf.aarch64) {
         REQUIRE(count == 5u);
     }
 
-#endif
-
     // NOTE: currently no auto-vectorization happens on ppc64 due apparently
     // to the way the target machine is being set up by orc/lljit (it works
     // fine with the opt tool). When this is resolved, we can test ppc64 too.
diff --git a/test/atan.cpp b/test/atan.cpp
index 32cf46117..6d69c7b20 100644
--- a/test/atan.cpp
+++ b/test/atan.cpp
@@ -305,7 +305,9 @@ TEST_CASE("vfabi float")
     REQUIRE(outs[2] == approximately(std::atan(.3f)));
     REQUIRE(outs[3] == approximately(std::atan(.4f)));
 
-#if defined(HEYOKA_WITH_SLEEF)
+    // NOTE: autovec with external scalar functions seems to work
+    // only since LLVM 16.
+#if defined(HEYOKA_WITH_SLEEF) && LLVM_VERSION_MAJOR >= 16
 
     const auto &tf = detail::get_target_features();
 
@@ -328,15 +330,11 @@ TEST_CASE("vfabi float")
         REQUIRE(count == 5u);
     }
 
-#if LLVM_VERSION_MAJOR >= 16
-
     // NOTE: LLVM16 is currently the version tested in the CI on arm64.
     if (tf.aarch64) {
         REQUIRE(count == 5u);
     }
 
-#endif
-
     // NOTE: currently no auto-vectorization happens on ppc64 due apparently
     // to the way the target machine is being set up by orc/lljit (it works
     // fine with the opt tool). When this is resolved, we can test ppc64 too.