Restored win32 File

Author: shivammonaka

driver/others/blas_server_win32.c

@@ -1,4 +1,3 @@
-
 /*********************************************************************/
 /* Copyright 2009, 2010 The University of Texas at Austin.           */
 /* All rights reserved.                                              */
@@ -68,19 +67,13 @@ int blas_server_avail = 0;
 
 int blas_omp_threads_local = 1;
 
-static void * blas_thread_buffer[MAX_CPU_NUMBER];
-
 /* Local Variables */
 static BLASULONG server_lock       = 0;
 
 static HANDLE	    blas_threads   [MAX_CPU_NUMBER];
 static DWORD	    blas_threads_id[MAX_CPU_NUMBER];
 static volatile int thread_target;	// target num of live threads, volatile for cross-thread reads
 
-//Prototypes
-static void exec_threads(int , blas_queue_t *, int);
-static void adjust_thread_buffers();
-
 //
 // Legacy code path
 //
@@ -215,8 +208,12 @@ static DWORD WINAPI blas_thread_server(void *arg) {
   /* Thread identifier */
   BLASLONG  cpu = (BLASLONG)arg;
 
+  void *buffer, *sa, *sb;
   blas_queue_t	*queue;
 
+  /* Each server needs each buffer */
+  buffer   = blas_memory_alloc(2);
+
   MT_TRACE("Server[%2ld] Thread is started!\n", cpu);
 
   while (1) {
@@ -244,8 +241,84 @@ static DWORD WINAPI blas_thread_server(void *arg) {
     LeaveCriticalSection(&queue_lock);
 
     if (queue) {
+      int (*routine)(blas_arg_t *, void *, void *, void *, void *, BLASLONG) = queue -> routine;
+
+      sa = queue -> sa;
+      sb = queue -> sb;
+
+      #ifdef CONSISTENT_FPCSR
+        __asm__ __volatile__ ("ldmxcsr %0" : : "m" (queue -> sse_mode));
+        __asm__ __volatile__ ("fldcw %0"   : : "m" (queue -> x87_mode));
+      #endif
+
+      MT_TRACE("Server[%2ld] Started.  Mode = 0x%03x M = %3ld N=%3ld K=%3ld\n",
+	      cpu, queue->mode, queue-> args ->m, queue->args->n, queue->args->k);
+
+      // fprintf(stderr, "queue start[%ld]!!!\n", cpu);
+
+      #ifdef MONITOR
+        main_status[cpu] = MAIN_RUNNING1;
+      #endif
+
+      if (sa == NULL) 
+        sa = (void *)((BLASLONG)buffer + GEMM_OFFSET_A);
+
+      if (sb == NULL) {
+        if (!(queue -> mode & BLAS_COMPLEX)) {
+#ifdef EXPRECISION
+	  if ((queue -> mode & BLAS_PREC) == BLAS_XDOUBLE) {
+	    sb = (void *)(((BLASLONG)sa + ((XGEMM_P * XGEMM_Q * sizeof(xdouble)
+					+ GEMM_ALIGN) & ~GEMM_ALIGN)) + GEMM_OFFSET_B);
+	  } else
+#endif
+	    if ((queue -> mode & BLAS_PREC) == BLAS_DOUBLE) {
+#ifdef BUILD_DOUBLE
+	      sb = (void *)(((BLASLONG)sa + ((DGEMM_P * DGEMM_Q * sizeof(double)
+					  + GEMM_ALIGN) & ~GEMM_ALIGN)) + GEMM_OFFSET_B);
+#endif
+	    } else if ((queue -> mode & BLAS_PREC) == BLAS_SINGLE) {
+#ifdef BUILD_SINGLE
+	      sb = (void *)(((BLASLONG)sa + ((SGEMM_P * SGEMM_Q * sizeof(float)
+					  + GEMM_ALIGN) & ~GEMM_ALIGN)) + GEMM_OFFSET_B);
+#endif
+	    } else {
+            /* Other types in future */
+	    }
+	} else {
+#ifdef EXPRECISION
+	  if ((queue -> mode & BLAS_PREC) == BLAS_XDOUBLE){
+	    sb = (void *)(((BLASLONG)sa + ((XGEMM_P * XGEMM_Q * 2 * sizeof(xdouble)
+					+ GEMM_ALIGN) & ~GEMM_ALIGN)) + GEMM_OFFSET_B);
+	  } else
+#endif
+	    if ((queue -> mode & BLAS_PREC) == BLAS_DOUBLE){
+#ifdef BUILD_COMPLEX16
+	      sb = (void *)(((BLASLONG)sa + ((ZGEMM_P * ZGEMM_Q * 2 * sizeof(double)
+					  + GEMM_ALIGN) & ~GEMM_ALIGN)) + GEMM_OFFSET_B);
+#endif
+	    } else if ((queue -> mode & BLAS_PREC) == BLAS_SINGLE) {
+#ifdef BUILD_COMPLEX
+	      sb = (void *)(((BLASLONG)sa + ((CGEMM_P * CGEMM_Q * 2 * sizeof(float)
+					  + GEMM_ALIGN) & ~GEMM_ALIGN)) + GEMM_OFFSET_B);
+#endif
+	    } else {
+            /* Other types in future */
+	    }
+	}
+      	queue->sb=sb;
+      }
+
+      #ifdef MONITOR
+        main_status[cpu] = MAIN_RUNNING2;
+      #endif
 
-      exec_threads(cpu, queue, 0);
+      if (!(queue -> mode & BLAS_LEGACY)) {
+      	(routine)(queue -> args, queue -> range_m, queue -> range_n, sa, sb, queue -> position);
+      } else {
+  	    legacy_exec(routine, queue -> mode, queue -> args, sb);
+      }
+    } else {
+  		continue; //if queue == NULL
 	  }
 
     MT_TRACE("Server[%2ld] Finished!\n", cpu);
@@ -257,6 +330,8 @@ static DWORD WINAPI blas_thread_server(void *arg) {
 
   MT_TRACE("Server[%2ld] Shutdown!\n",  cpu);
 
+  blas_memory_free(buffer);
+
   return 0;
 }
 
@@ -270,8 +345,6 @@ int blas_thread_init(void) {
 
   LOCK_COMMAND(&server_lock);
 
-  adjust_thread_buffers();
-
   MT_TRACE("Initializing Thread(Num. threads = %d)\n", blas_cpu_number);
 
   if (!blas_server_avail) {
@@ -336,14 +409,14 @@ int exec_blas_async(BLASLONG pos, blas_queue_t *queue) {
   }
   else
   {
-	  blas_queue_t *next_item = work_queue;
+	  blas_queue_t *queue_item = work_queue;
 
     // find the end of the work queue
-    while (next_item)
-        next_item = next_item->next;
+    while (queue_item->next)
+        queue_item = queue_item->next;
 
     // add new work to the end
-    next_item = queue;
+    queue_item->next = queue;
   }
 
   LeaveCriticalSection(&queue_lock);
@@ -400,17 +473,6 @@ int exec_blas(BLASLONG num, blas_queue_t *queue) {
 
   if ((num <= 0) || (queue == NULL)) return 0;
 
-  //Redirect to caller's callback routine
-  if (openblas_threads_callback_) {
-  int buf_index = 0;
-#ifndef USE_SIMPLE_THREADED_LEVEL3
-    for (int i = 0; i < num; i ++)
-      queue[i].position = i;
-#endif
-    openblas_threads_callback_(1, (openblas_dojob_callback) exec_threads, num, sizeof(blas_queue_t), (void*) queue, buf_index);
-    return 0;
-  }
-
   if ((num > 1) && queue -> next) 
     exec_blas_async(1, queue -> next);
 
@@ -445,14 +507,6 @@ int BLASFUNC(blas_thread_shutdown)(void) {
 
   LOCK_COMMAND(&server_lock);
 
-  //Free buffers allocated for threads
-  for(i=0; i<MAX_CPU_NUMBER; i++){
-    if(blas_thread_buffer[i]!=NULL){
-      blas_memory_free(blas_thread_buffer[i]);
-      blas_thread_buffer[i]=NULL;
-    }
-  }
-
   if (blas_server_avail) {
 
     for (i = 0; i < blas_num_threads - 1; i++) {
@@ -555,108 +609,4 @@ void goto_set_num_threads(int num_threads)
 void openblas_set_num_threads(int num)
 {
 	goto_set_num_threads(num);
-}
-
-static void adjust_thread_buffers() {
-
-  int i=0;
-
-  //adjust buffer for each thread
-  for(i=0; i < blas_cpu_number; i++){
-    if(blas_thread_buffer[i] == NULL){
-      blas_thread_buffer[i] = blas_memory_alloc(2);
-    }
-  }
-  for(; i < MAX_CPU_NUMBER; i++){
-    if(blas_thread_buffer[i] != NULL){
-      blas_memory_free(blas_thread_buffer[i]);
-      blas_thread_buffer[i] = NULL;
-    }
-  }
-}
-
-//Indivitual threads work executor, Helps in setting by synchronization environment and calling inner_threads routine
-static void exec_threads(int cpu, blas_queue_t *queue, int buf_index)
-{
-  
-  void *buffer, *sa, *sb;
-
-  buffer = blas_thread_buffer[cpu];
-  sa = queue -> sa;
-  sb = queue -> sb;
-
-  int (*routine)(blas_arg_t *, void *, void *, void *, void *, BLASLONG) = queue -> routine;
-
-  #ifdef CONSISTENT_FPCSR
-    __asm__ __volatile__ ("ldmxcsr %0" : : "m" (queue -> sse_mode));
-    __asm__ __volatile__ ("fldcw %0"   : : "m" (queue -> x87_mode));
-  #endif
-
-  MT_TRACE("Server[%2ld] Started.  Mode = 0x%03x M = %3ld N=%3ld K=%3ld\n",
-    cpu, queue->mode, queue-> args ->m, queue->args->n, queue->args->k);
-
-  // fprintf(stderr, "queue start[%ld]!!!\n", cpu);
-
-  #ifdef MONITOR
-    main_status[cpu] = MAIN_RUNNING1;
-  #endif
-
-  if (sa == NULL) 
-    sa = (void *)((BLASLONG)buffer + GEMM_OFFSET_A);
-
-  if (sb == NULL) {
-    if (!(queue -> mode & BLAS_COMPLEX)) {
-#ifdef EXPRECISION
-if ((queue -> mode & BLAS_PREC) == BLAS_XDOUBLE) {
-  sb = (void *)(((BLASLONG)sa + ((XGEMM_P * XGEMM_Q * sizeof(xdouble)
-      + GEMM_ALIGN) & ~GEMM_ALIGN)) + GEMM_OFFSET_B);
-} else
-#endif
-  if ((queue -> mode & BLAS_PREC) == BLAS_DOUBLE) {
-#ifdef BUILD_DOUBLE
-    sb = (void *)(((BLASLONG)sa + ((DGEMM_P * DGEMM_Q * sizeof(double)
-        + GEMM_ALIGN) & ~GEMM_ALIGN)) + GEMM_OFFSET_B);
-#endif
-  } else if ((queue -> mode & BLAS_PREC) == BLAS_SINGLE) {
-#ifdef BUILD_SINGLE
-    sb = (void *)(((BLASLONG)sa + ((SGEMM_P * SGEMM_Q * sizeof(float)
-        + GEMM_ALIGN) & ~GEMM_ALIGN)) + GEMM_OFFSET_B);
-#endif
-  } else {
-        /* Other types in future */
-  }
-} else {
-#ifdef EXPRECISION
-if ((queue -> mode & BLAS_PREC) == BLAS_XDOUBLE){
-  sb = (void *)(((BLASLONG)sa + ((XGEMM_P * XGEMM_Q * 2 * sizeof(xdouble)
-      + GEMM_ALIGN) & ~GEMM_ALIGN)) + GEMM_OFFSET_B);
-} else
-#endif
-  if ((queue -> mode & BLAS_PREC) == BLAS_DOUBLE){
-#ifdef BUILD_COMPLEX16
-    sb = (void *)(((BLASLONG)sa + ((ZGEMM_P * ZGEMM_Q * 2 * sizeof(double)
-        + GEMM_ALIGN) & ~GEMM_ALIGN)) + GEMM_OFFSET_B);
-#endif
-  } else if ((queue -> mode & BLAS_PREC) == BLAS_SINGLE) {
-#ifdef BUILD_COMPLEX
-    sb = (void *)(((BLASLONG)sa + ((CGEMM_P * CGEMM_Q * 2 * sizeof(float)
-        + GEMM_ALIGN) & ~GEMM_ALIGN)) + GEMM_OFFSET_B);
-#endif
-  } else {
-        /* Other types in future */
-  }
-}
-    queue->sb=sb;
-  }
-
-  #ifdef MONITOR
-    main_status[cpu] = MAIN_RUNNING2;
-  #endif
-
-  if (!(queue -> mode & BLAS_LEGACY)) {
-    (routine)(queue -> args, queue -> range_m, queue -> range_n, sa, sb, queue -> position);
-  } else {
-    legacy_exec(routine, queue -> mode, queue -> args, sb);
-  }
-
 }