Skip to content

Commit 0492f0f

Browse files
martin-frbgmartin-frbg
authored
Merge pull request #22 from xianyi/develop
rebase
2 parents 42f0201 + 147e0a7 commit 0492f0f

16 files changed

Lines changed: 70 additions & 36 deletions

File tree

‎.travis.yml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,21 @@ matrix:
224224
before_script:
225225
- COMMON_FLAGS="DYNAMIC_ARCH=1 NUM_THREADS=32"
226226
- brew update
227-
- brew install gcc@10
228227
script:
229228
- travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
230229
env:
231-
- BTYPE="TARGET=NEHALEM BINARY=64 INTERFACE64=1 FC=gfortran-10"
232-
230+
- BTYPE="TARGET=HASWELL USE_OPENMP=1 BINARY=64 INTERFACE64=1 CC=gcc-10 FC=gfortran-10"
231+
232+
- <<: *test-macos
233+
osx_image: xcode12
234+
before_script:
235+
- COMMON_FLAGS="DYNAMIC_ARCH=1 NUM_THREADS=32"
236+
- brew update
237+
script:
238+
- travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
239+
env:
240+
- BTYPE="TARGET=NEHALEM BINARY=64 INTERFACE64=1 FC=gfortran-10"
241+
233242
# - <<: *test-macos
234243
# osx_image: xcode10
235244
# env:

‎azure-pipelines.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,13 @@ jobs:
6868
dir
6969
openblas_utest.exe
7070
71+
- job: OSX_OpenMP
72+
pool:
73+
vmImage: 'macOS-10.15'
74+
steps:
75+
- script: |
76+
brew update
77+
make TARGET=CORE2 DYNAMIC_ARCH=1 USE_OPENMP=1 CC=gcc-10 FC=gfortran-10
78+
7179
80+

‎benchmark/bench.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
#include <time.h>
44
#ifdef __CYGWIN32__
55
#include <sys/time.h>
6+
#elif defined(__APPLE__)
7+
#include <mach/mach_time.h>
68
#endif
79
#include "common.h"
810

‎kernel/arm64/sgemm_tcopy_16.S‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -270,11 +270,6 @@ All rights reserved.
270270
ldr s1, [A02]
271271
ldr s2, [A03]
272272
ldr s3, [A04]
273-
274-
add A01, A01, #4
275-
add A02, A02, #4
276-
add A03, A03, #4
277-
add A04, A04, #4
278273

279274
stp s0, s1, [B04]
280275
add B04, B04, #8
@@ -285,11 +280,6 @@ All rights reserved.
285280
ldr s5, [A06]
286281
ldr s6, [A07]
287282
ldr s7, [A08]
288-
289-
ldr d4, [A05], #8
290-
ldr d5, [A06], #8
291-
ldr d6, [A07], #8
292-
ldr d7, [A08], #8
293283

294284
stp s4, s5, [B04]
295285
add B04, B04, #8

‎kernel/power/cdot.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828
#else
2929

3030
#include "common.h"
31-
#if defined(POWER10)
31+
#if defined(POWER10) && (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__)
3232
#include "cdot_microk_power10.c"
3333
#else
3434
#ifndef HAVE_KERNEL_8
@@ -120,7 +120,7 @@ OPENBLAS_COMPLEX_FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLA
120120

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

123-
#if defined(POWER10)
123+
#if defined(POWER10) && (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__)
124124
BLASLONG n1 = n & -16;
125125
#else
126126
BLASLONG n1 = n & -8;

‎kernel/power/cswap.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3939
#if defined(__VEC__) || defined(__ALTIVEC__)
4040
#if defined(POWER8) || defined(POWER9)
4141
#include "cswap_microk_power8.c"
42-
#elif defined(POWER10)
42+
#elif defined(POWER10) && (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__)
4343
#include "cswap_microk_power10.c"
44+
#elif defined(POWER10)
45+
#include "cswap_microk_power8.c"
4446
#endif
4547
#endif
4648

