opencv
diff --git a/‎cmake/OpenCVCompilerOptimizations.cmake
Copy file name to clipboard
-5Lines changed: 0 additions & 5 deletions b/‎cmake/OpenCVCompilerOptimizations.cmake
Copy file name to clipboard
-5Lines changed: 0 additions & 5 deletions
diff --git a/‎cmake/checks/cpu_rvv.cpp
Copy file name to clipboard
+16-10Lines changed: 16 additions & 10 deletions b/‎cmake/checks/cpu_rvv.cpp
Copy file name to clipboard
+16-10Lines changed: 16 additions & 10 deletions
diff --git a/‎modules/core/include/opencv2/core/cv_cpu_dispatch.h
Copy file name to clipboard
+17-8Lines changed: 17 additions & 8 deletions b/‎modules/core/include/opencv2/core/cv_cpu_dispatch.h
Copy file name to clipboard
+17-8Lines changed: 17 additions & 8 deletions
diff --git a/‎modules/core/include/opencv2/core/hal/intrin.hpp
Copy file name to clipboard
-4Lines changed: 0 additions & 4 deletions b/‎modules/core/include/opencv2/core/hal/intrin.hpp
Copy file name to clipboard
-4Lines changed: 0 additions & 4 deletions
@@ -390,14 +390,9 @@ elseif(PPC64LE)
   set(CPU_BASELINE "VSX" CACHE STRING "${HELP_CPU_BASELINE}")
 
 elseif(RISCV)
-  option(RISCV_RVV_SCALABLE "Use scalable RVV API on RISC-V" ON)
-
   ocv_update(CPU_RVV_TEST_FILE "${OpenCV_SOURCE_DIR}/cmake/checks/cpu_rvv.cpp")
   ocv_update(CPU_KNOWN_OPTIMIZATIONS "RVV")
   ocv_update(CPU_RVV_FLAGS_ON "-march=rv64gcv")
-  if(RISCV_RVV_SCALABLE)
-    set(CPU_RVV_FLAGS_ON "${CPU_RVV_FLAGS_ON} -DCV_RVV_SCALABLE")
-  endif()
   ocv_update(CPU_RVV_FLAGS_CONFLICT "-march=[^ ]*")
 
   set(CPU_DISPATCH "" CACHE STRING "${HELP_CPU_DISPATCH}")
 
@@ -1,17 +1,16 @@
 #include <stdio.h>
 
-#if defined(__riscv)
-#  include <riscv_vector.h>
-#  define CV_RVV 1
+#if !defined(__riscv) || !defined(__riscv_v)
+#error "RISC-V or vector extension(RVV) is not supported by the compiler"
 #endif
 
-#if defined CV_RVV
-#if defined(__riscv_v_intrinsic) &&  __riscv_v_intrinsic>10999
-#define vreinterpret_v_u64m1_u8m1 __riscv_vreinterpret_v_u64m1_u8m1
-#define vle64_v_u64m1 __riscv_vle64_v_u64m1
-#define vle32_v_f32m1 __riscv_vle32_v_f32m1
-#define vfmv_f_s_f32m1_f32 __riscv_vfmv_f_s_f32m1_f32
+#if !defined(__THEAD_VERSION__) && defined(__riscv_v_intrinsic) && __riscv_v_intrinsic < 12000
+#error "Wrong intrinsics version, v0.12 or higher is required for gcc or clang"
 #endif
+
+#include <riscv_vector.h>
+
+#ifdef __THEAD_VERSION__
 int test()
 {
     const float src[] = { 0.0f, 0.0f, 0.0f, 0.0f };
@@ -21,7 +20,14 @@ int test()
     return (int)vfmv_f_s_f32m1_f32(val);
 }
 #else
-#error "RISC-V vector extension(RVV) is not supported"
+int test()
+{
+    const float src[] = { 0.0f, 0.0f, 0.0f, 0.0f };
+    uint64_t ptr[2] = {0x0908060504020100, 0xFFFFFFFF0E0D0C0A};
+    vuint8m1_t a = __riscv_vreinterpret_v_u64m1_u8m1(__riscv_vle64_v_u64m1(ptr, 2));
+    vfloat32m1_t val = __riscv_vle32_v_f32m1((const float*)(src), 4);
+    return (int)__riscv_vfmv_f_s_f32m1_f32(val);
+}
 #endif
 
 int main()
 
@@ -146,9 +146,23 @@
 #  define CV_NEON 1
 #endif
 
-#if defined(__riscv) && defined(__riscv_vector) && defined(__riscv_vector_071)
-# include<riscv_vector.h>
-# define CV_RVV071 1
+/* RVV-related macro states with different compiler
+// +--------------------+----------+----------+
+// | Macro              | Upstream | XuanTie  |
+// +--------------------+----------+----------+
+// | CV_CPU_COMPILE_RVV | defined  | defined  |
+// | CV_RVV             | 1        | 0        |
+// | CV_RVV071          | 0        | 1        |
+// | CV_TRY_RVV         | 1        | 1        |
+// +--------------------+----------+----------+
+*/
+#ifdef CV_CPU_COMPILE_RVV
+#  ifdef __riscv_vector_071
+#    define CV_RVV071 1
+#  else
+#    define CV_RVV 1
+#  endif
+#include <riscv_vector.h>
 #endif
 
 #ifdef CV_CPU_COMPILE_VSX
@@ -183,11 +197,6 @@
 #  include <wasm_simd128.h>
 #endif
 
-#if defined CV_CPU_COMPILE_RVV
-#  define CV_RVV 1
-#  include <riscv_vector.h>
-#endif
-
 #endif // CV_ENABLE_INTRINSICS && !CV_DISABLE_OPTIMIZATION && !__CUDACC__
 
 #if defined CV_CPU_COMPILE_AVX && !defined CV_CPU_BASELINE_COMPILE_AVX
 
@@ -236,11 +236,7 @@ using namespace CV_CPU_OPTIMIZATION_HAL_NAMESPACE;
 #include "opencv2/core/hal/intrin_wasm.hpp"
 
 #elif CV_RVV && !defined(CV_FORCE_SIMD128_CPP)
-#if defined(CV_RVV_SCALABLE)
 #include "opencv2/core/hal/intrin_rvv_scalable.hpp"
-#else
-#include "opencv2/core/hal/intrin_rvv.hpp"
-#endif
 
 #elif CV_LSX && !defined(CV_FORCE_SIMD128_CPP)