Changeset 271 for soft/giet_vm/giet_drivers/xcu_driver.c

Timestamp:

Jan 17, 2014, 11:49:27 PM (11 years ago)

Author:

cfuguet

Message:

• Bugfix: The ISR_SWITCH index should be NB_PROCS_MAX + local_pid. This is because the first NB_PROCS_MAX indexes on the XICU in each cluster are used for the WAKEUP software interrupts.

• Relocating the memcpy and memset functions into the giet_libs/stdlib.* files.

• Modification of the sort application to used 8 threads instead of
  4. Modifying the mapping files to distribute the 8 threads on the available processors. (Ex. When using 4 processors, each one executes 2 threads)

File:

• soft/giet_vm/giet_drivers/xcu_driver.c (modified) (6 diffs)

soft/giet_vm/giet_drivers/xcu_driver.c

@@ -170 +170 @@
 ////////////////////////////////////////////////////////////////////////////////
 unsigned int _xcu_timer_start( unsigned int cluster_xy,
-                               unsigned int proc_id,
+                               unsigned int pti_index,
                                unsigned int period )
 {
@@ -178 +178 @@
     if (x >= X_SIZE)             return 1; 
     if (y >= Y_SIZE)             return 1; 
-    if (proc_id >= NB_PROCS_MAX) return 1; 
 
 #if USE_XICU
     unsigned int* xcu_address = (unsigned int *) ((unsigned int)&seg_xcu_base + 
                                 (cluster_xy * (unsigned int)&vseg_cluster_increment));
-    xcu_address[XICU_REG(XICU_PTI_PER, proc_id)] = period;
+    xcu_address[XICU_REG(XICU_PTI_PER, pti_index)] = period;
     return 0;
 #else
@@ -200 +199 @@
 //////////////////////////////////////////////////////////////////////////////
 unsigned int _xcu_timer_stop( unsigned int cluster_xy, 
-                              unsigned int proc_id) 
-{
-    // parameters checking 
-    unsigned int x = cluster_xy >> Y_WIDTH;
-    unsigned int y = cluster_xy & ((1<<Y_WIDTH)-1);
-    if (x >= X_SIZE)             return 1; 
-    if (y >= Y_SIZE)             return 1; 
-    if (proc_id >= NB_PROCS_MAX) return 1; 
+                              unsigned int pti_index) 
+{
+    // parameters checking 
+    unsigned int x = cluster_xy >> Y_WIDTH;
+    unsigned int y = cluster_xy & ((1<<Y_WIDTH)-1);
+    if (x >= X_SIZE)             return 1; 
+    if (y >= Y_SIZE)             return 1; 
 
 #if USE_XICU
     unsigned int * xcu_address = (unsigned int *) ((unsigned int)&seg_xcu_base + 
                                  (cluster_xy * (unsigned int)&vseg_cluster_increment));
-    xcu_address[XICU_REG(XICU_PTI_PER, proc_id)] = 0;
+    xcu_address[XICU_REG(XICU_PTI_PER, pti_index)] = 0;
     return 0;
 #else
@@ -231 +229 @@
 //////////////////////////////////////////////////////////////////////////////
 unsigned int _xcu_timer_reset_irq( unsigned int cluster_xy, 
-                                   unsigned int proc_id ) 
-{
-    // parameters checking 
-    unsigned int x = cluster_xy >> Y_WIDTH;
-    unsigned int y = cluster_xy & ((1<<Y_WIDTH)-1);
-    if (x >= X_SIZE)             return 1; 
-    if (y >= Y_SIZE)             return 1; 
-    if (proc_id >= NB_PROCS_MAX) return 1; 
-
-#if USE_XICU
-    unsigned int * xcu_address = (unsigned int *) ((unsigned int)&seg_xcu_base +
-                                 (cluster_xy * (unsigned int)&vseg_cluster_increment));
-
-    unsigned int bloup = xcu_address[XICU_REG(XICU_PTI_ACK, proc_id)];
-    bloup++; // to avoid a warning 
+                                   unsigned int pti_index ) 
+{
+    // parameters checking 
+    unsigned int x = cluster_xy >> Y_WIDTH;
+    unsigned int y = cluster_xy & ((1<<Y_WIDTH)-1);
+    if (x >= X_SIZE)             return 1; 
+    if (y >= Y_SIZE)             return 1; 
+
+#if USE_XICU
+    volatile unsigned int * xcu_address =
+        (unsigned int *) ((unsigned int)&seg_xcu_base +
+        (cluster_xy * (unsigned int)&vseg_cluster_increment));
+
+    xcu_address[XICU_REG(XICU_PTI_ACK, pti_index)];
     return 0;
 #else
@@ -265 +262 @@
 /////////////////////////////////////////////////////////////////////////////
 unsigned int _xcu_timer_reset_cpt( unsigned int cluster_xy, 
-                                   unsigned int proc_id ) 
-{
-    // parameters checking 
-    unsigned int x = cluster_xy >> Y_WIDTH;
-    unsigned int y = cluster_xy & ((1<<Y_WIDTH)-1);
-    if (x >= X_SIZE)             return 1; 
-    if (y >= Y_SIZE)             return 1; 
-    if (proc_id >= NB_PROCS_MAX) return 1; 
+                                   unsigned int pti_index ) 
+{
+    // parameters checking 
+    unsigned int x = cluster_xy >> Y_WIDTH;
+    unsigned int y = cluster_xy & ((1<<Y_WIDTH)-1);
+    if (x >= X_SIZE)             return 1; 
+    if (y >= Y_SIZE)             return 1; 
 
 #if USE_XICU
@@ -278 +274 @@
                                  (cluster_xy * (unsigned int)&vseg_cluster_increment));
 
-    unsigned int period = xcu_address[XICU_REG(XICU_PTI_PER, proc_id)];
+    unsigned int period = xcu_address[XICU_REG(XICU_PTI_PER, pti_index)];
 
     // we write 0 first because if the timer is currently running, 
     // the corresponding timer counter is not reset
-    xcu_address[XICU_REG(XICU_PTI_PER, proc_id)] = 0;
-    xcu_address[XICU_REG(XICU_PTI_PER, proc_id)] = period;
+    xcu_address[XICU_REG(XICU_PTI_PER, pti_index)] = 0;
+    xcu_address[XICU_REG(XICU_PTI_PER, pti_index)] = period;
     return 0;
 #else