Changeset 709 for soft/giet_vm/giet_drivers/mwr_driver.c

Timestamp:

Oct 1, 2015, 4:20:46 PM (9 years ago)

Author:

alain

Message:

Major release: Change the task model to implement the POSIX threads API.

• The shell "exec" and "kill" commands can be used to activate/de-activate the applications.
• The "pause", "resume", and "context" commands can be used to stop, restart, a single thtead or to display the thread context.

This version has been tested on the following multi-threaded applications,
that have been modified to use the POSIX threads:

• classif
• convol
• transpose
• gameoflife
• raycast

File:

• soft/giet_vm/giet_drivers/mwr_driver.c (modified) (3 diffs)

soft/giet_vm/giet_drivers/mwr_driver.c

@@ -74 +74 @@
 unsigned int   _coproc_error[X_SIZE*Y_SIZE];
 
-// descheduled task gtid (for MODE_DMA_IRQ)
-__attribute__((section(".kdata")))
-unsigned int   _coproc_gtid[X_SIZE*Y_SIZE];
+// descheduled thread trdid (for MODE_DMA_IRQ)
+__attribute__((section(".kdata")))
+unsigned int   _coproc_trdid[X_SIZE*Y_SIZE];
 
 /////////////////////////////////////////////////////////////////////////////
@@ -205 +205 @@
     _coproc_error[cluster_id]  = error;
 
-    // identify task waiting on coprocessor completion
-    // this task can run in a remote cluster 
-    unsigned int r_gtid    = _coproc_gtid[cluster_id];
-    unsigned int r_procid  = r_gtid>>16;
-    unsigned int r_ltid    = r_gtid & 0xFFFF;
-    unsigned int r_cluster = r_procid >> P_WIDTH;
-    unsigned int r_x       = r_cluster >> Y_WIDTH;
-    unsigned int r_y       = r_cluster & ((1<<Y_WIDTH)-1);
-    unsigned int r_p       = r_procid & ((1<<P_WIDTH)-1);
+    // identify thread waiting on coprocessor completion (can run in a remote cluster) 
+    unsigned int r_x       = (_coproc_trdid[cluster_id]>>24) & 0xFF;
+    unsigned int r_y       = (_coproc_trdid[cluster_id]>>16) & 0xFF;
+    unsigned int r_p       = (_coproc_trdid[cluster_id]>> 8) & 0xFF;
+    unsigned int r_ltid    = (_coproc_trdid[cluster_id]    ) & 0xFF;
 
     // Reset NORUN_MASK_IOC bit 
     static_scheduler_t* psched  = (static_scheduler_t*)_schedulers[r_x][r_y][r_p];
-    unsigned int*       ptr     = &psched->context[r_ltid][CTX_NORUN_ID];
+    unsigned int*       ptr     = &psched->context[r_ltid].slot[CTX_NORUN_ID];
     _atomic_and( ptr , ~NORUN_MASK_COPROC );
 
-    // send a WAKUP WTI to processor running the sleeping task 
-    _xcu_send_wti( r_cluster,   
+    // send a WAKUP WTI to processor running the sleeping thread 
+    _xcu_send_wti( (r_x<<Y_WIDTH) + r_y,
                    r_p, 
                    0 );          // don't force context switch 
@@ -228 +224 @@
 unsigned int p          = gpid & ((1<<P_WIDTH)-1);
 _printf("\n[GIET DEBUG COPROC] P[%d,%d,%d] executes _mwr_isr() at cycle %d\n"
-        "  for task %d running on P[%d,%d,%d] / error = %d\n",
+        "  for thread %d running on P[%d,%d,%d] / error = %d\n",
         x , y , p , _get_proctime() , r_ltid , r_x , r_y , r_p , error );
 #endif