Browse Source

Merge pull request #4497 from sergei-lewis/dev/slewis/zaxpy

Fix axpy test hangs when n==0. Reenable zaxpy_vector kernel for C910V.
tags/v0.3.27
Martin Kroeker GitHub 1 year ago
parent
commit
b1ae777afb
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
  1. +2
    -2
      kernel/riscv64/KERNEL.C910V
  2. +1
    -1
      kernel/riscv64/axpy_vector.c
  3. +4
    -4
      kernel/riscv64/zaxpy_vector.c

+ 2
- 2
kernel/riscv64/KERNEL.C910V View File

@@ -42,8 +42,8 @@ ZSUMKERNEL = ../arm/zsum.c

SAXPYKERNEL = axpy_vector.c
DAXPYKERNEL = axpy_vector.c
CAXPYKERNEL = zaxpy.c
ZAXPYKERNEL = zaxpy.c
CAXPYKERNEL = zaxpy_vector.c
ZAXPYKERNEL = zaxpy_vector.c

SAXPBYKERNEL = axpby_vector.c
DAXPBYKERNEL = axpby_vector.c


+ 1
- 1
kernel/riscv64/axpy_vector.c View File

@@ -65,7 +65,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x, BLAS
FLOAT_V_T vy0, vy1;
BLASLONG stride_x, stride_y;

if (n < 0) return(0);
if (n <= 0) return(0);
if (da == 0.0) return(0);

if (inc_x == 1 && inc_y == 1) {


+ 4
- 4
kernel/riscv64/zaxpy_vector.c View File

@@ -45,10 +45,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y, FLOAT *dummy, BLASLONG dummy2)
{
BLASLONG i = 0, j = 0;
BLASLONG ix = 0,iy = 0;
if(n < 0) return(0);
if(da_r == 0.0 && da_i == 0.0) return(0);
BLASLONG i = 0, j = 0;
BLASLONG ix = 0,iy = 0;
if(n <= 0) return(0);
if(da_r == 0.0 && da_i == 0.0) return(0);
unsigned int gvl = 0;
BLASLONG stride_x = inc_x * 2 * sizeof(FLOAT);
BLASLONG stride_y = inc_y * 2 * sizeof(FLOAT);


Loading…
Cancel
Save