floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4794 from XiWeiGu/Fixed_Numpy_CI_Test 

Try to fixed numpy ci test failures
This commit is contained in:
Martin Kroeker 2024-07-25 23:42:13 +02:00 committed by GitHub
parent a4e56e0452 34b80ce03f
commit 15c53dd2e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 677 additions and 336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
interface/scal.c
View File

@ -85,7 +85,7 @@ void CNAME(blasint n, FLOAT alpha, FLOAT *x, blasint incx){
if (nthreads == 1) { if (nthreads == 1) {
#endif #endif
SCAL_K(n, 0, 0, alpha, x, incx, NULL, 0, NULL, 0); SCAL_K(n, 0, 0, alpha, x, incx, NULL, 0, NULL, 1);
#ifdef SMP #ifdef SMP
} else { } else {
@ -102,7 +102,7 @@ void CNAME(blasint n, FLOAT alpha, FLOAT *x, blasint incx){
#else #else
&alpha, &alpha,
#endif #endif
x, incx, NULL, 0, NULL, 0, (int (*)(void))SCAL_K, nthreads); x, incx, NULL, 0, NULL, 1, (int (*)(void))SCAL_K, nthreads);
} }
#endif #endif

77
kernel/loongarch64/scal.S
View File

@ -53,9 +53,86 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PROLOGUE PROLOGUE
li.d TEMP, SIZE li.d TEMP, SIZE
ld.d XX, $sp, 0 // Load dummy2
slli.d XX, XX, BASE_SHIFT
MTC a1, $r0 MTC a1, $r0
slli.d INCX, INCX, BASE_SHIFT slli.d INCX, INCX, BASE_SHIFT
bge $r0, N, .L999 bge $r0, N, .L999
CMPEQ $fcc0, ALPHA, a1
bceqz $fcc0, .L50
beq XX, TEMP, .L50 // if dummp2 == 1, do not directly copy 0
srai.d I, N, 3
bne INCX, TEMP, .L20
bge $r0, I, .L15
.align 3
.L12:
ST a1, X, 0 * SIZE
ST a1, X, 1 * SIZE
ST a1, X, 2 * SIZE
ST a1, X, 3 * SIZE
ST a1, X, 4 * SIZE
ST a1, X, 5 * SIZE
ST a1, X, 6 * SIZE
ST a1, X, 7 * SIZE
addi.w I, I, -1
addi.d X, X, 8 * SIZE
blt $r0, I, .L12
.align 3
.L15:
andi I, N, 7
bge $r0, I, .L999
.align 3
.L16:
ST a1, X, 0 * SIZE
addi.d I, I, -1
addi.d X, X, SIZE
blt $r0, I, .L16
move $r4, $r17
fmov.d $f0, $f22
jirl $r0, $r1, 0x0
.align 3
.L20:
srai.d I, N, 3
bge $r0, I, .L25
.align 3
.L22:
ST a1, X, 0 * SIZE
add.d X, X, INCX
ST a1, X, 0 * SIZE
add.d X, X, INCX
ST a1, X, 0 * SIZE
add.d X, X, INCX
ST a1, X, 0 * SIZE
add.d X, X, INCX
ST a1, X, 0 * SIZE
add.d X, X, INCX
ST a1, X, 0 * SIZE
add.d X, X, INCX
ST a1, X, 0 * SIZE
add.d X, X, INCX
ST a1, X, 0 * SIZE
addi.d I, I, -1
add.d X, X, INCX
blt $r0, I, .L22
.align 3
.L25:
andi I, N, 7
bge $r0, I, .L999
.align 3
.L26:
addi.d I, I, -1
ST a1, X, 0 * SIZE
add.d X, X, INCX
blt $r0, I, .L26
move $r4, $r17
fmov.d $f0, $f22
jirl $r0, $r1, 0x0
.align 3
.L50: .L50:
srai.d I, N, 3 srai.d I, N, 3

79
kernel/loongarch64/scal_lasx.S
View File

