Changeset 709 for soft/giet_vm/giet_drivers/bdv_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/bdv_driver.c (modified) (10 diffs)

soft/giet_vm/giet_drivers/bdv_driver.c

@@ -37 +37 @@
 spin_lock_t  _bdv_lock __attribute__((aligned(64)));
 
-// global index of the waiting task (only used in descheduling mode)
+// global index of the waiting thread (only used in descheduling mode)
 __attribute__((section(".kdata")))
-unsigned int _bdv_gtid;
+unsigned int _bdv_trdid;
 
 // BDV peripheral status (only used in descheduling mode)
@@ -75 +75 @@
                           unsigned int       count) 
 {
-    unsigned int procid  = _get_procid();
-    unsigned int x       = procid >> (Y_WIDTH + P_WIDTH);
-    unsigned int y       = (procid >> P_WIDTH) & ((1<<Y_WIDTH) - 1);
-    unsigned int p       = procid & ((1<<P_WIDTH)-1);
-
-#if GIET_DEBUG_IOC
+
+#if GIET_DEBUG_IOC
+unsigned int procid  = _get_procid();
+unsigned int x       = procid >> (Y_WIDTH + P_WIDTH);
+unsigned int y       = (procid >> P_WIDTH) & ((1<<Y_WIDTH) - 1);
+unsigned int p       = procid & ((1<<P_WIDTH)-1);
 if ( _get_proctime() > GIET_DEBUG_IOC )
 _printf("\n[BDV DEBUG] P[%d,%d,%d] enters _bdv_access at cycle %d\n"
@@ -97 +97 @@
     unsigned int status;
 
-    // get the lock protecting BDV
+    // get the BDV lock and register it in task context
+    static_scheduler_t*  psched = _get_sched();
+    unsigned int         ltid   = _get_thread_ltid();
     _spin_lock_acquire( &_bdv_lock );
+    _atomic_or( &psched->context[ltid].slot[CTX_LOCKS_ID] , LOCKS_MASK_BDV ); 
 
     // set device registers
@@ -149 +152 @@
 
     /////////////////////////////////////////////////////////////////
-    // in descheduling mode, we deschedule the task
-    // and use an interrupt to reschedule the task.
+    // in descheduling mode, we deschedule the thread
+    // and use an interrupt to reschedule the thread.
     // We need a critical section, because we must reset the RUN bit
         // before to launch the transfer, and we don't want to be 
@@ -158 +161 @@
     {
         unsigned int save_sr;
-        unsigned int ltid = _get_current_task_id();
 
         // activates BDV interrupt
         _bdv_set_register( BLOCK_DEVICE_IRQ_ENABLE, 1 );
 
-        // set _bdv_gtid 
-        _bdv_gtid = (procid<<16) + ltid;
+        // set _bdv_trdid 
+        _bdv_trdid = _get_thread_trdid();
 
         // enters critical section
@@ -170 +172 @@
 
         // Set NORUN_MASK_IOC bit 
-        static_scheduler_t* psched  = (static_scheduler_t*)_schedulers[x][y][p];
-        _atomic_or( &psched->context[ltid][CTX_NORUN_ID] , NORUN_MASK_IOC );
+        static_scheduler_t* psched  = (static_scheduler_t*)_get_sched();
+        unsigned int ltid = psched->current;
+        _atomic_or( &psched->context[ltid].slot[CTX_NORUN_ID] , NORUN_MASK_IOC );
         
         // launch transfer
@@ -184 +187 @@
 #endif
 
-        // deschedule task
+        // deschedule thread
         _ctx_switch();                      
 
@@ -201 +204 @@
     }
 
-    // release lock
+    // release BDV lock and clear task context
     _spin_lock_release( &_bdv_lock );      
+    _atomic_and( &psched->context[ltid].slot[CTX_LOCKS_ID] , ~LOCKS_MASK_BDV ); 
 
 #if GIET_DEBUG_IOC
@@ -241 +245 @@
     _bdv_status = status;
 
-    // identify task waiting on BDV
-    unsigned int procid  = _bdv_gtid>>16;
-    unsigned int ltid    = _bdv_gtid & 0xFFFF;
-    unsigned int cluster = procid >> P_WIDTH;
-    unsigned int x       = cluster >> Y_WIDTH;
-    unsigned int y       = cluster & ((1<<Y_WIDTH)-1);
-    unsigned int p       = procid & ((1<<P_WIDTH)-1);
+    // identify thread waiting on BDV
+    unsigned int x       = (_bdv_trdid >> 24) & 0xFF;
+    unsigned int y       = (_bdv_trdid >> 16) & 0xFF;
+    unsigned int p       = (_bdv_trdid >>  8) & 0xFF;
+    unsigned int ltid    = (_bdv_trdid      ) & 0xFF;
 
     // Reset NORUN_MASK_IOC bit 
     static_scheduler_t* psched  = (static_scheduler_t*)_schedulers[x][y][p];
-    unsigned int*       ptr     = &psched->context[ltid][CTX_NORUN_ID];
+    unsigned int*       ptr     = &psched->context[ltid].slot[CTX_NORUN_ID];
     _atomic_and( ptr , ~NORUN_MASK_IOC );
 
-    // send a WAKUP WTI to processor running the sleeping task 
-    _xcu_send_wti( cluster,   
+    // send a WAKUP WTI to processor running the sleeping thread 
+    _xcu_send_wti( (x<<Y_WIDTH) + y,
                    p, 
                    0 );          // don't force context switch 
@@ -266 +268 @@
 if ( _get_proctime() > GIET_DEBUG_IOC )
 _printf("\n[BDV DEBUG] Processor[%d,%d,%d] enters _bdv_isr() at cycle %d\n"
-        "  for task %d running on P[%d,%d,%d] / bdv_status = %x\n",
+        "  for thread %d running on P[%d,%d,%d] / bdv_status = %x\n",
         c_x , c_y , c_p , _get_proctime() ,
         ltid , x , y , p , status );