Merge pull request #3025 from TiredNotTear/develop

martin-frbg · web-flow · commit 7f11e33e8d3c · 2020-12-08T09:39:27.000+01:00
MIPS: Fix two bugs
diff --git a/kernel/mips/cgemv_n_msa.c b/kernel/mips/cgemv_n_msa.c
@@ -56,11 +56,11 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     #if !defined(XCONJ)
         #define OP0  +=
         #define OP1  -=
-        #define OP2  -=
+        #define OP2  +=
     #else
         #define OP0  -=
         #define OP1  -=
-        #define OP2  +=
+        #define OP2  -=
     #endif
 #endif
 
diff --git a/kernel/mips/cgemv_t_msa.c b/kernel/mips/cgemv_t_msa.c
@@ -32,14 +32,26 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #undef OP1
 #undef OP2
 
-#if ( !defined(CONJ) && !defined(XCONJ) ) || ( defined(CONJ) && defined(XCONJ) )
-    #define OP0  -=
-    #define OP1  +=
-    #define OP2  +=
+#if !defined(CONJ)
+    #if !defined(XCONJ)
+        #define OP0  -=
+        #define OP1  +=
+        #define OP2  +=
+    #else
+        #define OP0  +=
+        #define OP1  +=
+        #define OP2  -=
+    #endif
 #else
-    #define OP0  +=
-    #define OP1  +=
-    #define OP2  -=
+    #if !defined(XCONJ)
+        #define OP0  +=
+        #define OP1  -=
+        #define OP2  +=
+    #else
+        #define OP0  -=
+        #define OP1  -=
+        #define OP2  -=
+    #endif
 #endif
 
 #define CGEMV_T_8x4()                        \
diff --git a/kernel/mips/dswap_msa.c b/kernel/mips/dswap_msa.c
@@ -184,7 +184,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT dummy3,
             }
         }
     }
-    else
+    else if ((inc_x != 0) && (inc_y != 0))
     {
         for (i = (n >> 3); i--;)
         {
@@ -248,6 +248,32 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT dummy3,
             }
         }
     }
-
+    else
+    {
+        if (inc_x == inc_y)
+        {
+            if (n & 1)
+            {
+                x0 = *srcx;
+                *srcx  = *srcy;
+                *srcy  = x0;
+            }
+            else
+                return (0);
+        }
+        else
+        {
+            BLASLONG ix = 0, iy = 0;
+            while (i < n)
+            {
+                x0 = srcx[ix];
+                srcx[ix] = srcy[iy];
+                srcy[iy] = x0;
+                ix += inc_x;
+                iy += inc_y;
+                i++;
+            }
+        }
+    }
     return (0);
 }
diff --git a/kernel/mips/sswap_msa.c b/kernel/mips/sswap_msa.c
@@ -198,7 +198,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT dummy3,
             }
         }
     }
-    else
+    else if ((inc_x != 0) && (inc_y != 0))
     {
         for (i = (n >> 3); i--;)
         {
@@ -262,6 +262,33 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT dummy3,
             }
         }
     }
+    else
+    {
+        if (inc_x == inc_y)
+        {
+            if (n & 1)
+            {
+                x0 = *srcx;
+                *srcx  = *srcy;
+                *srcy  = x0;
+            }
+            else
+                return (0);
+        }
+        else
+        {
+            BLASLONG ix = 0, iy = 0;
+            while (i < n)
+            {
+                x0 = srcx[ix];
+                srcx[ix] = srcy[iy];
+                srcy[iy] = x0;
+                ix += inc_x;
+                iy += inc_y;
+                i++;
+            }
+        }
+    }
 
     return (0);
 }
diff --git a/kernel/mips/zgemv_n_msa.c b/kernel/mips/zgemv_n_msa.c
@@ -56,11 +56,11 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     #if !defined(XCONJ)
         #define OP0  +=
         #define OP1  -=
-        #define OP2  -=
+        #define OP2  +=
     #else
         #define OP0  -=
         #define OP1  -=
-        #define OP2  +=
+        #define OP2  -=
     #endif
 #endif
 
diff --git a/kernel/mips/zgemv_t_msa.c b/kernel/mips/zgemv_t_msa.c
@@ -34,14 +34,26 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #undef OP3
 #undef OP4
 
