Allow TRMM unroll sizes to be set independently from the GEMM unroll sizes for RISC-V

The unroll factor of the TRMM kernels are currently set to those of the
equivalent GEMM kernels.  As we are not dealing with the TRMM kernels for now,
I have added extra xTRMM_UNROLL_(M|N) parameters to allow them to be set
independently of the xGEMM_UNROLL_(M|N) parameters.

If the new TRMM parameter is not defined, then it defaults back to the
original behaviour of using the GEMM parameters.

Author: Kwok Cheung Yeung

getarch_2nd.c

@@ -103,7 +103,55 @@ int main(int argc, char **argv) {
     printf("XGEMM3M_UNROLL_N=%d\n", QGEMM_DEFAULT_UNROLL_N);
 #endif
 
+#ifdef ARCH_RISCV64
+#ifdef STRMM_DEFAULT_UNROLL_M
+    printf("STRMM_UNROLL_M=%d\n", STRMM_DEFAULT_UNROLL_M);
+#else
+    printf("STRMM_UNROLL_M=%d\n", SGEMM_DEFAULT_UNROLL_M);
+#endif
+
+#ifdef STRMM_DEFAULT_UNROLL_N
+    printf("STRMM_UNROLL_N=%d\n", STRMM_DEFAULT_UNROLL_N);
+#else
+    printf("STRMM_UNROLL_N=%d\n", SGEMM_DEFAULT_UNROLL_N);
+#endif
+
+#ifdef DTRMM_DEFAULT_UNROLL_M
+    printf("DTRMM_UNROLL_M=%d\n", DTRMM_DEFAULT_UNROLL_M);
+#else
+    printf("DTRMM_UNROLL_M=%d\n", DGEMM_DEFAULT_UNROLL_M);
+#endif
+
+#ifdef DTRMM_DEFAULT_UNROLL_N
+    printf("DTRMM_UNROLL_N=%d\n", DTRMM_DEFAULT_UNROLL_N);
+#else
+    printf("DTRMM_UNROLL_N=%d\n", DGEMM_DEFAULT_UNROLL_N);
+#endif
 
+#ifdef CTRMM_DEFAULT_UNROLL_M
+    printf("CTRMM_UNROLL_M=%d\n", CTRMM_DEFAULT_UNROLL_M);
+#else
+    printf("CTRMM_UNROLL_M=%d\n", CGEMM_DEFAULT_UNROLL_M);
+#endif
+
+#ifdef CTRMM_DEFAULT_UNROLL_N
+    printf("CTRMM_UNROLL_N=%d\n", CTRMM_DEFAULT_UNROLL_N);
+#else
+    printf("CTRMM_UNROLL_N=%d\n", CGEMM_DEFAULT_UNROLL_N);
+#endif
+
+#ifdef ZTRMM_DEFAULT_UNROLL_M
+    printf("ZTRMM_UNROLL_M=%d\n", ZTRMM_DEFAULT_UNROLL_M);
+#else
+    printf("ZTRMM_UNROLL_M=%d\n", ZGEMM_DEFAULT_UNROLL_M);
+#endif
+
+#ifdef ZTRMM_DEFAULT_UNROLL_N
+    printf("ZTRMM_UNROLL_N=%d\n", ZTRMM_DEFAULT_UNROLL_N);
+#else
+    printf("ZTRMM_UNROLL_N=%d\n", ZGEMM_DEFAULT_UNROLL_N);
+#endif
+#endif /* ARCH_RISCV64 */
   }
 
 

kernel/riscv64/KERNEL.RISCV64_ZVL128B

@@ -165,29 +165,29 @@ ZGEMMINCOPYOBJ =  zgemm_incopy$(TSUFFIX).$(SUFFIX)
 ZGEMMITCOPYOBJ =  zgemm_itcopy$(TSUFFIX).$(SUFFIX)
 endif
 
