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

Merge remote branch 'origin/develop' into haswell

Browse Source
This commit is contained in:
wernsaar
2013-12-01 13:38:11 +01:00
parent 5c648a8984 5048a80032
commit 0b6e13b689
20 changed files with 90 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
driver/others/blas_server_win32.c
+3 -2
View File
@@ -441,9 +441,10 @@ int BLASFUNC(blas_thread_shutdown)(void){
if (blas_server_avail){
SetEvent(pool.killed);
printf("blas_num_threads=%d\n", blas_num_threads);
for(i = 0; i < blas_num_threads - 1; i++){
WaitForSingleObject(blas_threads[i], INFINITE);
WaitForSingleObject(blas_threads[i], 5); //INFINITE);
TerminateThread(blas_threads[i],0);
}
blas_server_avail = 0;
driver/others/memory.c
+4 -4
View File
@@ -363,7 +363,7 @@ static void *alloc_mmap(void *address){
#define BENCH_ITERATION 4
#define SCALING 2
static inline BLASULONG run_bench(BLASULONG address, long size) {
static inline BLASULONG run_bench(BLASULONG address, BLASULONG size) {
BLASULONG original, *p;
BLASULONG start, stop, min;
@@ -450,12 +450,12 @@ static void *alloc_mmap(void *address){
current = (SCALING - 1) * BUFFER_SIZE;
while(current > 0) {
*(long *)start = (long)start + PAGESIZE;
*(BLASLONG *)start = (BLASLONG)start + PAGESIZE;
start += PAGESIZE;
current -= PAGESIZE;
}
*(long *)(start - PAGESIZE) = (BLASULONG)map_address;
*(BLASLONG *)(start - PAGESIZE) = (BLASULONG)map_address;
start = (BLASULONG)map_address;
@@ -1170,7 +1170,7 @@ static void _touch_memory(blas_arg_t *arg, BLASLONG *range_m, BLASLONG *range_n,
#if !defined(ARCH_POWER) && !defined(ARCH_SPARC)
long size;
size_t size;
BLASULONG buffer;
size = BUFFER_SIZE - PAGESIZE;