Support RISC-V as an scalar MLAS target

As a baseline patch, this preliminary RISC-V port leverages the existing scalar implementation that was previously only utilized by WASM target. Also, we rename TARGET_WASM_SCALAR macros to TARGET_SCALAR, which serves as a neutral designation that accommodates the inclusion of RISC-V as a scalar target. Reviewed-by: Alan Kao <[email protected]>
microsoft · Oct 26, 2023 · 6839b8d · 6839b8d
1 parent 50c35c2
commit 6839b8d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/onnxruntime/core/mlas/inc/mlas.h b/onnxruntime/core/mlas/inc/mlas.h
@@ -56,6 +56,9 @@ Module Name:
 #if defined(MLAS_TARGET_ARM64) || defined(MLAS_TARGET_ARM64EC) || defined(MLAS_TARGET_ARM)
 #define MLAS_TARGET_ARM_ANY
 #endif
+#if defined(__riscv__)
+#define MLAS_TARGET_SCALAR
+#endif
 
 #if defined(__VSX__)
 #define MLAS_TARGET_POWER
@@ -65,7 +68,7 @@ Module Name:
 #if defined(__wasm_simd128__)
 #define MLAS_TARGET_WASM_SIMD
 #else
-#define MLAS_TARGET_WASM_SCALAR
+#define MLAS_TARGET_SCALAR
 #endif
 #endif
 
@@ -751,7 +754,7 @@ enum MLAS_CONV_ALGORITHM {
     MlasConvAlgorithmGemmDirect,
     MlasConvAlgorithmExpandThenGemm,
     MlasConvAlgorithmExpandThenGemmSegmented,
-#if defined(MLAS_TARGET_WASM_SCALAR)
+#if defined(MLAS_TARGET_SCALAR)
     MlasConvAlgorithmDepthwise,
 #endif
 };

diff --git a/onnxruntime/core/mlas/lib/convolve.cpp b/onnxruntime/core/mlas/lib/convolve.cpp
@@ -903,7 +903,7 @@ Return Value:
         return;
     }
 
-#if defined(MLAS_TARGET_WASM_SCALAR)
+#if defined(MLAS_TARGET_SCALAR)
 
     if (Algorithm == MlasConvAlgorithmDepthwise) {
         // Fill the Working Buffer with Zero for use by the depthwise kernel.
@@ -976,7 +976,7 @@ Return Value:
                     break;
                 }
 
-#if defined(MLAS_TARGET_WASM_SCALAR)
+#if defined(MLAS_TARGET_SCALAR)
 
                 case MlasConvAlgorithmDepthwise:
                 {
@@ -1224,7 +1224,7 @@ Return Value:
 
     } else {
 
-#if defined(MLAS_TARGET_WASM_SCALAR)
+#if defined(MLAS_TARGET_SCALAR)
 
         // Scalar direct conv for depthwise convolution.
         // Currently only support 3x3 kernel with padding <=1 and dilations = 1.
@@ -1299,4 +1299,4 @@ Return Value:
 }
 #if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(pop)
-#endif
+#endif
diff --git a/onnxruntime/core/mlas/lib/mlasi.h b/onnxruntime/core/mlas/lib/mlasi.h
@@ -1162,7 +1162,7 @@ MlasFp32FromBits(
 #pragma warning(pop)
 #endif
 
-#if defined(MLAS_TARGET_WASM_SCALAR)
+#if defined(MLAS_TARGET_SCALAR)
 
 void
 MLASCALL

diff --git a/onnxruntime/core/mlas/lib/sgemm.cpp b/onnxruntime/core/mlas/lib/sgemm.cpp
@@ -208,7 +208,7 @@ Return Value:
     }
 }
 
-#if !defined(MLAS_TARGET_WASM_SCALAR)
+#if !defined(MLAS_TARGET_SCALAR)
 
 void
 MlasSgemmCopyPackB(
@@ -734,7 +734,7 @@ Return Value:
     }
 }
 
-#else //defined(MLAS_TARGET_WASM_SCALAR)
+#else //defined(MLAS_TARGET_SCALAR)
 
 void
 MlasSgemmCopyPackB(