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

Fix handling of additional buffer structures in case of overflow

This commit is contained in:
Martin Kroeker 2023-09-19 23:33:39 +02:00 committed by GitHub
parent bb2f1ec3b0
commit 7e939fb831
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
driver/others/memory.c
View File

@ -73,6 +73,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "common.h" #include "common.h"
#define NEW_BUFFERS 512
#ifndef likely #ifndef likely
#ifdef __GNUC__ #ifdef __GNUC__
#define likely(x) __builtin_expect(!!(x), 1) #define likely(x) __builtin_expect(!!(x), 1)
@ -2897,7 +2898,7 @@ void *blas_memory_alloc(int procpos){
#endif #endif
position ++; position ++;
} while (position < 512+NUM_BUFFERS); } while (position < NEW_BUFFERS + NUM_BUFFERS);
} }
#if (defined(SMP) || defined(USE_LOCKING)) && !defined(USE_OPENMP) #if (defined(SMP) || defined(USE_LOCKING)) && !defined(USE_OPENMP)
UNLOCK_COMMAND(&alloc_lock); UNLOCK_COMMAND(&alloc_lock);
@ -3014,9 +3015,10 @@ void *blas_memory_alloc(int procpos){
fprintf(stderr,"To avoid this warning, please rebuild your copy of OpenBLAS with a larger NUM_THREADS setting\n"); fprintf(stderr,"To avoid this warning, please rebuild your copy of OpenBLAS with a larger NUM_THREADS setting\n");
fprintf(stderr,"or set the environment variable OPENBLAS_NUM_THREADS to %d or lower\n", MAX_CPU_NUMBER); fprintf(stderr,"or set the environment variable OPENBLAS_NUM_THREADS to %d or lower\n", MAX_CPU_NUMBER);
memory_overflowed=1; memory_overflowed=1;
new_release_info = (struct release_t*) malloc(512*sizeof(struct release_t)); MB;
newmemory = (struct newmemstruct*) malloc(512*sizeof(struct newmemstruct)); new_release_info = (struct release_t*) malloc(NEW_BUFFERS * sizeof(struct release_t));
for (i = 0; i < 512; i++) { newmemory = (struct newmemstruct*) malloc(NEW_BUFFERS * sizeof(struct newmemstruct));
for (i = 0; i < NEW_BUFFERS; i++) {
newmemory[i].addr = (void *)0; newmemory[i].addr = (void *)0;
#if defined(WHEREAMI) && !defined(USE_OPENMP) #if defined(WHEREAMI) && !defined(USE_OPENMP)
newmemory[i].pos = -1; newmemory[i].pos = -1;
@ -3129,12 +3131,12 @@ void blas_memory_free(void *free_area){
printf(" Position : %d\n", position); printf(" Position : %d\n", position);
#endif #endif
if (unlikely(memory_overflowed && position >= NUM_BUFFERS)) { if (unlikely(memory_overflowed && position >= NUM_BUFFERS)) {
while ((position < NUM_BUFFERS+512) && (newmemory[position-NUM_BUFFERS].addr != free_area)) while ((position < NUM_BUFFERS+NEW_BUFFERS) && (newmemory[position-NUM_BUFFERS].addr != free_area))
position++; position++;
// arm: ensure all writes are finished before other thread takes this memory // arm: ensure all writes are finished before other thread takes this memory
WMB; WMB;
if (position - NUM_BUFFERS >= NEW_BUFFERS) goto error;
newmemory[position].used = 0; newmemory[position-NUM_BUFFERS].used = 0;
#if (defined(SMP) || defined(USE_LOCKING)) && !defined(USE_OPENMP) #if (defined(SMP) || defined(USE_LOCKING)) && !defined(USE_OPENMP)
UNLOCK_COMMAND(&alloc_lock); UNLOCK_COMMAND(&alloc_lock);
#endif #endif
@ -3213,7 +3215,7 @@ void blas_shutdown(void){
memory[pos].lock = 0; memory[pos].lock = 0;
} }
if (memory_overflowed) if (memory_overflowed)
for (pos = 0; pos < 512; pos ++){ for (pos = 0; pos < NEW_BUFFERS; pos ++){
newmemory[pos].addr = (void *)0; newmemory[pos].addr = (void *)0;
newmemory[pos].used = 0; newmemory[pos].used = 0;
#if defined(WHEREAMI) && !defined(USE_OPENMP) #if defined(WHEREAMI) && !defined(USE_OPENMP)