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

Merge a5c9b4e7e0 into 9e87e6f3d8

This commit is contained in:
Martin Kroeker 2018-02-20 15:36:06 +00:00 committed by GitHub
parent 9e87e6f3d8 a5c9b4e7e0
commit a8b2e9c412
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
driver/others/memory.c
View File

@ -1016,9 +1016,7 @@ void *blas_memory_alloc(int procpos){
}; };
void *(**func)(void *address); void *(**func)(void *address);
#if defined(SMP) && !defined(USE_OPENMP)
LOCK_COMMAND(&alloc_lock); LOCK_COMMAND(&alloc_lock);
#endif
if (!memory_initialized) { if (!memory_initialized) {
@ -1052,9 +1050,7 @@ void *blas_memory_alloc(int procpos){
memory_initialized = 1; memory_initialized = 1;
} }
#if defined(SMP) && !defined(USE_OPENMP)
UNLOCK_COMMAND(&alloc_lock); UNLOCK_COMMAND(&alloc_lock);
#endif
#ifdef DEBUG #ifdef DEBUG
printf("Alloc Start ...\n"); printf("Alloc Start ...\n");
@ -1071,14 +1067,15 @@ void *blas_memory_alloc(int procpos){
if (!memory[position].used && (memory[position].pos == mypos)) { if (!memory[position].used && (memory[position].pos == mypos)) {
#if defined(SMP) && !defined(USE_OPENMP) #if defined(SMP) && !defined(USE_OPENMP)
LOCK_COMMAND(&alloc_lock); LOCK_COMMAND(&alloc_lock);
#else
blas_lock(&memory[position].lock);
#endif #endif
/* blas_lock(&memory[position].lock);*/
if (!memory[position].used) goto allocation; if (!memory[position].used) goto allocation;
#if defined(SMP) && !defined(USE_OPENMP) #if defined(SMP) && !defined(USE_OPENMP)
UNLOCK_COMMAND(&alloc_lock); UNLOCK_COMMAND(&alloc_lock);
#else
blas_unlock(&memory[position].lock);
#endif #endif
/* blas_unlock(&memory[position].lock);*/
} }
position ++; position ++;
@ -1094,14 +1091,15 @@ void *blas_memory_alloc(int procpos){
/* if (!memory[position].used) { */ /* if (!memory[position].used) { */
#if defined(SMP) && !defined(USE_OPENMP) #if defined(SMP) && !defined(USE_OPENMP)
LOCK_COMMAND(&alloc_lock); LOCK_COMMAND(&alloc_lock);
#else
blas_lock(&memory[position].lock);
#endif #endif
/* blas_lock(&memory[position].lock);*/
if (!memory[position].used) goto allocation; if (!memory[position].used) goto allocation;
#if defined(SMP) && !defined(USE_OPENMP) #if defined(SMP) && !defined(USE_OPENMP)
UNLOCK_COMMAND(&alloc_lock); UNLOCK_COMMAND(&alloc_lock);
#else
blas_unlock(&memory[position].lock);
#endif #endif
/* blas_unlock(&memory[position].lock);*/
/* } */ /* } */
position ++; position ++;
@ -1119,10 +1117,10 @@ void *blas_memory_alloc(int procpos){
memory[position].used = 1; memory[position].used = 1;
#if defined(SMP) && !defined(USE_OPENMP) #if defined(SMP) && !defined(USE_OPENMP)
UNLOCK_COMMAND(&alloc_lock); UNLOCK_COMMAND(&alloc_lock);
#else
blas_unlock(&memory[position].lock);
#endif #endif
/* blas_unlock(&memory[position].lock);*/
if (!memory[position].addr) { if (!memory[position].addr) {
do { do {
#ifdef DEBUG #ifdef DEBUG
@ -1190,9 +1188,7 @@ void *blas_memory_alloc(int procpos){
if (memory_initialized == 1) { if (memory_initialized == 1) {
#if defined(SMP) && !defined(USE_OPENMP)
LOCK_COMMAND(&alloc_lock); LOCK_COMMAND(&alloc_lock);
#endif
if (memory_initialized == 1) { if (memory_initialized == 1) {
@ -1201,9 +1197,8 @@ void *blas_memory_alloc(int procpos){
memory_initialized = 2; memory_initialized = 2;
} }
#if defined(SMP) && !defined(USE_OPENMP)
UNLOCK_COMMAND(&alloc_lock); UNLOCK_COMMAND(&alloc_lock);
#endif
} }
#endif #endif