‎kernel/power/dasum.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4949
#if defined(__VEC__) || defined(__ALTIVEC__)
5050
#if defined(POWER8) || defined(POWER9)
5151
#include "dasum_microk_power8.c"
52-
#elif defined(POWER10)
52+
#elif defined(POWER10) && (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__)
5353
#include "dasum_microk_power10.c"
54+
#elif defined(POWER10)
55+
#include "dasum_microk_power8.c"
5456
#endif
5557
#endif
5658

@@ -112,7 +114,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
112114
if ( inc_x == 1 )
113115
{
114116

115-
#if defined(POWER10)
117+
#if defined(POWER10) && (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__)
116118
if ( n >= 16 )
117119
{
118120
BLASLONG align = ((32 - ((uintptr_t)x & (uintptr_t)0x1F)) >> 3) & 0x3;

‎kernel/power/drot.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4242
#if defined(__VEC__) || defined(__ALTIVEC__)
4343
#if defined(POWER8) || defined(POWER9)
4444
#include "drot_microk_power8.c"
45-
#elif defined(POWER10)
45+
#elif defined(POWER10) && (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__)
4646
#include "drot_microk_power10.c"
47+
#elif defined(POWER10)
48+
#include "drot_microk_power8.c"
4749
#endif
4850
#endif
4951

@@ -117,7 +119,7 @@ int CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y, FLOAT
117119
if ( (inc_x == 1) && (inc_y == 1) )
118120
{
119121

120-
#if defined(POWER10)
122+
#if defined(POWER10) && (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__)
121123
if ( n >= 16 )
122124
{
123125
BLASLONG align = ((32 - ((uintptr_t)y & (uintptr_t)0x1F)) >> 3) & 0x3;

‎kernel/power/dscal.c‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3838
#if defined(__VEC__) || defined(__ALTIVEC__)
3939
#if defined(POWER8) || defined(POWER9)
4040
#include "dscal_microk_power8.c"
41-
#elif defined(POWER10)
41+
#elif defined(POWER10) && (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__)
4242
#include "dscal_microk_power10.c"
43+
#elif defined(POWER10)
44+
#include "dscal_microk_power8.c"
4345
#endif
4446
#endif
4547

@@ -102,7 +104,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x, BLAS
102104
if ( da == 0.0 )
103105
{
104106

105-
#if defined(POWER10)
107+
#if defined(POWER10) && (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__)
106108
if ( n >= 16 )
107109
{
108110
BLASLONG align = ((32 - ((uintptr_t)x & (uintptr_t)0x1F)) >> 3) & 0x3;
@@ -136,7 +138,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x, BLAS
136138
else
137139
{
138140

139-
#if defined(POWER10)
141+
#if defined(POWER10) && (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__)
140142
if ( n >= 16 )
141143
{
142144
BLASLONG align = ((32 - ((uintptr_t)x & (uintptr_t)0x1F)) >> 3) & 0x3;

‎kernel/power/dswap.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3838
#if defined(__VEC__) || defined(__ALTIVEC__)
3939
#if defined(POWER8) || defined(POWER9)
4040
#include "dswap_microk_power8.c"
41-
#elif defined(POWER10)
41+
#elif defined(POWER10) && (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__)
4242
#include "swap_microk_power10.c"
43+
#elif defined(POWER10)
44+
#include "dswap_microk_power8.c"
4345
#endif
4446
#endif
4547

@@ -117,7 +119,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT dummy3, FLOAT *x,
117119
if ( (inc_x == 1) && (inc_y == 1 ))
118120
{
119121

120-
#if defined(POWER10)
122+
#if defined(POWER10) && (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__)
121123
if ( n >= 32 )
122124
{
123125
BLASLONG align = ((32 - ((uintptr_t)y & (uintptr_t)0x1F)) >> 3) & 0x3;

0 commit comments

Comments
 (0)