Skip to content

Commit b78740b

Browse files
committed
Fix implementation of iamax_sse.S as reported in #2116.
The was a typo in iamax_sse.S where one of the comparison was cmpeqps instead of cmpeqss. That misdetected index for sequences where the minimum value was 0.
1 parent 8a9e9a8 commit b78740b

File tree

6 files changed

+100
-9
lines changed

6 files changed

+100
-9
lines changed

kernel/x86_64/KERNEL

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ IXAMAXKERNEL = izamax.S
171171
endif
172172

173173
ifndef ISAMINKERNEL
174-
ISAMINKERNEL = iamax.S
174+
ISAMINKERNEL = iamax_sse.S
175175
endif
176176

177177
ifndef IDAMINKERNEL
@@ -207,7 +207,7 @@ IQMAXKERNEL = iamax.S
207207
endif
208208

209209
ifndef ISMINKERNEL
210-
ISMINKERNEL = iamax.S
210+
ISMINKERNEL = iamax_sse.S
211211
endif
212212

213213
ifndef IDMINKERNEL

kernel/x86_64/iamax_sse.S

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@
3636
/* or implied, of The University of Texas at Austin. */
3737
/*********************************************************************/
3838

39-
/* This kernel was found to give wrong results when used for ISMIN/ISAMIN
40-
with increment != 1, although it appears to be correct for corresponding
41-
MAX operations. See issue 2116 */
42-
4339
#define ASSEMBLER
4440
#include "common.h"
4541

@@ -863,7 +859,7 @@
863859
#ifdef USE_ABS
864860
andps %xmm15, %xmm5
865861
#endif
866-
cmpeqps %xmm0, %xmm5
862+
cmpeqss %xmm0, %xmm5
867863

868864
movss 0 * SIZE(X), %xmm6
869865
addq INCX, X

utest/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ else ()
77
set(OpenBLAS_utest_src
88
utest_main.c
99
test_amax.c
10+
test_ismin.c
1011
test_rotmg.c
1112
test_rot.c
1213
test_axpy.c

utest/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ UTESTBIN=openblas_utest
1111

1212
include $(TOPDIR)/Makefile.system
1313

14-
OBJS=utest_main.o test_amax.o test_rotmg.o test_axpy.o test_dotu.o test_dsdot.o test_swap.o test_rot.o
14+
OBJS=utest_main.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
1515
#test_rot.o test_swap.o test_axpy.o test_dotu.o test_dsdot.o test_fork.o
1616

1717
ifneq ($(NO_LAPACK), 1)

utest/test_ismin.c

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
/*****************************************************************************
2+
Copyright (c) 2020, The OpenBLAS Project
3+
All rights reserved.
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions are
7+
met:
8+
9+
1. Redistributions of source code must retain the above copyright
10+
notice, this list of conditions and the following disclaimer.
11+
12+
2. Redistributions in binary form must reproduce the above copyright
13+
notice, this list of conditions and the following disclaimer in
14+
the documentation and/or other materials provided with the
15+
distribution.
16+
3. Neither the name of the OpenBLAS project nor the names of
17+
its contributors may be used to endorse or promote products
18+
derived from this software without specific prior written
19+
permission.
20+
21+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
22+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
23+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
24+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
25+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
27+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
28+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
29+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
30+
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31+
32+
**********************************************************************************/
33+
34+
#include "openblas_utest.h"
35+
36+
#define ELEMENTS 50
37+
#define INCREMENT 2
38+
39+
CTEST(ismin, step_2){
40+
blasint i;
41+
blasint N = ELEMENTS, inc = INCREMENT;
42+
float x[ELEMENTS * INCREMENT];
43+
for (i = 0; i < N * inc; i ++) {
44+
x[i] = i + 1;
45+
}
46+
47+
x[8 * inc] = 0;
48+
blasint index = BLASFUNC(ismin)(&N, x, &inc);
49+
ASSERT_EQUAL(9, index);
50+
}
51+
52+
CTEST(ismax, step_2){
53+
blasint i;
54+
blasint N = ELEMENTS, inc = INCREMENT;
55+
float x[ELEMENTS * INCREMENT];
56+
for (i = 0; i < N * inc; i ++) {
57+
x[i] = - i - 1;
58+
}
59+
60+
x[8 * inc] = 0;
61+
blasint index = BLASFUNC(ismax)(&N, x, &inc);
62+
ASSERT_EQUAL(9, index);
63+
}

utest/utest_main2.c

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,35 @@ CTEST(amax, samax){
5050
ASSERT_DBL_NEAR_TOL((double)(tr_max), (double)(te_max), SINGLE_EPS);
5151
}
5252

53+
#define ELEMENTS 50
54+
#define INCREMENT 2
55+
56+
CTEST(ismin, step_2){
57+
blasint i;
58+
blasint N = ELEMENTS, inc = INCREMENT;
59+
float x[ELEMENTS * INCREMENT];
60+
for (i = 0; i < N * inc; i ++) {
61+
x[i] = i + 1;
62+
}
63+
64+
x[8 * inc] = 0;
65+
blasint index = BLASFUNC(ismin)(&N, x, &inc);
66+
ASSERT_EQUAL(9, index);
67+
}
68+
69+
CTEST(ismax, step_2){
70+
blasint i;
71+
blasint N = ELEMENTS, inc = INCREMENT;
72+
float x[ELEMENTS * INCREMENT];
73+
for (i = 0; i < N * inc; i ++) {
74+
x[i] = - i - 1;
75+
}
76+
77+
x[8 * inc] = 0;
78+
blasint index = BLASFUNC(ismax)(&N, x, &inc);
79+
ASSERT_EQUAL(9, index);
80+
}
81+
5382
CTEST (drotmg,rotmg)
5483
{
5584
double te_d1, tr_d1;
@@ -510,7 +539,9 @@ CTEST(swap,cswap_inc_0)
510539

511540
int main(int argc, const char ** argv){
512541

513-
CTEST_ADD(amax, samax);
542+
CTEST_ADD (amax, samax);
543+
CTEST_ADD (ismin, step_2);
544+
CTEST_ADD (ismax, step_2);
514545
CTEST_ADD (drotmg,rotmg);
515546
CTEST_ADD (drotmg,rotmg_issue1452);
516547
CTEST_ADD (drotmg,rotmg_D1eqD2_X1eqX2);

0 commit comments

Comments
 (0)