-#if ( !defined(CONJ) && !defined(XCONJ) ) || ( defined(CONJ) && defined(XCONJ) )
-    #define OP0  -=
-    #define OP1  +=
-    #define OP2  +=
+#if !defined(CONJ)
+    #if !defined(XCONJ)
+        #define OP0  -=
+        #define OP1  +=
+        #define OP2  +=
+    #else
+        #define OP0  +=
+        #define OP1  +=
+        #define OP2  -=
+    #endif
 #else
-    #define OP0  +=
-    #define OP1  +=
-    #define OP2  -=
+    #if !defined(XCONJ)
+        #define OP0  +=
+        #define OP1  -=
+        #define OP2  +=
+    #else
+        #define OP0  -=
+        #define OP1  -=
+        #define OP2  -=
+    #endif
 #endif
 
 #define ZGEMV_T_8x1()                     \

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT dummy3,`
`184`	`184`	`}`
`185`	`185`	`}`
`186`	`186`	`}`
`187`		`- else`
	`187`	`+ else if ((inc_x != 0) && (inc_y != 0))`
`188`	`188`	`{`
`189`	`189`	`for (i = (n >> 3); i--;)`
`190`	`190`	`{`
`@@ -248,6 +248,32 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT dummy3,`
`248`	`248`	`}`
`249`	`249`	`}`
`250`	`250`	`}`
`251`		`-`
	`251`	`+ else`
	`252`	`+ {`
	`253`	`+ if (inc_x == inc_y)`
	`254`	`+ {`
	`255`	`+ if (n & 1)`
	`256`	`+ {`
	`257`	`+ x0 = *srcx;`
	`258`	`+ srcx = srcy;`
	`259`	`+ *srcy = x0;`
	`260`	`+ }`
	`261`	`+ else`
	`262`	`+ return (0);`
	`263`	`+ }`
	`264`	`+ else`
	`265`	`+ {`
	`266`	`+ BLASLONG ix = 0, iy = 0;`
	`267`	`+ while (i < n)`
	`268`	`+ {`
	`269`	`+ x0 = srcx[ix];`
	`270`	`+ srcx[ix] = srcy[iy];`
	`271`	`+ srcy[iy] = x0;`
	`272`	`+ ix += inc_x;`
	`273`	`+ iy += inc_y;`
	`274`	`+ i++;`
	`275`	`+ }`
	`276`	`+ }`
	`277`	`+ }`
`252`	`278`	`return (0);`
`253`	`279`	`}`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT dummy3,`
`198`	`198`	`}`
`199`	`199`	`}`
`200`	`200`	`}`
`201`		`- else`
	`201`	`+ else if ((inc_x != 0) && (inc_y != 0))`
`202`	`202`	`{`
`203`	`203`	`for (i = (n >> 3); i--;)`
`204`	`204`	`{`
`@@ -262,6 +262,33 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT dummy3,`
`262`	`262`	`}`
`263`	`263`	`}`
`264`	`264`	`}`
	`265`	`+ else`
	`266`	`+ {`
	`267`	`+ if (inc_x == inc_y)`
	`268`	`+ {`
	`269`	`+ if (n & 1)`
	`270`	`+ {`
	`271`	`+ x0 = *srcx;`
	`272`	`+ srcx = srcy;`
	`273`	`+ *srcy = x0;`
	`274`	`+ }`
	`275`	`+ else`
	`276`	`+ return (0);`
	`277`	`+ }`
	`278`	`+ else`
	`279`	`+ {`
	`280`	`+ BLASLONG ix = 0, iy = 0;`
	`281`	`+ while (i < n)`
	`282`	`+ {`
	`283`	`+ x0 = srcx[ix];`
	`284`	`+ srcx[ix] = srcy[iy];`
	`285`	`+ srcy[iy] = x0;`
	`286`	`+ ix += inc_x;`
	`287`	`+ iy += inc_y;`
	`288`	`+ i++;`
	`289`	`+ }`
	`290`	`+ }`
	`291`	`+ }`
`265`	`292`
`266`	`293`	`return (0);`
`267`	`294`	`}`