Merge pull request DrTimothyAldenDavis#3 from suvorovrain/rvvtest

Update global value

Author: suvorovrain

GraphBLAS/GraphBLAS/rename/GB_rename.h

@@ -389,7 +389,7 @@
 #define GB_Global_calloc_function_set GM_Global_calloc_function_set
 #define GB_Global_cpu_features_avx2 GM_Global_cpu_features_avx2
 #define GB_Global_cpu_features_avx512f GM_Global_cpu_features_avx512f
-#define GB_Global_cpu_features_rvv GM_Global_cpu_features_rvv
+#define GB_Global_cpu_features_rvv_1_0 GM_Global_cpu_features_rvv_1_0
 #define GB_Global_cpu_features_query GM_Global_cpu_features_query
 #define GB_Global_flush_get GM_Global_flush_get
 #define GB_Global_flush_set GM_Global_flush_set

GraphBLAS/Source/global/GB_Global.c

@@ -131,7 +131,7 @@ typedef struct
 
     bool cpu_features_avx2 ;        // x86_64 with AVX2
     bool cpu_features_avx512f ;     // x86_64 with AVX512f
-    bool cpu_features_rvv ;         // RISC-V with RVV1.0
+    bool cpu_features_rvv_1_0 ;     // RISC-V with RVV1.0
 
     //--------------------------------------------------------------------------
     // CUDA (DRAFT: in progress):
@@ -216,7 +216,7 @@ static GB_Global_struct GB_Global =
     // CPU features
     .cpu_features_avx2 = false,         // x86_64 with AVX2
     .cpu_features_avx512f = false,      // x86_64 with AVX512f
-    .cpu_features_rvv = false,          // RISC-V with RVV1.0
+    .cpu_features_rvv_1_0 = false,      // RISC-V with RVV1.0
 
     // CUDA environment (DRAFT: in progress)
     .gpu_count = 0,                     // # of GPUs in the system
@@ -318,12 +318,12 @@ void GB_Global_cpu_features_query (void)
         #if defined ( GBRVV )
         {
                 // the build system asserts whether or not RVV1.0 is available
-                GB_Global.cpu_features_rvv = (bool) (GBRVV) ;
+                GB_Global.cpu_features_rvv_1_0 = (bool) (GBRVV) ;
         }
             #else
             {
                 // RVV1.0 not available
-                GB_Global.cpu_features_rvv = false ;
+                GB_Global.cpu_features_rvv_1_0 = false ;
             }
         #endif
 
@@ -337,7 +337,7 @@ void GB_Global_cpu_features_query (void)
 
         GB_Global.cpu_features_avx2 = false ;
         GB_Global.cpu_features_avx512f = false ;
-        GB_Global.cpu_features_rvv = false ;
+        GB_Global.cpu_features_rvv_1_0 = false ;
 
     }
     #endif
@@ -353,9 +353,9 @@ bool GB_Global_cpu_features_avx512f (void)
     return (GB_Global.cpu_features_avx512f) ;
 }
 
-bool GB_Global_cpu_features_rvv (void)
+bool GB_Global_cpu_features_rvv_1_0 (void)
 { 
-    return (GB_Global.cpu_features_rvv) ;
+    return (GB_Global.cpu_features_rvv_1_0) ;
 }
 
 //------------------------------------------------------------------------------

GraphBLAS/Source/global/GB_Global.h

@@ -17,7 +17,7 @@
 void     GB_Global_cpu_features_query (void) ;
 bool     GB_Global_cpu_features_avx2 (void) ;
 bool     GB_Global_cpu_features_avx512f (void) ;
-bool     GB_Global_cpu_features_rvv (void) ;
+bool     GB_Global_cpu_features_rvv_1_0 (void) ;
 
 void     GB_Global_mode_set (GrB_Mode mode) ;
 GrB_Mode GB_Global_mode_get (void) ;

GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_saxpy5.c

@@ -92,7 +92,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_SAXPY5_PROTO (GB_jit_kernel) ;
 
         #if GB_COMPILER_SUPPORTS_RVV1
 
-            GB_TARGET_AVX2 static inline void GB_AxB_saxpy5_unrolled_rvv
+            GB_TARGET_RVV1 static inline void GB_AxB_saxpy5_unrolled_rvv
             (
                 GrB_Matrix C,
                 const GrB_Matrix A,

GraphBLAS/Source/mxm/factory/GB_AxB_saxpy5_meta.c

@@ -146,7 +146,7 @@
 
                 #if GB_SEMIRING_HAS_RVV_IMPLEMENTATION
                     #if GB_COMPILER_SUPPORTS_RVV1
-                    if (GB_Global_cpu_features_rvv ( ))
+                    if (GB_Global_cpu_features_rvv_1_0 ( ))
                     {
                         GB_AxB_saxpy5_unrolled_rvv (C, A, B,
                             ntasks, nthreads, B_slice) ;

GraphBLAS/cpu_features/include/cpuinfo_riscv.h

@@ -69,4 +69,4 @@ const char* GetRiscvFeaturesEnumName(RiscvFeaturesEnum);
 
 CPU_FEATURES_END_CPP_NAMESPACE
 
-#endif  // CPU_FEATURES_INCLUDE_CPUINFO_RISCV_H_
+#endif  // CPU_FEATURES_INCLUDE_CPUINFO_RISCV_H_

GraphBLAS/cpu_features/src/impl_riscv_linux.c

@@ -108,4 +108,4 @@ RiscvInfo GetRiscvInfo(void) {
 }
 
 #endif  //  defined(CPU_FEATURES_OS_LINUX) || defined(CPU_FEATURES_OS_ANDROID)
-#endif  // CPU_FEATURES_ARCH_RISCV
+#endif  // CPU_FEATURES_ARCH_RISCV