@ -52,17 +52,21 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
bge $r0, N, .L999 bge $r0, N, .L999
bge $r0, INCX, .L999 bge $r0, INCX, .L999
li.d TEMP, 1 li.d TEMP, 1
ld.d t1, $sp, 0 // Load dummp2
movgr2fr.d a1, $r0 movgr2fr.d a1, $r0
FFINT a1, a1 FFINT a1, a1
movgr2fr.d a2, TEMP movgr2fr.d a2, TEMP
FFINT a2, a2 FFINT a2, a2
slli.d TEMP, TEMP, BASE_SHIFT slli.d TEMP, TEMP, BASE_SHIFT
slli.d INCX, INCX, BASE_SHIFT slli.d INCX, INCX, BASE_SHIFT
slli.d t1, t1, BASE_SHIFT
CMPEQ $fcc0, ALPHA, a1
bcnez $fcc0, .L20 //ALPHA==0
CMPEQ $fcc0, ALPHA, a2 CMPEQ $fcc0, ALPHA, a2
bcnez $fcc0, .L999 //ALPHA==1 return bcnez $fcc0, .L999 //ALPHA==1 return
.L1:
srai.d I, N, 3 srai.d I, N, 3
beq INCX, TEMP, .L30 //ALPHA!=1 and INCX==1 beq INCX, TEMP, .L30 //ALPHA !=0|1 and INCX==1
MTG TEMP, ALPHA MTG TEMP, ALPHA
#ifdef DOUBLE #ifdef DOUBLE
xvreplgr2vr.d VALPHA, TEMP xvreplgr2vr.d VALPHA, TEMP
@ -72,7 +76,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
move XX, X move XX, X
.align 3 .align 3
.L10: //ALPHA!=1 and INCX!=1 .L10: //ALPHA !=0|1 and INCX!=1
bge $r0, I, .L32 bge $r0, I, .L32
.align 3 .align 3
.L11: .L11:
@ -165,6 +169,75 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
blt $r0, I, .L11 blt $r0, I, .L11
b .L32 b .L32
.align 3 .align 3
.L20:
beq t1, TEMP, .L1 // if dummp2 == 1, do not directly copy 0
srai.d I, N, 3
beq INCX, TEMP, .L24
bge $r0, I, .L22
.align 3
.L21:
ST a1, X, 0
add.d X, X, INCX
ST a1, X, 0
add.d X, X, INCX
ST a1, X, 0
add.d X, X, INCX
ST a1, X, 0
add.d X, X, INCX
ST a1, X, 0
add.d X, X, INCX
ST a1, X, 0
add.d X, X, INCX
ST a1, X, 0
add.d X, X, INCX
ST a1, X, 0
add.d X, X, INCX
addi.d I, I, -1
blt $r0, I, .L21
.align 3
.L22:
andi I, N, 7
bge $r0, I, .L999
.align 3
.L23:
ST a1, X, 0 * SIZE
addi.d I, I, -1
add.d X, X, INCX
blt $r0, I, .L23
jirl $r0, $r1, 0
.align 3
.L24:
bge $r0, I, .L26 /*N<8 INCX==1*/
.align 3
.L25:
xvxor.v VX0, VX0, VX0
xvst VX0, X, 0 * SIZE
#ifdef DOUBLE
xvst VX0, X, 4 * SIZE
#endif
addi.d I, I, -1
addi.d X, X, 8 * SIZE
blt $r0, I, .L25
.align 3
.L26:
andi I, N, 7
bge $r0, I, .L999
.align 3
.L27:
ST a1, X, 0 * SIZE
addi.d I, I, -1
addi.d X, X, SIZE
blt $r0, I, .L27
jirl $r0, $r1, 0
.align 3
.L30: .L30:
bge $r0, I, .L32/*N<8 INCX==1*/ bge $r0, I, .L32/*N<8 INCX==1*/
MTG TEMP, ALPHA MTG TEMP, ALPHA

82
kernel/loongarch64/scal_lsx.S
View File

