Rvvtest2

CMakeLists.txt

@@ -162,6 +162,28 @@ if ( DEFINED GBAVX512F )
     endif ( )
 endif ( )
 
+#-------------------------------------------------------------------------------
+# RISC-V
+#-------------------------------------------------------------------------------
+
+if ( DEFINED GBRISCV64 )
+    if ( GBRISCV64 )
+    # default: this is detected automatically, but can be set here also
+        set ( CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -DGBRISCV64=1 " )
+    else ( )
+        set ( CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -DGBRISCV64=0 " )
+    endif ( )
+endif ( )
+
+if ( DEFINED GBRVV )
+    if ( GBRVV )
+    # default: this is detected automatically, but can be set here also
+        set ( CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -DGBRVV=1 " )
+    else ( )
+        set ( CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -DGBRVV=0 " )
+    endif ( )
+endif ( )
+
 #-------------------------------------------------------------------------------
 # check compiler features
 #-------------------------------------------------------------------------------

FactoryKernels/GB_AxB__plus_times_fp32.c

@@ -49,6 +49,7 @@
 // special case semirings:
 
 #define GB_SEMIRING_HAS_AVX_IMPLEMENTATION 1
+#define GB_SEMIRING_HAS_RVV_IMPLEMENTATION 1
 
 // monoid properties:
 #define GB_Z_TYPE float
@@ -287,6 +288,34 @@ GrB_Info GB (_Asaxpy4B__plus_times_fp32)
 
         #endif
 
+        //----------------------------------------------------------------------
+        // saxpy5 method with RISC-V vectors
+        //---------------------------------------------------------------------
+
+        #if GB_COMPILER_SUPPORTS_RVV1
+
+            #include <riscv_vector.h>
+            #define VSETVL(x) __riscv_vsetvl_e32m8(x)
+            #define VLE(x,y) __riscv_vle32_v_f32m8(x, y)
+            #define VFMACC(x,y,z,w) __riscv_vfmacc_vf_f32m8(x, y, z, w)
+            #define VSE(x,y,z) __riscv_vse32_v_f32m8(x, y, z)
+            #define VECTORTYPE vfloat32m8_t
+
+            GB_TARGET_RVV1 static inline void GB_AxB_saxpy5_unrolled_rvv
+            (
+                GrB_Matrix C,
+                const GrB_Matrix A,
+                const GrB_Matrix B,
+                const int ntasks,
+                const int nthreads,
+                const int64_t *B_slice
+            )
+            {
+                #include "mxm/template/GB_AxB_saxpy5_lv.c"
+            }
+
+        #endif
+
         //----------------------------------------------------------------------
         // saxpy5 method unrolled, with no vectors
         //----------------------------------------------------------------------

FactoryKernels/GB_AxB__plus_times_fp64.c

@@ -49,6 +49,7 @@
 // special case semirings:
 
 #define GB_SEMIRING_HAS_AVX_IMPLEMENTATION 1
+#define GB_SEMIRING_HAS_RVV_IMPLEMENTATION 1
 
 // monoid properties:
 #define GB_Z_TYPE double
@@ -287,6 +288,34 @@ GrB_Info GB (_Asaxpy4B__plus_times_fp64)
 
         #endif
 
+        //----------------------------------------------------------------------
+        // saxpy5 method with RISC-V vectors
+        //----------------------------------------------------------------------
+
+        #if GB_COMPILER_SUPPORTS_RVV1
+
+        #include <riscv_vector.h>
+        #define VSETVL(x) __riscv_vsetvl_e64m8(x)
+        #define VLE(x,y) __riscv_vle64_v_f64m8(x, y)
+        #define VFMACC(x,y,z,w) __riscv_vfmacc_vf_f64m8(x, y, z, w)
+        #define VSE(x,y,z) __riscv_vse64_v_f64m8(x, y, z)
+        #define VECTORTYPE vfloat64m8_t
+
+            GB_TARGET_RVV1 static inline void GB_AxB_saxpy5_unrolled_rvv
+            (
+                GrB_Matrix C,
+                const GrB_Matrix A,
+                const GrB_Matrix B,
+                const int ntasks,
+                const int nthreads,
+                const int64_t *B_slice
+            )
+            {
+                #include "mxm/template/GB_AxB_saxpy5_lv.c"
+            }
+
+        #endif
+
         //----------------------------------------------------------------------
         // saxpy5 method unrolled, with no vectors
         //----------------------------------------------------------------------

GraphBLAS/CMakeLists.txt

@@ -122,6 +122,28 @@ if ( DEFINED GBAVX512F )
     endif ( )
 endif ( )
 
+#-------------------------------------------------------------------------------
+# RISC-V
+#-------------------------------------------------------------------------------
+
+if ( DEFINED GBRISCV64 )
+    if ( GBRISCV64 )
+    # default: this is detected automatically, but can be set here also
+        set ( CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -DGBRISCV64=1 " )
+    else ( )
+        set ( CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -DGBRISCV64=0 " )
+    endif ( )
+endif ( )
+
+if ( DEFINED GBRVV )
+    if ( GBRVV )
+    # default: this is detected automatically, but can be set here also
+        set ( CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -DGBRVV=1 " )
+    else ( )
+        set ( CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -DGBRVV=0 " )
+    endif ( )
+endif ( )
+
 #-------------------------------------------------------------------------------
 # determine build type
 #-------------------------------------------------------------------------------

GraphBLAS/rename/GB_rename.h

@@ -390,6 +390,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_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

Source/codegen/Generator/GB_AxB.c

@@ -7,6 +7,9 @@
 
 //------------------------------------------------------------------------------
 
+#ifdef GBRISCV64
+#include <riscv_vector.h>
+#endif
 #include "GB_control.h"
 GB_type_enabled
 #if GB_TYPE_ENABLED
@@ -310,6 +313,28 @@ m4_divert(if_semiring_has_avx)
             }
 
         #endif
+m4_divert(if_semiring_has_rvv)
+        //----------------------------------------------------------------------
+        // saxpy5 method with RISC-V vectors
+        //----------------------------------------------------------------------
+
+        #if GB_COMPILER_SUPPORTS_RVV1
+
+            GB_TARGET_RVV1 static inline void GB_AxB_saxpy5_unrolled_rvv
+            (
+                GrB_Matrix C,
+                const GrB_Matrix A,
+                const GrB_Matrix B,
+                const int ntasks,
+                const int nthreads,
+                const int64_t *B_slice
+            )
+            {
+                #include "mxm/template/GB_AxB_saxpy5_lv.c"
+            }
+
+        #endif
+
 m4_divert(if_saxpy5_enabled)
 
         //----------------------------------------------------------------------

Source/cpu/GB_cpu_features.h

@@ -38,9 +38,13 @@
     #include "cpu_features_macros.h"
     #define STACK_LINE_READER_BUFFER_SIZE 1024
     #if GBX86
-    // Intel x86 (also AMD): other architectures are not exploited
+    // Intel x86 (also AMD)
     #include "cpuinfo_x86.h"
     #endif
+    #if GBRISCV64
+    // RISC-V
+    #include "cpuinfo_riscv.h"
+    #endif
 #endif
 
 #endif

Source/cpu/GB_cpu_features_impl.c

@@ -44,6 +44,7 @@
     #include "src/impl_x86_freebsd.c"
     #include "src/impl_x86_linux_or_android.c"
     #include "src/impl_x86_windows.c"
+    #include "src/impl_riscv_linux.c"
     #if GBX86
         #if (defined(__apple__) || defined(__APPLE__) || defined(__MACH__))
         // needed for src/impl_x86_macos.c:

Source/global/GB_Global.c

@@ -133,6 +133,7 @@ typedef struct
 
     bool cpu_features_avx2 ;        // x86_64 with AVX2
     bool cpu_features_avx512f ;     // x86_64 with AVX512f
+    bool cpu_features_rvv_1_0 ;     // RISC-V with RVV1.0
 
     //--------------------------------------------------------------------------
     // integer control
@@ -226,6 +227,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_1_0 = false,      // RISC-V with RVV1.0
 
     // integer control
     .p_control = (int8_t) 32,
@@ -356,16 +358,48 @@ void GB_Global_cpu_features_query (void)
         }
         #endif
 
+    }
+    #elif GBRISCV64
+    {
+
+        //----------------------------------------------------------------------
+        // RISC-V architecture: see if RVV1.0 is supported
+        //----------------------------------------------------------------------
+
+        #if !defined ( GBNCPUFEAT )
+        {
+            // Google's cpu_features package is available: use run-time tests
+            RiscvFeatures features = GetRiscvInfo ().features ;
+            GB_Global.cpu_features_rvv_1_0 = (bool) (features.V) ;
+
+        }
+        #else
+        {
+            #if defined ( GBRVV )
+            {
+                // the build system asserts whether or not RVV1.0 is available
+                GB_Global.cpu_features_rvv_1_0 = (bool) (GBRVV) ;
+            }
+            #else
+            {
+                // RVV1.0 not available
+                GB_Global.cpu_features_rvv_1_0 = false ;
+            }
+            #endif
+        }
+        #endif
+
     }
     #else
     {
 
         //----------------------------------------------------------------------
-        // not on the x86_64 architecture, so no AVX2 or AVX512F acceleration
+        // not on the x86_64 or RISC-V architecture, so no AVX2, AVX512F or RVV1.0 acceleration
         //----------------------------------------------------------------------
 
         GB_Global.cpu_features_avx2 = false ;
         GB_Global.cpu_features_avx512f = false ;
+        GB_Global.cpu_features_rvv_1_0 = false ;
 
     }
     #endif
@@ -381,6 +415,11 @@ bool GB_Global_cpu_features_avx512f (void)
     return (GB_Global.cpu_features_avx512f) ;
 }
 
+bool GB_Global_cpu_features_rvv_1_0 (void)
+{ 
+    return (GB_Global.cpu_features_rvv_1_0) ;
+}
+
 //------------------------------------------------------------------------------
 // hyper_switch
 //------------------------------------------------------------------------------

Source/global/GB_Global.h

@@ -17,6 +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_1_0 (void) ;
 
 void     GB_Global_mode_set (int mode) ;
 int      GB_Global_mode_get (void) ;

Source/include/GB_compiler.h

@@ -245,6 +245,16 @@
 
 #endif
 
+#if !defined ( GBRISCV64 )
+
+    #if defined(__riscv)
+    #define GBRISCV64 1
+    #else
+    #define GBRISCV64 0
+    #endif
+
+#endif
+
 //------------------------------------------------------------------------------
 // AVX2 and AVX512F support for the x86_64 architecture
 //------------------------------------------------------------------------------
@@ -306,6 +316,31 @@
     #define GB_TARGET_AVX2
 #endif
 
+//------------------------------------------------------------------------------
+// RVV1.0 support for the RISC-V architecture
+//------------------------------------------------------------------------------
+
+#if GBRISCV64
+    #if GB_COMPILER_GCC
+    // TODO: add other compilers
+        #if __GNUC__ >= 13
+            #define GB_COMPILER_SUPPORTS_RVV1 1
+        #else
+            #define GB_COMPILER_SUPPORTS_RVV1 0
+        #endif
+    #endif
+#else
+    // non-RISC-V architecture
+    #define GB_COMPILER_SUPPORTS_RVV1 0
+#endif
+
+// prefix for function with target rvv1.0
+#if GB_COMPILER_SUPPORTS_RVV1
+        #define GB_TARGET_RVV1 __attribute__ ((target ("arch=rv64gcv")))
+#else
+    #define GB_TARGET_RVV1
+#endif
+
 //------------------------------------------------------------------------------
 // disable Google's cpu_featgures on some compilers
 //------------------------------------------------------------------------------