Skip to content

[WIP] kernel/zarch: Fix cscal and zscal #5284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 26 commits into from
+651 −24
Closed

[WIP] kernel/zarch: Fix cscal and zscal #5284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b23efc5
add handling of dummy2 flag
martin-frbg May 24, 2025
9df8834
Add files via upload
martin-frbg May 24, 2025
05ed745
Add files via upload
martin-frbg May 24, 2025
3c15061
Update cscal.c
martin-frbg May 24, 2025
1c3fcfd
Update cscal.c
martin-frbg May 24, 2025
2a17540
Update cscal.c
martin-frbg May 24, 2025
62d8047
Update cscal.c
martin-frbg May 24, 2025
234bba3
Update cscal.c
martin-frbg May 24, 2025
ef01810
Update cscal.c
martin-frbg May 24, 2025
7b91587
Update cscal.c
martin-frbg May 25, 2025
41cd46c
Update cscal.c
martin-frbg May 25, 2025
b100898
Update cscal.c
martin-frbg May 25, 2025
80bf765
Update cscal.c
martin-frbg May 25, 2025
a1efb03
Update cscal.c
martin-frbg May 25, 2025
3525667
Update cscal.c
martin-frbg May 25, 2025
344b14a
Update cscal.c
martin-frbg May 25, 2025
ae5bdb7
Update cscal.c
martin-frbg May 25, 2025
4f9be6d
Update cscal.c
martin-frbg May 25, 2025
184a527
Update cscal.c
martin-frbg May 25, 2025
c7285a1
Update cscal.c
martin-frbg May 25, 2025
e54f43b
Update cscal.c
martin-frbg May 25, 2025
16772ed
Update cscal.c
martin-frbg May 25, 2025
1b71694
handle dummy2 flag
martin-frbg May 25, 2025
decd97c
Update zscal.c
martin-frbg May 25, 2025
e1e5be5
Update zscal.c
martin-frbg May 25, 2025
f280f4d
Update zscal.c
martin-frbg May 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions interface/zscal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void CNAME(blasint n, FLOAT alpha_r, void *vx, blasint incx){
if (nthreads == 1) {
#endif

SCAL_K(n, 0, 0, alpha[0], alpha[1], x, incx, NULL, 0, NULL, 0);
SCAL_K(n, 0, 0, alpha[0], alpha[1], x, incx, NULL, 0, NULL, 1);

#ifdef SMP
} else {
Expand All @@ -108,7 +108,7 @@ void CNAME(blasint n, FLOAT alpha_r, void *vx, blasint incx){
mode = BLAS_SINGLE | BLAS_COMPLEX;
#endif

blas_level1_thread(mode, n, 0, 0, alpha, x, incx, NULL, 0, NULL, 0, (int (*)(void))SCAL_K, nthreads);
blas_level1_thread(mode, n, 0, 0, alpha, x, incx, NULL, 0, NULL, 1, (int (*)(void))SCAL_K, nthreads);

}
#endif
Expand Down
70 changes: 59 additions & 11 deletions kernel/zarch/cscal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i,
BLASLONG n1 = n & -2;

if (da_i == 0.0) {

if (dummy2 == 0) {
while (j < n1) {

x[i] = 0.0;
Expand All @@ -230,11 +230,43 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i,
j++;

}
} else {
while (j < n1) {
if (isnan(x[i]) || isinf(x[i]) || isnan(x[i+1])) {
x[i] = NAN;
x[i+1] = NAN;
}else{
x[i] = 0.0;
x[i + 1] = 0.0;
}
if (isnan(x[i+inc_x]) || isinf(x[i+inc_x]) || isnan(x[i+1+inc_x])) {
x[i + inc_x] = NAN;
x[i + 1 + inc_x] = NAN;
} else {
x[i + inc_x] = 0.0;
x[i + 1 + inc_x] = 0.0;
}
i += 2 * inc_x;
j += 2;

}

while (j < n) {
if (isnan(x[i]) || isinf(x[i]) || isnan(x[i+1])) {
x[i] = NAN;
x[i+1] = NAN;
}else{
x[i] = 0.0;
x[i + 1] = 0.0;
}
i += inc_x;
j++;
}
}
} else {

while (j < n1) {
if (isnan(x[i]) || isinf(x[i]))
if (isnan(x[i]) || isinf(x[i]))
temp0 = NAN;
else
temp0 = -da_i * x[i + 1];
Expand Down Expand Up @@ -276,7 +308,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i,

} else {

if (da_i == 0.0) {
if (da_i == 0.0 && dummy2) {
BLASLONG n1 = n & -2;

while (j < n1) {
Expand Down Expand Up @@ -335,12 +367,16 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i,
alpha[1] = da_i;

if (da_r == 0.0)
if (da_i == 0)
if (da_i == 0 && dummy2 == 0)
cscal_kernel_16_zero(n1, x);
else
else {
/* if (dummy2 == 0)
cscal_kernel_16_zero_r(n1, alpha, x);
else if (da_i == 0)
cscal_kernel_16_zero_i(n1, alpha, x);
else*/
cscal_kernel_16(n1, da_r, da_i, x);
}
/* else if (da_i == 0 && !isnan(da_r))
cscal_kernel_16/*_zero_i(n1, alpha, x);*/
else
cscal_kernel_16(n1, da_r, da_i, x);

Expand All @@ -354,7 +390,8 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i,
float res = 0.0;
if (isnan(da_r)) res = da_r;
while (j < n) {

if (dummy2)
if (isnan(x[i])|| isnan(x[i+1])) res=NAN;
x[i] = res;
x[i + 1] = res;
i += 2;
Expand Down Expand Up @@ -382,7 +419,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i,
x[i + 1] = da_i * x[i];
else
x[i + 1] = NAN;
if (x[i] == x[i])
if (!isnan(x[i]))
x[i] = temp0;
i += 2;
j++;
Expand All @@ -398,7 +435,18 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i,
while (j < n) {

temp0 = da_r * x[i];
x[i + 1] = da_r * x[i + 1];
if (dummy2) {
if (isnan(x[i])||isinf(x[i]))temp0 = NAN;
if (isnan(x[i+1])||isinf(x[i+1]))
x[i+1] = NAN;
else
x[i+1] = da_r * x[i + 1];
} else {
if (isnan(x[i]))
x[i + 1] = NAN;
else
x[i + 1] = da_r * x[i + 1];
}
x[i] = temp0;
i += 2;
j++;
Expand All @@ -411,7 +459,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i,

temp0 = da_r * x[i] - da_i * x[i + 1];
x[i + 1] = da_r * x[i + 1] + da_i * x[i];
x[i] = temp0;
if (!isnan(x[i])) x[i] = temp0;
i += 2;
j++;

Expand Down
63 changes: 52 additions & 11 deletions kernel/zarch/zscal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i,
BLASLONG n1 = n & -2;

if (da_i == 0.0) {

if (dummy2 == 0) {
while (j < n1) {

x[i] = 0.0;
Expand All @@ -228,7 +228,38 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i,
j++;

}

} else {
while (j < n1) {
if (isnan(x[i]) || isinf(x[i]) || isnan(x[i+1])) {
x[i] = NAN;
x[i+1] = NAN;
} else {
x[i] = 0.0;
x[i+1] = 0.0;
}
if (isnan(x[i+inc_x]) || isinf(x[i+inc_x]) || isnan(x[i+inc_x+1])) {
x[i + inc_x] = NAN;
x[i + inc_x + 1] = NAN;
} else {
x[i + inc_x] = 0.;
x[i + inc_x + 1] = 0.;
}
i += 2 * inc_x;
j += 2;
}

while (j < n) {
if (isnan(x[i]) || isinf(x[i]) || isnan(x[i+1])) {
x[i] = NAN;
x[i+1] = NAN;
} else {
x[i] = 0.;
x[i+1] = 0.;
}
i += inc_x;
j++;
}
}
} else {

while (j < n1) {
Expand Down Expand Up @@ -276,7 +307,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i,

} else {

if (da_i == 0.0) {
if (da_i == 0.0 && dummy2) {
BLASLONG n1 = n & -2;

while (j < n1) {
Expand Down Expand Up @@ -335,12 +366,10 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i,
alpha[1] = da_i;

if (da_r == 0.0)
if (da_i == 0)
if (da_i == 0 && dummy2 == 0)
zscal_kernel_8_zero(n1, x);
else
zscal_kernel_8(n1, da_r, da_i, x);
else if (da_i == 0 && da_r == da_r)
zscal_kernel_8_zero_i(n1, alpha, x);
else
zscal_kernel_8(n1, da_r, da_i, x);

Expand All @@ -354,7 +383,8 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i,
double res= 0.0;
if (isnan(da_r)) res = da_r;
while (j < n) {

if (dummy2)
if (isnan(x[i]) || isnan(x[i+1])) res = NAN;
x[i] = res;
x[i + 1] = res;
i += 2;
Expand All @@ -381,7 +411,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i,
x[i + 1] = da_i * x[i];
else
x[i + 1] = NAN;
if (x[i]==x[i])
if (!isnan(x[i]))
x[i] = temp0;
i += 2;
j++;
Expand All @@ -397,8 +427,19 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i,
while (j < n) {

temp0 = da_r * x[i];
x[i + 1] = da_r * x[i + 1];
x[i] = temp0;
if (dummy2) {
if (isnan(x[i]) || isinf(x[i])) temp0 = NAN;
if (isnan(x[i + 1]) || isinf(x[i + 1]))
x[i + 1] = NAN;
else
x[i + 1] = da_r * x[i + 1];
} else {
if (isnan(x[i]))
x[i + 1] = NAN;
else
x[i + 1] = da_r * x[i + 1];
}
x[i] = temp0;
i += 2;
j++;

Expand All @@ -410,7 +451,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i,

temp0 = da_r * x[i] - da_i * x[i + 1];
x[i + 1] = da_r * x[i + 1] + da_i * x[i];
x[i] = temp0;
if (!isnan(x[i])) x[i] = temp0;
i += 2;
j++;

Expand Down
Loading
Loading