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

Merge branch 'develop' into hotfix-0.1alpha2.4

This commit is contained in:
Xianyi 2011-09-17 07:32:10 +08:00
parent 756477bfe3 7b410b7f0e
commit 74fa790354
6 changed files with 57 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -125,6 +125,13 @@ endif
#Save the config files for installation
cp Makefile.conf Makefile.conf_last
cp config.h config_last.h
ifdef QUAD_PRECISION
echo "#define QUAD_PRECISION">> config_last.h
endif
ifeq ($(EXPRECISION), 1)
echo "#define EXPRECISION">> config_last.h
endif
##
ifdef DYNAMIC_ARCH
$(MAKE) -C kernel commonlibs || exit 1
for d in $(DYNAMIC_CORE) ; \

11
common_interface.h
View File

@ -38,6 +38,11 @@
#ifndef ASSEMBLER
#ifdef __cplusplus
extern "C" {
/* Assume C declarations for C++ */
#endif /* __cplusplus */
int BLASFUNC(xerbla)(char *, blasint *info, blasint);
FLOATRET BLASFUNC(sdot) (blasint *, float *, blasint *, float *, blasint *);
@ -733,4 +738,10 @@ xdouble BLASFUNC(qlamch)(char *);
FLOATRET BLASFUNC(slamc3)(float *, float *);
double BLASFUNC(dlamc3)(double *, double *);
xdouble BLASFUNC(qlamc3)(xdouble *, xdouble *);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif

10
kernel/x86/xdot.S
View File

@ -307,7 +307,11 @@
popl %ebx
popl %esi
popl %edi
#if defined(F_INTERFACE) && defined(RETURN_BY_STACK)
ret $0x4
#else
ret
#endif
ALIGN_3
.L88:
@ -326,6 +330,10 @@
popl %ebx
popl %esi
popl %edi
ret
#if defined(F_INTERFACE) && defined(RETURN_BY_STACK)
ret $0x4
#else
ret
#endif
EPILOGUE

10
kernel/x86/zdot.S
View File

@ -283,7 +283,11 @@
popl %ebx
popl %esi
popl %edi
#if defined(DOUBLE) || defined(XDOUBLE)
ret $0x4
#else
ret
#endif
ALIGN_3
.L88:
@ -305,6 +309,10 @@
popl %ebx
popl %esi
popl %edi
ret
#if defined(DOUBLE) || defined(XDOUBLE)
ret $0x4
#else
ret
#endif
EPILOGUE

4
kernel/x86/zdot_sse2.S
View File

@ -1542,7 +1542,5 @@
popl %esi
popl %edi
/*remove the hidden return value address from the stack.*/
popl %ecx
xchgl %ecx, 0(%esp)
ret
ret $0x4
EPILOGUE

20
openblas_config_template.h
View File

@ -6,6 +6,16 @@
#define BLASFUNC(FUNC) FUNC
#endif
#ifdef QUAD_PRECISION
typedef struct {
unsigned long x[2];
} xdouble;
#elif defined EXPRECISION
#define xdouble long double
#else
#define xdouble double
#endif
#if defined(OS_WINDOWS) && defined(__64BIT__)
typedef long long BLASLONG;
typedef unsigned long long BLASULONG;
@ -19,3 +29,13 @@ typedef BLASLONG blasint;
#else
typedef int blasint;
#endif
#if defined(XDOUBLE) || defined(DOUBLE)
#define FLOATRET FLOAT
#else
#ifdef NEED_F2CCONV
#define FLOATRET double
#else
#define FLOATRET float
#endif
#endif