-STRMMKERNEL	   =  strmm_kernel_$(SGEMM_UNROLL_M)x$(SGEMM_UNROLL_N)_zvl128b.c
-STRMMUNCOPY_M  =  ../generic/trmm_uncopy_$(SGEMM_UNROLL_M).c
-STRMMLNCOPY_M  =  ../generic/trmm_lncopy_$(SGEMM_UNROLL_M).c
-STRMMUTCOPY_M  =  ../generic/trmm_utcopy_$(SGEMM_UNROLL_M).c
-STRMMLTCOPY_M  =  ../generic/trmm_ltcopy_$(SGEMM_UNROLL_M).c
-
-DTRMMKERNEL	   =  dtrmm_kernel_$(DGEMM_UNROLL_M)x$(DGEMM_UNROLL_N)_zvl128b.c
-DTRMMUNCOPY_M  =  ../generic/trmm_uncopy_$(DGEMM_UNROLL_M).c
-DTRMMLNCOPY_M  =  ../generic/trmm_lncopy_$(DGEMM_UNROLL_M).c
-DTRMMUTCOPY_M  =  ../generic/trmm_utcopy_$(DGEMM_UNROLL_M).c
-DTRMMLTCOPY_M  =  ../generic/trmm_ltcopy_$(DGEMM_UNROLL_M).c
-
-CTRMMKERNEL	   =  ctrmm_kernel_$(CGEMM_UNROLL_M)x$(CGEMM_UNROLL_N)_zvl128b.c
-CTRMMUNCOPY_M  =  ../generic/ztrmm_uncopy_$(CGEMM_UNROLL_M).c
-CTRMMLNCOPY_M  =  ../generic/ztrmm_lncopy_$(CGEMM_UNROLL_M).c
-CTRMMUTCOPY_M  =  ../generic/ztrmm_utcopy_$(CGEMM_UNROLL_M).c
-CTRMMLTCOPY_M  =  ../generic/ztrmm_ltcopy_$(CGEMM_UNROLL_M).c
-
-ZTRMMKERNEL	   =  ztrmm_kernel_$(ZGEMM_UNROLL_M)x$(ZGEMM_UNROLL_N)_zvl128b.c
-ZTRMMUNCOPY_M  =  ../generic/ztrmm_uncopy_$(ZGEMM_UNROLL_M).c
-ZTRMMLNCOPY_M  =  ../generic/ztrmm_lncopy_$(ZGEMM_UNROLL_M).c
-ZTRMMUTCOPY_M  =  ../generic/ztrmm_utcopy_$(ZGEMM_UNROLL_M).c
-ZTRMMLTCOPY_M  =  ../generic/ztrmm_ltcopy_$(ZGEMM_UNROLL_M).c
+STRMMKERNEL	   =  strmm_kernel_$(STRMM_UNROLL_M)x$(STRMM_UNROLL_N)_zvl128b.c
+STRMMUNCOPY_M  =  ../generic/trmm_uncopy_$(STRMM_UNROLL_M).c
+STRMMLNCOPY_M  =  ../generic/trmm_lncopy_$(STRMM_UNROLL_M).c
+STRMMUTCOPY_M  =  ../generic/trmm_utcopy_$(STRMM_UNROLL_M).c
+STRMMLTCOPY_M  =  ../generic/trmm_ltcopy_$(STRMM_UNROLL_M).c
+
+DTRMMKERNEL	   =  dtrmm_kernel_$(DTRMM_UNROLL_M)x$(DTRMM_UNROLL_N)_zvl128b.c
+DTRMMUNCOPY_M  =  ../generic/trmm_uncopy_$(DTRMM_UNROLL_M).c
+DTRMMLNCOPY_M  =  ../generic/trmm_lncopy_$(DTRMM_UNROLL_M).c
+DTRMMUTCOPY_M  =  ../generic/trmm_utcopy_$(DTRMM_UNROLL_M).c
+DTRMMLTCOPY_M  =  ../generic/trmm_ltcopy_$(DTRMM_UNROLL_M).c
+
+CTRMMKERNEL	   =  ctrmm_kernel_$(CTRMM_UNROLL_M)x$(CTRMM_UNROLL_N)_zvl128b.c
+CTRMMUNCOPY_M  =  ../generic/ztrmm_uncopy_$(CTRMM_UNROLL_M).c
+CTRMMLNCOPY_M  =  ../generic/ztrmm_lncopy_$(CTRMM_UNROLL_M).c
+CTRMMUTCOPY_M  =  ../generic/ztrmm_utcopy_$(CTRMM_UNROLL_M).c
+CTRMMLTCOPY_M  =  ../generic/ztrmm_ltcopy_$(CTRMM_UNROLL_M).c
+
+ZTRMMKERNEL	   =  ztrmm_kernel_$(ZTRMM_UNROLL_M)x$(ZTRMM_UNROLL_N)_zvl128b.c
+ZTRMMUNCOPY_M  =  ../generic/ztrmm_uncopy_$(ZTRMM_UNROLL_M).c
+ZTRMMLNCOPY_M  =  ../generic/ztrmm_lncopy_$(ZTRMM_UNROLL_M).c
+ZTRMMUTCOPY_M  =  ../generic/ztrmm_utcopy_$(ZTRMM_UNROLL_M).c
+ZTRMMLTCOPY_M  =  ../generic/ztrmm_ltcopy_$(ZTRMM_UNROLL_M).c
 
 STRSMKERNEL_LN	=  ../generic/trsm_kernel_LN.c
 STRSMKERNEL_LT	=  ../generic/trsm_kernel_LT.c

kernel/riscv64/KERNEL.RISCV64_ZVL256B

@@ -90,10 +90,10 @@ DGEMVTKERNEL = gemv_t_vector.c
 CGEMVTKERNEL = zgemv_t_vector.c
 ZGEMVTKERNEL = zgemv_t_vector.c
 
-STRMMKERNEL	= strmm_kernel_$(SGEMM_UNROLL_M)x$(SGEMM_UNROLL_N)_zvl256b.c
-DTRMMKERNEL	= dtrmm_kernel_$(DGEMM_UNROLL_M)x$(DGEMM_UNROLL_N)_zvl256b.c
-CTRMMKERNEL = ctrmm_kernel_$(CGEMM_UNROLL_M)x$(CGEMM_UNROLL_N)_zvl256b.c
-ZTRMMKERNEL = ztrmm_kernel_$(ZGEMM_UNROLL_M)x$(ZGEMM_UNROLL_N)_zvl256b.c
+STRMMKERNEL	= strmm_kernel_$(STRMM_UNROLL_M)x$(STRMM_UNROLL_N)_zvl256b.c
+DTRMMKERNEL	= dtrmm_kernel_$(DTRMM_UNROLL_M)x$(DTRMM_UNROLL_N)_zvl256b.c
+CTRMMKERNEL = ctrmm_kernel_$(CTRMM_UNROLL_M)x$(CTRMM_UNROLL_N)_zvl256b.c
+ZTRMMKERNEL = ztrmm_kernel_$(ZTRMM_UNROLL_M)x$(ZTRMM_UNROLL_N)_zvl256b.c
 
 SGEMMKERNEL    =  sgemm_kernel_zvl256b.c
 ifneq ($(filter $(SGEMM_UNROLL_N),4 8 16),)