@ -51,6 +51,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
bge $r0, N, .L999 bge $r0, N, .L999
bge $r0, INCX, .L999 bge $r0, INCX, .L999
ld.d t1, $sp, 0 // Load dummy2
li.d TEMP, 1 li.d TEMP, 1
movgr2fr.d a1, $r0 movgr2fr.d a1, $r0
FFINT a1, a1 FFINT a1, a1
@ -58,10 +59,14 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
FFINT a2, a2 FFINT a2, a2
slli.d TEMP, TEMP, BASE_SHIFT slli.d TEMP, TEMP, BASE_SHIFT
slli.d INCX, INCX, BASE_SHIFT slli.d INCX, INCX, BASE_SHIFT
slli.d t1, t1, BASE_SHIFT
CMPEQ $fcc0, ALPHA, a1
bcnez $fcc0, .L20 //ALPHA==0
CMPEQ $fcc0, ALPHA, a2 CMPEQ $fcc0, ALPHA, a2
bcnez $fcc0, .L999 //ALPHA==1 return bcnez $fcc0, .L999 //ALPHA==1 return
.L1:
srai.d I, N, 3 srai.d I, N, 3
beq INCX, TEMP, .L30 //ALPHA!=1 and INCX==1 beq INCX, TEMP, .L30 //ALPHA !=0|1 and INCX==1
MTG TEMP, ALPHA MTG TEMP, ALPHA
#ifdef DOUBLE #ifdef DOUBLE
vreplgr2vr.d VALPHA, TEMP vreplgr2vr.d VALPHA, TEMP
@ -71,7 +76,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
move XX, X move XX, X
.align 3 .align 3
.L10: //ALPHA!=1 and INCX!=1 .L10: //ALPHA !=0|1 and INCX!=1
bge $r0, I, .L32 bge $r0, I, .L32
.align 3 .align 3
@ -169,6 +174,79 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
b .L32 b .L32
.align 3 .align 3
.L20:
beq t1, TEMP, .L1 // if dummp2 == 1, do not directly copy 0
srai.d I, N, 3
beq INCX, TEMP, .L24
bge $r0, I, .L22
.align 3
.L21:
ST a1, X, 0
add.d X, X, INCX
ST a1, X, 0
add.d X, X, INCX
ST a1, X, 0
add.d X, X, INCX
ST a1, X, 0
add.d X, X, INCX
ST a1, X, 0
add.d X, X, INCX
ST a1, X, 0
add.d X, X, INCX
ST a1, X, 0
add.d X, X, INCX
ST a1, X, 0
add.d X, X, INCX
addi.d I, I, -1
blt $r0, I, .L21
.align 3
.L22:
andi I, N, 7
bge $r0, I, .L999
.align 3
.L23:
ST a1, X, 0 * SIZE
addi.d I, I, -1
add.d X, X, INCX
blt $r0, I, .L23
jirl $r0, $r1, 0
.align 3
.L24:
bge $r0, I, .L26 /*N<8 INCX==1*/
.align 3
.L25:
vxor.v VX0, VX0, VX0
vst VX0, X, 0 * SIZE
#ifdef DOUBLE
vst VX0, X, 2 * SIZE
vst VX0, X, 4 * SIZE
vst VX0, X, 6 * SIZE
#else
vst VX0, X, 4 * SIZE
#endif
addi.d I, I, -1
addi.d X, X, 8 * SIZE
blt $r0, I, .L25
.align 3
.L26:
andi I, N, 7
bge $r0, I, .L999
.align 3
.L27:
ST a1, X, 0 * SIZE
addi.d I, I, -1
addi.d X, X, SIZE
blt $r0, I, .L27
jirl $r0, $r1, 0
.align 3
.L30: .L30:
bge $r0, I, .L32/*N<8 INCX==1*/ bge $r0, I, .L32/*N<8 INCX==1*/
MTG TEMP, ALPHA MTG TEMP, ALPHA

12
kernel/mips/dscal_msa.c
View File

