Basic rvv consistency fixes for inline headers

Author: Simon Hosie

.github/workflows/build_and_test.yml

@@ -225,8 +225,6 @@ jobs:
             EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS} -DSLEEF_DISABLE_VXE2=ON"
           elif [[ ${{ matrix.arch }} = "riscv64" ]]; then
             EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS} -DSLEEF_ENFORCE_RVVM1=ON -DSLEEF_ENFORCE_RVVM2=ON"
-            # Disable inline headers, they just don't compile on riscv64
-            EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS} -DSLEEF_BUILD_INLINE_HEADERS=OFF"
           fi
 
           cmake -S . -B _build-${{ matrix.arch }} -GNinja \

src/libm-tester/iutsimd.c

@@ -57,6 +57,10 @@
 #include <arm_sve.h>
 #endif
 
+#if defined(__riscv) && defined(__riscv_v)
+#include <riscv_vector.h>
+#endif
+
 #if defined(__VSX__)
 #include <altivec.h>
 #endif
@@ -344,27 +348,35 @@ typedef Sleef_SLEEF_VECTOR_FLOAT_2 vfloat2;
 #endif
 
 #ifdef ENABLE_RVVM1
+#include "renamervvm1.h"
+#if !defined(USE_INLINE_HEADER)
 #define CONFIG 1
 #include "helperrvv.h"
-#include "renamervvm1.h"
+#endif
 #endif
 
 #ifdef ENABLE_RVVM1NOFMA
+#include "renamervvm1nofma.h"
+#if !defined(USE_INLINE_HEADER)
 #define CONFIG 2
 #include "helperrvv.h"
-#include "renamervvm1nofma.h"
+#endif
 #endif
 
 #ifdef ENABLE_RVVM2
+#include "renamervvm2.h"
+#if !defined(USE_INLINE_HEADER)
 #define CONFIG 1
 #include "helperrvv.h"
-#include "renamervvm2.h"
+#endif
 #endif
 
 #ifdef ENABLE_RVVM2NOFMA
+#include "renamervvm2nofma.h"
+#if !defined(USE_INLINE_HEADER)
 #define CONFIG 2
 #include "helperrvv.h"
-#include "renamervvm2nofma.h"
+#endif
 #endif
 
 #ifdef ENABLE_PUREC_SCALAR

src/libm/sleefsimddp.c

@@ -224,51 +224,35 @@ extern const double Sleef_rempitabdp[];
 // RISC-V
 #ifdef ENABLE_RVVM1
 #define CONFIG 1
-#if !defined(SLEEF_GENHEADER)
 #define ENABLE_RVV_DP
 #include "helperrvv.h"
-#else
-#include "macroonlyRVVM1.h"
-#endif
 #ifdef DORENAME
 #include "renamervvm1.h"
 #endif
 #endif
 
 #ifdef ENABLE_RVVM1NOFMA
 #define CONFIG 2
-#if !defined(SLEEF_GENHEADER)
 #define ENABLE_RVV_DP
 #include "helperrvv.h"
-#else
-#include "macroonlyRVVM1NOFMA.h"
-#endif
 #ifdef DORENAME
 #include "renamervvm1nofma.h"
 #endif
 #endif /* ENABLE_RVVM1NOFMA */
 
 #ifdef ENABLE_RVVM2
 #define CONFIG 1
-#if !defined(SLEEF_GENHEADER)
 #define ENABLE_RVV_DP
 #include "helperrvv.h"
-#else
-#include "macroonlyRVVM2.h"
-#endif
 #ifdef DORENAME
 #include "renamervvm2.h"
 #endif
 #endif
 
 #ifdef ENABLE_RVVM2NOFMA
 #define CONFIG 2
-#if !defined(SLEEF_GENHEADER)
 #define ENABLE_RVV_DP
 #include "helperrvv.h"
-#else
-#include "macroonlyRVVM2NOFMA.h"
-#endif
 #ifdef DORENAME
 #include "renamervvm2nofma.h"
 #endif

src/libm/sleefsimdsp.c

@@ -324,8 +324,8 @@ extern const float Sleef_rempitabsp[];
 // RISC-V
 #ifdef ENABLE_RVVM1
 #define CONFIG 1
-#if !defined(SLEEF_GENHEADER)
 #define ENABLE_RVV_SP
+#if !defined(SLEEF_GENHEADER)
 #include "helperrvv.h"
 #else
 #include "macroonlyRVVM1.h"
@@ -337,8 +337,8 @@ extern const float Sleef_rempitabsp[];
 
 #ifdef ENABLE_RVVM1NOFMA
 #define CONFIG 2
-#if !defined(SLEEF_GENHEADER)
 #define ENABLE_RVV_SP
+#if !defined(SLEEF_GENHEADER)
 #include "helperrvv.h"
 #else
 #include "macroonlyRVVM1NOFMA.h"
@@ -350,8 +350,8 @@ extern const float Sleef_rempitabsp[];
 
 #ifdef ENABLE_RVVM2
 #define CONFIG 1
-#if !defined(SLEEF_GENHEADER)
 #define ENABLE_RVV_SP
+#if !defined(SLEEF_GENHEADER)
 #include "helperrvv.h"
 #else
 #include "macroonlyRVVM2.h"
@@ -363,8 +363,8 @@ extern const float Sleef_rempitabsp[];
 
 #ifdef ENABLE_RVVM2NOFMA
 #define CONFIG 2
-#if !defined(SLEEF_GENHEADER)
 #define ENABLE_RVV_SP
+#if !defined(SLEEF_GENHEADER)
 #include "helperrvv.h"
 #else
 #include "macroonlyRVVM2NOFMA.h"

src/quad-tester/qiutsimd.c

@@ -60,6 +60,10 @@
 #include <arm_sve.h>
 #endif
 
+#if defined(__riscv) && defined(__riscv_v)
+#include <riscv_vector.h>
+#endif
+
 #if defined(__VSX__)
 #include <altivec.h>
 #endif