From ca5e8a234fb8f591a5c091f6538557e4de1cc12e Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 1 Nov 2024 19:57:06 -0400
Subject: [PATCH] Configure.cmake: improve and unify RISC-V vector extension
 checks

To test for the RISC-V vector extension (RVV), we currently run two
small programs -- one for each value of LMUL=1,2 -- that use some
vector intrinsics from the v0.11.x draft of the intrinsics spec. The
library itself however needs newer intrinsics than the ones that we
test for. This can lead to a problem because GCC 13 supports the
intrinsics that we test for, but not (all of) the ones we intend to
use. In short, the build can fail with GCC 13:

  https://github.com/shibatch/sleef/issues/579

This commit changes the detection mechanism. Instead of compiling a
program that makes use of the intrinsics, we now just check the two
values, __riscv_v and __riscv_v_intrinsic, to ensure that we have
version 1.0 of the vector extension and version 0.12 of the
intrinsics. These should be the stable versions of each.

Note: the "m1" and "m2" checks are now identical because they are both
covered by the official spec.

Fixes #579
---
 Configure.cmake | 40 ++++++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/Configure.cmake b/Configure.cmake
index 7a33cb93..b2584ee3 100644
--- a/Configure.cmake
+++ b/Configure.cmake
@@ -659,9 +659,23 @@ option(SLEEF_ENFORCE_RVVM1 "Build fails if RVVM1 is not supported by the compile
 if(SLEEF_ARCH_RISCV64 AND NOT SLEEF_DISABLE_RVVM1)
   string (REPLACE ";" " " CMAKE_REQUIRED_FLAGS "${FLAGS_ENABLE_RVVM1}")
   CHECK_C_SOURCE_COMPILES("
-  #include <riscv_vector.h>
-  int main() {
-    vint32m1_t r = __riscv_vmv_v_x_i32m1(1, __riscv_vlenb() * 8 / 32); }"
+  #ifdef __riscv_v
+  #if __riscv_v < 1000000
+  #error \"RVV version 1.0 not supported\"
+  #endif
+  #else
+  #error \"RVV not supported\"
+  #endif
+
+  #ifdef __riscv_v_intrinsic
+  #if __riscv_v_intrinsic < 12000
+  #error \"RVV instrinsics version 0.12 not supported\"
+  #endif
+  #else
+  #error \"RVV intrinsics not supported\"
+  #endif
+
+  int main(void) { return 0; }"
     COMPILER_SUPPORTS_RVVM1)
 
   if(COMPILER_SUPPORTS_RVVM1)
@@ -681,9 +695,23 @@ option(SLEEF_ENFORCE_RVVM2 "Build fails if RVVM2 is not supported by the compile
 if(SLEEF_ARCH_RISCV64 AND NOT SLEEF_DISABLE_RVVM2)
   string (REPLACE ";" " " CMAKE_REQUIRED_FLAGS "${FLAGS_ENABLE_RVVM2}")
   CHECK_C_SOURCE_COMPILES("
-  #include <riscv_vector.h>
-  int main() {
-    vint32m2_t r = __riscv_vmv_v_x_i32m2(1, 2 * __riscv_vlenb() * 8 / 32); }"
+  #ifdef __riscv_v
+  #if __riscv_v < 1000000
+  #error \"RVV version 1.0 not supported\"
+  #endif
+  #else
+  #error \"RVV not supported\"
+  #endif
+
+  #ifdef __riscv_v_intrinsic
+  #if __riscv_v_intrinsic < 12000
+  #error \"RVV instrinsics version 0.12 not supported\"
+  #endif
+  #else
+  #error \"RVV intrinsics not supported\"
+  #endif
+
+  int main(void) { return 0; }"
     COMPILER_SUPPORTS_RVVM2)
 
   if(COMPILER_SUPPORTS_RVVM2)