Changeset 428 for soft/giet_vm/giet_kernel/kernel_init.c

Timestamp:

Oct 4, 2014, 3:19:32 PM (10 years ago)

Author:

alain

Message:

Introducing fixed format (X_WIDTH / Y_WIDTH / P_WIDTH) for processor index.

File:

• soft/giet_vm/giet_kernel/kernel_init.c (modified) (9 diffs)

soft/giet_vm/giet_kernel/kernel_init.c

@@ -133 +133 @@
 
 __attribute__((section (".kdata"))) 
-volatile static_scheduler_t* _schedulers[NB_PROCS_MAX<<(X_WIDTH+Y_WIDTH)]; 
+volatile static_scheduler_t* _schedulers[X_SIZE][Y_SIZE][NB_PROCS_MAX]; 
 
 ////////////////////////////////////////////////////////////////////////////////////
@@ -140 +140 @@
 
 __attribute__((section (".kdata"))) 
-volatile unsigned int _init_barrier = 0;
+volatile unsigned int kernel_init_barrier = 0;
 
 ///////////////////////////////////////////////////////////////////////////////////
 __attribute__((section (".kinit"))) void kernel_init() 
 {
-    unsigned int global_pid = _get_procid();
-    unsigned int cluster_xy = global_pid / NB_PROCS_MAX;
-    unsigned int x          = cluster_xy >> Y_WIDTH;
+    // gpid : hardware processor index (fixed format: X_WIDTH|Y_WIDTH|P_WIDTH)
+    // lpid : local processor id in a cluster ( lpid < NB_PROCS_MAX)
+    // cpid : "continuous" processor index = (((x * Y_SIZE + y) * NB_PROCS_MAX) + p 
+
+    unsigned int gpid       = _get_procid();
+    unsigned int cluster_xy = gpid >> P_WIDTH;
+    unsigned int x          = cluster_xy >> Y_WIDTH & ((1<<X_WIDTH)-1);
     unsigned int y          = cluster_xy & ((1<<Y_WIDTH)-1);
-    unsigned int lpid       = global_pid % NB_PROCS_MAX;
-    unsigned int pid        = ((( x * Y_SIZE) + y) * NB_PROCS_MAX) + lpid;
-
-    // This last initialisation phase is done sequencially:
-    while( pid != _init_barrier ) asm volatile ( "nop" );
+    unsigned int lpid       = gpid & ((1<<P_WIDTH)-1);
+    unsigned int cpid       = ((( x * Y_SIZE) + y) * NB_PROCS_MAX) + lpid;
+
+
+    // This initialisation is done sequencially by each processor
+    while( cpid != kernel_init_barrier ) asm volatile ( "nop" );
 
     // Step 1 : each processor get its scheduler virtual address from CP0 register
@@ -161 +166 @@
     unsigned int        tasks      = psched->tasks;
 
-    _schedulers[global_pid] = psched;
+    _schedulers[x][y][lpid] = psched;
 
 #if GIET_DEBUG_INIT
@@ -183 +188 @@
     for (ltid = 0; ltid < tasks; ltid++) 
     {
-        unsigned int vsid = _get_task_slot( global_pid, ltid , CTX_VSID_ID ); 
-        unsigned int ptab = _get_task_slot( global_pid, ltid , CTX_PTAB_ID ); 
-        unsigned int ptpr = _get_task_slot( global_pid, ltid , CTX_PTPR_ID ); 
+        unsigned int vsid = _get_task_slot( x, y, lpid, ltid , CTX_VSID_ID ); 
+        unsigned int ptab = _get_task_slot( x, y, lpid, ltid , CTX_PTAB_ID ); 
+        unsigned int ptpr = _get_task_slot( x, y, lpid, ltid , CTX_PTPR_ID ); 
 
         // initialize PTABS arrays
@@ -204 +209 @@
         // compute ctx_ra
         unsigned int ctx_ra = (unsigned int)(&_ctx_eret);
-        _set_task_slot( global_pid, ltid, CTX_RA_ID, ctx_ra );
+        _set_task_slot( x, y, lpid, ltid, CTX_RA_ID, ctx_ra );
 
         // compute ctx_epc
-        unsigned int* ptr = (unsigned int*)_get_task_slot( global_pid, ltid, CTX_EPC_ID );
-        _set_task_slot( global_pid, ltid, CTX_EPC_ID, *ptr );
+        unsigned int* ptr = (unsigned int*)_get_task_slot( x, y, lpid, ltid, CTX_EPC_ID );
+        _set_task_slot( x, y, lpid, ltid, CTX_EPC_ID, *ptr );
 
 #if GIET_DEBUG_INIT
@@ -215 +220 @@
         " - ctx_ra    = %x\n",
         x, y, lpid, ltid,
-        _get_task_slot( global_pid, ltid, CTX_EPC_ID ),
-        _get_task_slot( global_pid, ltid, CTX_RA_ID ) );
+        _get_task_slot( x, y, lpid, ltid, CTX_EPC_ID ),
+        _get_task_slot( x, y, lpid, ltid, CTX_RA_ID ) );
 #endif
 
@@ -297 +302 @@
     unsigned int pstack = ((unsigned int)psched) + 0x2000;
 
-    _set_task_slot( global_pid, IDLE_TASK_INDEX, CTX_SP_ID,  pstack);
-    _set_task_slot( global_pid, IDLE_TASK_INDEX, CTX_RA_ID,  (unsigned int) &_ctx_eret);
-    _set_task_slot( global_pid, IDLE_TASK_INDEX, CTX_EPC_ID, (unsigned int) &_idle_task);
+    _set_task_slot( x, y, lpid, IDLE_TASK_INDEX, CTX_SP_ID,  pstack);
+    _set_task_slot( x, y, lpid, IDLE_TASK_INDEX, CTX_RA_ID,  (unsigned int) &_ctx_eret);
+    _set_task_slot( x, y, lpid, IDLE_TASK_INDEX, CTX_EPC_ID, (unsigned int) &_idle_task);
 
 #if GIET_DEBUG_INIT
@@ -326 +331 @@
     }
 
-    unsigned int sp_value   = _get_task_slot(global_pid, ltid, CTX_SP_ID);
-    unsigned int sr_value   = _get_task_slot(global_pid, ltid, CTX_SR_ID);
-    unsigned int ptpr_value = _get_task_slot(global_pid, ltid, CTX_PTPR_ID);
-    unsigned int epc_value  = _get_task_slot(global_pid, ltid, CTX_EPC_ID);
+    unsigned int sp_value   = _get_task_slot( x, y, lpid, ltid, CTX_SP_ID);
+    unsigned int sr_value   = _get_task_slot( x, y, lpid, ltid, CTX_SR_ID);
+    unsigned int ptpr_value = _get_task_slot( x, y, lpid, ltid, CTX_PTPR_ID);
+    unsigned int epc_value  = _get_task_slot( x, y, lpid, ltid, CTX_EPC_ID);
 
 #if GIET_DEBUG_INIT
@@ -337 +342 @@
 
     // increment barrier counter 
-    _init_barrier++;
+    kernel_init_barrier++;
 
     // busy waiting until all processors synchronized
-    while ( _init_barrier != NB_TOTAL_PROCS );
+    while ( kernel_init_barrier != NB_TOTAL_PROCS );
 
 #if GIET_DEBUG_INIT