Update Makefile.riscv64

Makefile.riscv64

@@ -1,4 +1,4 @@
 ifeq ($(CORE), C910V)
-CCOMMON_OPT += -march=rv64imafdcv0p7_zfh_xtheadc -mabi=lp64d -mtune=c920
+CCOMMON_OPT += -march=rv64imafdcv0p7_zfh_xtheadc -mabi=lp64d -mtune=c920 -O1
 FCOMMON_OPT += -march=rv64imafdcv0p7_zfh_xtheadc -mabi=lp64d -mtune=c920 -static
 endif

Makefile.system

@@ -1614,7 +1614,12 @@ ifdef OS_WINDOWS
 LAPACK_FFLAGS := $(filter-out -fopenmp -mp -openmp -xopenmp=parallel,$(FFLAGS))
 LAPACK_FPFLAGS := $(filter-out -fopenmp -mp -openmp -xopenmp=parallel,$(FPFLAGS))
 else
+ifeq ($(CORE),C910V)
+LAPACK_FFLAGS := $(filter-out -O2,$(FFLAGS))
+LAPACK_FFLAGS += -O1
+else
 LAPACK_FFLAGS := $(FFLAGS)
+endif
 LAPACK_FPFLAGS := $(FPFLAGS)
 endif
 

kernel/riscv64/copy_vector.c

@@ -24,6 +24,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/
+#pragma GCC optimize "O1"
 #include "common.h"
 #if !defined(DOUBLE)
 #define VSETVL(n) vsetvl_e32m8(n)

kernel/riscv64/dgemm_kernel_8x4_c910v.c

@@ -1,3 +1,4 @@
+#pragma GCC optimize "O1"
 #include "common.h"
 #include <riscv_vector.h>
 

kernel/riscv64/rot_vector.c

@@ -155,6 +155,7 @@ int CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y, FLOAT
                 }
         }else{
                 gvl = VSETVL(n);
+		if (inc_x == 0 && inc_y == 0) gvl = VSETVL(1);
                 BLASLONG stride_x = inc_x * sizeof(FLOAT);
                 BLASLONG stride_y = inc_y * sizeof(FLOAT);
                 BLASLONG inc_xv = inc_x * gvl;

kernel/riscv64/sgemm_kernel_16x4_c910v.c

@@ -1,3 +1,4 @@
+#pragma GCC optimize "O1"
 #include "common.h"
 #include <riscv_vector.h>
 

kernel/riscv64/swap_vector.c

@@ -136,6 +136,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT dummy3, FLOAT *x,
                 }
         }else{
                 gvl = VSETVL(n);
+                if (inc_x == 0 && inc_y == 0) gvl = VSETVL(1);
                 stride_x = inc_x * sizeof(FLOAT);
                 stride_y = inc_y * sizeof(FLOAT);
                 if(gvl <= n/2){

kernel/riscv64/zcopy_vector.c

@@ -24,7 +24,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/
-
+#pragma GCC optimize "O1"
 #include "common.h"
 #if !defined(DOUBLE)
 #define VSETVL(n) vsetvl_e32m4(n)

kernel/riscv64/zrot_vector.c

@@ -112,6 +112,7 @@ int CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y, FLOAT
 		}
 		
 	}else{
+                if (inc_x == 0 && inc_y == 0) gvl = VSETVL(1);
 		for(i=0,j=0; i < n/gvl; i++){
 			vx0 = VLSEV_FLOAT(&x[ix], stride_x, gvl);
 			vx1 = VLSEV_FLOAT(&x[ix+1], stride_x, gvl);

kernel/riscv64/zswap_vector.c

@@ -81,6 +81,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT dummy3, FLOAT dumm
                 }
         }else{
                 gvl = VSETVL(n);
+                if (inc_x == 0 && inc_y == 0) gvl = VSETVL(1);
                 stride_x = inc_x * 2 * sizeof(FLOAT);
                 stride_y = inc_y * 2 * sizeof(FLOAT);
                 BLASLONG inc_xv = inc_x * gvl * 2;

utest/test_dsdot.c

@@ -44,7 +44,7 @@ CTEST(dsdot,dsdot_n_1)
 	double res1=0.0f, res2=-0.00239335360107;
 
 	res1=BLASFUNC(dsdot)(&n, &x, &incx, &y, &incy);
-	ASSERT_DBL_NEAR_TOL(res2, res1, DOUBLE_EPS);
+	ASSERT_DBL_NEAR_TOL(res2, res1, 1.e-9);
 
 }
 #endif

utest/test_fork.c

@@ -67,7 +67,11 @@ CTEST(fork, safety)
 #ifndef BUILD_DOUBLE
 exit(0);
 #else
+#ifndef ARCH_RISCV64
     blasint n = 1000;
+#else
+    blasint n = 100;
+#endif   
     int i;
 
     double *a, *b, *c, *d;

utest/test_potrs.c

@@ -40,6 +40,7 @@ void BLASFUNC(zpotrs_(char*, BLASINT*, BLASINT*, complex double*,
 */
 
 //https://github.com/xianyi/OpenBLAS/issues/695
+
 CTEST(potrf, bug_695){
 
   openblas_complex_float A1[100] = 
@@ -399,6 +400,7 @@ CTEST(potrf, bug_695){
 #endif
 }
 
+
 // Check potrf factorizes a small problem correctly
 CTEST(potrf, smoketest_trivial){
   float A1s[4] = {2, 0.3, 0.3, 3};
@@ -569,3 +571,4 @@ CTEST(potrf, smoketest_trivial){
     }
   }
 }
+