@ -42,7 +42,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x,
if (1 == inc_x) if (1 == inc_x)
{ {
if (0) //if (0.0 == da ) if (0.0 == da && !dummy2)
{ {
v2f64 zero_v = {0.0, 0.0}; v2f64 zero_v = {0.0, 0.0};
@ -240,14 +240,12 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x,
} }
else else
{ {
if (da == 0.0) if (da == 0.0 && !dummy2)
{ {
for (i = n; i--;) for (i = n; i--;)
{ {
if (isfinite(*x)) *x = 0.0;
*x = 0.0;
else
*x = NAN;
x += inc_x; x += inc_x;
} }
} }

41
kernel/mips/scal.c
View File

@ -29,27 +29,34 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y, FLOAT *dummy, BLASLONG dummy2) int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y, FLOAT *dummy, BLASLONG dummy2)
{ {
BLASLONG i=0,j=0; BLASLONG i = 0, j = 0;
while(j < n) // Resolved issue 4728 when the caller is {s/d}scal
{ if (da == 0.0 && dummy2 == 1)
{
while(j < n)
{
x[i] = da * x[i] ;
if ( da == 0.0 ) i += inc_x ;
if (isnan(x[i])||isinf(x[i])) j++;
x[i]=NAN; }
else }
x[i]=0.0; else
else if (isnan(da)) {
x[i]=NAN; while(j < n)
else {
x[i] = da * x[i] ;
i += inc_x ; if ( da == 0.0 )
j++; x[i] = 0.0;
else
} x[i] = da * x[i] ;
return 0;
i += inc_x ;
j++;
}
}
return 0;
} }

9
kernel/mips/sscal_msa.c
View File

@ -42,7 +42,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x,
if (1 == inc_x) if (1 == inc_x)
{ {
if (0) // if (0.0 == da) if (0.0 == da && !dummy2)
{ {
v4f32 zero_v = {0.0, 0.0, 0.0, 0.0}; v4f32 zero_v = {0.0, 0.0, 0.0, 0.0};
@ -255,14 +255,11 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x,
} }
else else
{ {
if (0.0 == da) if (0.0 == da && !dummy2)
{ {
for (i = n; i--;) for (i = n; i--;)
{ {
if (isfinite(*x)) *x = 0;
*x = 0;
else
*x = NAN;
x += inc_x; x += inc_x;
} }
} }

9
kernel/mips64/scal.S
View File

@ -48,6 +48,7 @@
#define TEMP $3 #define TEMP $3
#define XX $5 #define XX $5
#define DUMMY2 $6
#define ALPHA $f15 #define ALPHA $f15
@ -73,13 +74,13 @@
blez N, .L999 blez N, .L999
dsll INCX, INCX, BASE_SHIFT dsll INCX, INCX, BASE_SHIFT
CMPEQ $fcc0, ALPHA, a1 CMPEQ $fcc0, ALPHA, a1
NOP LDARG DUMMY2, 8($sp)
bc1f $fcc0, .L50 bc1f $fcc0, .L50
NOP dsll DUMMY2, DUMMY2, BASE_SHIFT
bc1t $fcc0, .L50 beq DUMMY2, TEMP, .L50 // If dummy2 == 1, do not directly copy 0
NOP NOP
bne INCX, TEMP, .L20 bne INCX, TEMP, .L20

302
kernel/x86_64/dscal.c
View File

@ -43,21 +43,21 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
static void dscal_kernel_8( BLASLONG n, FLOAT *da , FLOAT *x ) static void dscal_kernel_8( BLASLONG n, FLOAT *da , FLOAT *x )
{ {
BLASLONG i; BLASLONG i;
FLOAT alpha = *da; FLOAT alpha = *da;
for( i=0; i<n; i+=8 ) for( i=0; i<n; i+=8 )
{ {
x[0] *= alpha; x[0] *= alpha;
x[1] *= alpha; x[1] *= alpha;
x[2] *= alpha; x[2] *= alpha;
x[3] *= alpha; x[3] *= alpha;
x[4] *= alpha; x[4] *= alpha;
x[5] *= alpha; x[5] *= alpha;
x[6] *= alpha; x[6] *= alpha;
x[7] *= alpha; x[7] *= alpha;
x+=8; x+=8;
} }
} }
@ -65,19 +65,19 @@ static void dscal_kernel_8( BLASLONG n, FLOAT *da , FLOAT *x )
static void dscal_kernel_8_zero( BLASLONG n, FLOAT *alpha , FLOAT *x ) static void dscal_kernel_8_zero( BLASLONG n, FLOAT *alpha , FLOAT *x )
{ {
BLASLONG i; BLASLONG i;
for( i=0; i<n; i+=8 ) for( i=0; i<n; i+=8 )
{ {
x[0] = 0.0; x[0] = 0.0;
x[1] = 0.0; x[1] = 0.0;
x[2] = 0.0; x[2] = 0.0;
x[3] = 0.0; x[3] = 0.0;
x[4] = 0.0; x[4] = 0.0;
x[5] = 0.0; x[5] = 0.0;
x[6] = 0.0; x[6] = 0.0;
x[7] = 0.0; x[7] = 0.0;
x+=8; x+=8;
} }
} }
@ -89,51 +89,51 @@ static void dscal_kernel_inc_8(BLASLONG n, FLOAT *alpha, FLOAT *x, BLASLONG inc_
static void dscal_kernel_inc_8(BLASLONG n, FLOAT *alpha, FLOAT *x, BLASLONG inc_x) static void dscal_kernel_inc_8(BLASLONG n, FLOAT *alpha, FLOAT *x, BLASLONG inc_x)
{ {
FLOAT *x1=NULL; FLOAT *x1=NULL;
BLASLONG inc_x3; BLASLONG inc_x3;
inc_x <<= 3; inc_x <<= 3;
inc_x3 = (inc_x << 1) + inc_x; inc_x3 = (inc_x << 1) + inc_x;
__asm__ __volatile__ __asm__ __volatile__
( (
"movddup (%3), %%xmm0 \n\t" // alpha "movddup (%3), %%xmm0 \n\t" // alpha
"leaq (%1,%4,4), %2 \n\t" "leaq (%1,%4,4), %2 \n\t"
".p2align 4 \n\t" ".p2align 4 \n\t"
"1: \n\t" "1: \n\t"
"movsd (%1) , %%xmm4 \n\t" "movsd (%1) , %%xmm4 \n\t"
"movhpd (%1,%4,1), %%xmm4 \n\t" "movhpd (%1,%4,1), %%xmm4 \n\t"
"movsd (%1,%4,2), %%xmm5 \n\t" "movsd (%1,%4,2), %%xmm5 \n\t"
"movhpd (%1,%5,1), %%xmm5 \n\t" "movhpd (%1,%5,1), %%xmm5 \n\t"
"movsd (%2) , %%xmm6 \n\t" "movsd (%2) , %%xmm6 \n\t"
"movhpd (%2,%4,1), %%xmm6 \n\t" "movhpd (%2,%4,1), %%xmm6 \n\t"
"movsd (%2,%4,2), %%xmm7 \n\t" "movsd (%2,%4,2), %%xmm7 \n\t"
"movhpd (%2,%5,1), %%xmm7 \n\t" "movhpd (%2,%5,1), %%xmm7 \n\t"
"mulpd %%xmm0, %%xmm4 \n\t" "mulpd %%xmm0, %%xmm4 \n\t"
"mulpd %%xmm0, %%xmm5 \n\t" "mulpd %%xmm0, %%xmm5 \n\t"
"mulpd %%xmm0, %%xmm6 \n\t" "mulpd %%xmm0, %%xmm6 \n\t"
"mulpd %%xmm0, %%xmm7 \n\t" "mulpd %%xmm0, %%xmm7 \n\t"
"movsd %%xmm4 , (%1) \n\t" "movsd %%xmm4 , (%1) \n\t"
"movhpd %%xmm4 , (%1,%4,1) \n\t" "movhpd %%xmm4 , (%1,%4,1) \n\t"
"movsd %%xmm5 , (%1,%4,2) \n\t" "movsd %%xmm5 , (%1,%4,2) \n\t"
"movhpd %%xmm5 , (%1,%5,1) \n\t" "movhpd %%xmm5 , (%1,%5,1) \n\t"
"movsd %%xmm6 , (%2) \n\t" "movsd %%xmm6 , (%2) \n\t"
"movhpd %%xmm6 , (%2,%4,1) \n\t" "movhpd %%xmm6 , (%2,%4,1) \n\t"
"movsd %%xmm7 , (%2,%4,2) \n\t" "movsd %%xmm7 , (%2,%4,2) \n\t"
"movhpd %%xmm7 , (%2,%5,1) \n\t" "movhpd %%xmm7 , (%2,%5,1) \n\t"
"leaq (%1,%4,8), %1 \n\t" "leaq (%1,%4,8), %1 \n\t"
"leaq (%2,%4,8), %2 \n\t" "leaq (%2,%4,8), %2 \n\t"
"subq $8, %0 \n\t" "subq $8, %0 \n\t"
"jnz 1b \n\t" "jnz 1b \n\t"
: :
"+r" (n), // 0 "+r" (n), // 0
@ -150,106 +150,96 @@ static void dscal_kernel_inc_8(BLASLONG n, FLOAT *alpha, FLOAT *x, BLASLONG inc_
"%xmm12", "%xmm13", "%xmm14", "%xmm15", "%xmm12", "%xmm13", "%xmm14", "%xmm15",
"memory" "memory"
); );
} }
int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y, FLOAT *dummy, BLASLONG dummy2) int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y, FLOAT *dummy, BLASLONG dummy2)
{ {
BLASLONG i=0,j=0; BLASLONG i = 0, j = 0;
if ( inc_x != 1 ) // Resolved issue 4728 when the caller is dscal
{ if (dummy2 == 1 && da == 0.0)
{
if ( da == 0.0 ) if ( inc_x != 1 )
{ {
BLASLONG n1 = n & -8;
BLASLONG n1 = n & -2; if ( n1 > 0 )
{
while(j < n1) dscal_kernel_inc_8(n1, &da, x, inc_x);
{ i = n1 * inc_x;
j = n1;
if (isinf(x[i])||isnan(x[i])) }
x[i]=NAN; while(j < n)
else x[i]=0.0; {
if (isinf(x[i+inc_x])||isnan(x[i+inc_x])) x[i] *= da;
x[i+inc_x]=NAN; i += inc_x ;
else x[i+inc_x]=0.0; j++;
i += 2*inc_x ; }
j+=2; }
else
} {
BLASLONG n1 = n & -8;
while(j < n) if ( n1 > 0)
{ dscal_kernel_8(n1 , &da , x);
for ( i = n1 ; i < n; i++ )
if (isinf(x[i])||isnan(x[i])) x[i] *= da;
x[i]=NAN; }
else x[i]=0.0; }
i += inc_x ; else
j++; {
if ( inc_x != 1 )
} {
} if( da == 0.0)
else {
{ BLASLONG n1 = n & -2;
while(j < n1)
BLASLONG n1 = n & -8; {
if ( n1 > 0 ) x[i] = 0.0;
{ x[i+inc_x] = 0.0;
dscal_kernel_inc_8(n1, &da, x, inc_x); i += 2 * inc_x ;
i = n1 * inc_x; j += 2;
j = n1; }
} while(j < n)
{
while(j < n) x[i] = 0.0;
{ i += inc_x ;
j++;
x[i] *= da; }
i += inc_x ; }
j++; else
{
} BLASLONG n1 = n & -8;
if ( n1 > 0 )
} {
dscal_kernel_inc_8(n1, &da, x, inc_x);
return(0); i = n1 * inc_x;
} j = n1;
}
BLASLONG n1 = n & -8; while(j < n)
if ( n1 > 0 ) {
{ x[i] *= da;
// if ( da == 0.0 ) i += inc_x ;
// dscal_kernel_8_zero(n1 , &da , x); j++;
// else }
dscal_kernel_8(n1 , &da , x); }
} }
else
if ( da == 0.0 ) {
{ if ( da == 0.0 )
for ( i=n1 ; i<n; i++ ) {
{ BLASLONG n1 = n & -8;
if(isinf(x[i])||isnan(x[i])) if ( n1 > 0)
x[i]=NAN; dscal_kernel_8_zero(n1, &da, x);
else x[i] = 0.0; for ( i = n1 ; i < n; i++ )
} x[i] = 0.0;
} }
else if (isinf(da)){ else
for ( i=n1 ; i<n; i++) {
if (x[i]==0.) x[i]=NAN; BLASLONG n1 = n & -8;
else x[i] *=da; if ( n1 > 0)
} dscal_kernel_8(n1 , &da , x);
else for ( i = n1 ; i < n; i++ )
{ x[i] *= da;
}
for ( i=n1 ; i<n; i++ ) }
{ }
if(isinf(x[i]))
x[i]=NAN;
else x[i] *= da;
}
}
return(0);
} }

269
kernel/x86_64/sscal.c
View File

@ -39,21 +39,21 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
static void sscal_kernel_16( BLASLONG n, FLOAT *da , FLOAT *x ) static void sscal_kernel_16( BLASLONG n, FLOAT *da , FLOAT *x )
{ {
BLASLONG i; BLASLONG i;
FLOAT alpha = *da; FLOAT alpha = *da;
for( i=0; i<n; i+=8 ) for( i=0; i<n; i+=8 )
{ {
x[0] *= alpha; x[0] *= alpha;
x[1] *= alpha; x[1] *= alpha;
x[2] *= alpha; x[2] *= alpha;
x[3] *= alpha; x[3] *= alpha;
x[4] *= alpha; x[4] *= alpha;
x[5] *= alpha; x[5] *= alpha;
x[6] *= alpha; x[6] *= alpha;
x[7] *= alpha; x[7] *= alpha;
x+=8; x+=8;
} }
} }
@ -61,19 +61,19 @@ static void sscal_kernel_16( BLASLONG n, FLOAT *da , FLOAT *x )
static void sscal_kernel_16_zero( BLASLONG n, FLOAT *alpha , FLOAT *x ) static void sscal_kernel_16_zero( BLASLONG n, FLOAT *alpha , FLOAT *x )
{ {
BLASLONG i; BLASLONG i;
for( i=0; i<n; i+=8 ) for( i=0; i<n; i+=8 )
{ {
x[0] = 0.0; x[0] = 0.0;
x[1] = 0.0; x[1] = 0.0;
x[2] = 0.0; x[2] = 0.0;
x[3] = 0.0; x[3] = 0.0;
x[4] = 0.0; x[4] = 0.0;
x[5] = 0.0; x[5] = 0.0;
x[6] = 0.0; x[6] = 0.0;
x[7] = 0.0; x[7] = 0.0;
x+=8; x+=8;
} }
} }
@ -85,126 +85,119 @@ static void sscal_kernel_inc_8(BLASLONG n, FLOAT *alpha, FLOAT *x, BLASLONG inc_
static void sscal_kernel_inc_8(BLASLONG n, FLOAT *alpha, FLOAT *x, BLASLONG inc_x) static void sscal_kernel_inc_8(BLASLONG n, FLOAT *alpha, FLOAT *x, BLASLONG inc_x)
{ {
BLASLONG i; BLASLONG i;
BLASLONG inc_x2 = 2 * inc_x; BLASLONG inc_x2 = 2 * inc_x;
BLASLONG inc_x3 = inc_x2 + inc_x; BLASLONG inc_x3 = inc_x2 + inc_x;
FLOAT t0,t1,t2,t3; FLOAT t0,t1,t2,t3;
FLOAT da = alpha[0]; FLOAT da = alpha[0];
for ( i=0; i<n; i+=4 ) for ( i=0; i<n; i+=4 )
{ {
t0 = da * x[0]; t0 = da * x[0];
t1 = da * x[inc_x]; t1 = da * x[inc_x];
t2 = da * x[inc_x2]; t2 = da * x[inc_x2];
t3 = da * x[inc_x3]; t3 = da * x[inc_x3];
x[0] = t0; x[0] = t0;
x[inc_x] = t1; x[inc_x] = t1;
x[inc_x2] = t2; x[inc_x2] = t2;
x[inc_x3] = t3; x[inc_x3] = t3;
x+=4*inc_x; x+=4*inc_x;
} }
} }
int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y, FLOAT *dummy, BLASLONG dummy2) int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y, FLOAT *dummy, BLASLONG dummy2)
{ {
BLASLONG i=0,j=0; BLASLONG i = 0, j = 0;
if ( inc_x != 1 ) // Resolved issue 4728 when the caller is sscal
{ if (dummy2 == 1 && da == 0.0)
{
if ( da == 0.0 ) if ( inc_x != 1 )
{ {
BLASLONG n1 = n & -2; BLASLONG n1 = n & -8;
if ( n1 > 0 )
while(j < n1) {
{ sscal_kernel_inc_8(n1, &da, x, inc_x);
if (isinf(x[i])||isnan(x[i])) i = n1 * inc_x;
x[i]=NAN; j = n1;
else x[i]=0.0; }
if (isinf(x[i+inc_x])||isnan(x[i+inc_x])) while(j < n)
x[i+inc_x]=NAN; {
else x[i+inc_x]=0.0; x[i] *= da;
i += 2*inc_x ; i += inc_x ;
j+=2; j++;
}
} }
else
while(j < n) {
{ BLASLONG n1 = n & -16;
if (isinf(x[i])||isnan(x[i])) if ( n1 > 0)
x[i]=NAN; sscal_kernel_16(n1 , &da , x);
else x[i]=0.0; for ( i = n1 ; i < n; i++ )
i += inc_x ; x[i] *= da;
j++; }
}
} else
} {
else if ( inc_x != 1 )
{ {
#if 1 if( da == 0.0)
BLASLONG n1 = n & -8; {
if ( n1 > 0 ) BLASLONG n1 = n & -2;
{ while(j < n1)
sscal_kernel_inc_8(n1, &da, x, inc_x); {
i = n1 * inc_x; x[i] = 0.0;
j = n1; x[i+inc_x] = 0.0;
} i += 2 * inc_x ;
#endif j += 2;
while(j < n) }
{ while(j < n)
x[i] *= da; {
i += inc_x ; x[i] = 0.0;
j++; i += inc_x ;
j++;
} }
}
} else
return(0); {
} BLASLONG n1 = n & -8;
if ( n1 > 0 )
BLASLONG n1 = n & -16; {
if ( n1 > 0 ) sscal_kernel_inc_8(n1, &da, x, inc_x);
{ i = n1 * inc_x;
//if ( da == 0.0 ) j = n1;
// sscal_kernel_16_zero(n1 , &da , x); }
//else while(j < n)
sscal_kernel_16(n1 , &da , x); {
} x[i] *= da;
i += inc_x ;
if ( da == 0.0 ) j++;
{ }
for ( i=n1 ; i<n; i++ ) }
{ }
if (isinf(x[i])||isnan(x[i])) else
x[i]=NAN; {
else x[i]=0.0; if ( da == 0.0 )
} {
} BLASLONG n1 = n & -16;
else if ( isinf(da) ) if ( n1 > 0)
{ sscal_kernel_16_zero(n1, &da, x);
for ( i=n1 ; i<n; i++ ) for ( i = n1 ; i < n; i++ )
{ x[i] = 0.0;
if (x[i] == 0.0) }
x[i]=NAN; else
else x[i] *= da; {
} BLASLONG n1 = n & -16;
} if ( n1 > 0)
else sscal_kernel_16(n1 , &da , x);
{ for ( i = n1 ; i < n; i++ )
x[i] *= da;
for ( i=n1 ; i<n; i++ ) }
{ }
if (isinf(x[i])) }
x[i]=NAN;
else x[i] *= da;
}
}
return(0);
} }

1
utest/CMakeLists.txt
View File

@ -18,6 +18,7 @@ else ()
test_zscal.c test_zscal.c
test_amin.c test_amin.c
test_axpby.c test_axpby.c
test_gemv.c
) )
endif () endif ()

2
utest/Makefile
View File

@ -14,7 +14,7 @@ UTESTEXTBIN=openblas_utest_ext
include $(TOPDIR)/Makefile.system include $(TOPDIR)/Makefile.system
OBJS=utest_main.o test_min.o test_amax.o test_ismin.o test_rotmg.o test_axpy.o test_dotu.o test_dsdot.o test_swap.o test_rot.o test_dnrm2.o test_zscal.o \ OBJS=utest_main.o test_min.o test_amax.o test_ismin.o test_rotmg.o test_axpy.o test_dotu.o test_dsdot.o test_swap.o test_rot.o test_dnrm2.o test_zscal.o \
test_amin.o test_axpby.o test_amin.o test_axpby.o test_gemv.o
#test_rot.o test_swap.o test_axpy.o test_dotu.o test_dsdot.o test_fork.o #test_rot.o test_swap.o test_axpy.o test_dotu.o test_dsdot.o test_fork.o
OBJS_EXT=utest_main.o $(DIR_EXT)/xerbla.o $(DIR_EXT)/common.o OBJS_EXT=utest_main.o $(DIR_EXT)/xerbla.o $(DIR_EXT)/common.o
OBJS_EXT+=$(DIR_EXT)/test_isamin.o $(DIR_EXT)/test_idamin.o $(DIR_EXT)/test_icamin.o $(DIR_EXT)/test_izamin.o OBJS_EXT+=$(DIR_EXT)/test_isamin.o $(DIR_EXT)/test_idamin.o $(DIR_EXT)/test_icamin.o $(DIR_EXT)/test_izamin.o

126
utest/test_gemv.c Normal file
View File

@ -0,0 +1,126 @@
#include "openblas_utest.h"
#include <cblas.h>
#ifndef NAN
#define NAN 0.0/0.0
#endif
#ifndef INFINITY
#define INFINITY 1.0/0.0
#endif
#ifdef BUILD_SINGLE
CTEST(sgemv, 0_nan_inf)
{
blasint N = 17;
blasint incX = 1;
blasint incY = 1;
float alpha = 0.0;
float beta = 0.0;
char trans = 'N';
float A[N * N];
float X[N];
float Y[N];
memset(A, 0, sizeof(A));
memset(X, 0, sizeof(X));
for (int i = 0; i < (N - 1); i += 2)
{
Y[i] = NAN;
Y[i + 1] = INFINITY;
}
Y[N - 1] = NAN;
BLASFUNC(sgemv)(&trans, &N, &N, &alpha, A, &N, X, &incX, &beta, Y, &incY);
for (int i = 0; i < N; i ++)
ASSERT_TRUE(Y[i] == 0.0);
}
CTEST(sgemv, 0_nan_inf_incy_2)
{
blasint N = 17;
blasint Ny = 33;
blasint incX = 1;
blasint incY = 2;
float alpha = 0.0;
float beta = 0.0;
char trans = 'N';
float A[N * N];
float X[N];
float Y[Ny];
float *ay = Y;
memset(A, 0, sizeof(A));
memset(X, 0, sizeof(X));
memset(Y, 0, sizeof(Y));
for (int i = 0; i < (N - 1); i += 2)
{
ay[0] = NAN;
ay += 2;
ay[0] = INFINITY;
ay += 2;
}
Y[Ny - 1] = NAN;
BLASFUNC(sgemv)(&trans, &N, &N, &alpha, A, &N, X, &incX, &beta, Y, &incY);
for (int i = 0; i < Ny; i ++)
ASSERT_TRUE(Y[i] == 0.0);
}
#endif
#ifdef BUILD_DOUBLE
CTEST(dgemv, 0_nan_inf)
{
blasint N = 17;
blasint incX = 1;
blasint incY = 1;
double alpha = 0.0;
double beta = 0.0;
char trans = 'N';
double A[N * N];
double X[N];
double Y[N];
memset(A, 0, sizeof(A));
memset(X, 0, sizeof(X));
for (int i = 0; i < (N - 1); i += 2)
{
Y[i] = NAN;
Y[i + 1] = INFINITY;
}
Y[N - 1] = NAN;
BLASFUNC(dgemv)(&trans, &N, &N, &alpha, A, &N, X, &incX, &beta, Y, &incY);
for (int i = 0; i < N; i ++)
ASSERT_TRUE(Y[i] == 0.0);
}
CTEST(dgemv, 0_nan_inf_incy_2)
{
blasint N = 17;
blasint Ny = 33;
blasint incX = 1;
blasint incY = 2;
double alpha = 0.0;
double beta = 0.0;
char trans = 'N';
double A[N * N];
double X[N];
double Y[Ny];
double *ay = Y;
memset(A, 0, sizeof(A));
memset(X, 0, sizeof(X));
memset(Y, 0, sizeof(Y));
for (int i = 0; i < (N - 1); i += 2)
{
ay[0] = NAN;
ay += 2;
ay[0] = INFINITY;
ay += 2;
}
Y[Ny - 1] = NAN;
BLASFUNC(dgemv)(&trans, &N, &N, &alpha, A, &N, X, &incX, &beta, Y, &incY);
for (int i = 0; i < Ny; i ++)
ASSERT_TRUE(Y[i] == 0.0);
}
#endif