Changeset 263 for soft/giet_vm/giet_drivers/icu_driver.c

Timestamp:

Dec 19, 2013, 9:36:48 AM (11 years ago)

Author:

alain

Message:

Introducing support for TSAR fixed format cluster index (cluster_xy)
We have now 4 parameters defined in map.xml:

• X_WIDTH, Y_WIDTH define the fixed format (typically X_WIDTH = 4 / Y_WIDTH = 4)
• X_SIZE, Y_SIZE define the actual TSAR 2D mesh variable size (from 1 to 16)

File:

• soft/giet_vm/giet_drivers/icu_driver.c (modified) (4 diffs)

soft/giet_vm/giet_drivers/icu_driver.c

@@ -16 +16 @@
 // The virtual base address of the segment associated to the component is:
 //
-//      seg_icu_base + cluster_id * vseg_cluster_increment 
+//      seg_icu_base + cluster_xy * vseg_cluster_increment 
 //
 // The seg_icu_base and vseg_cluster_increment values must be defined 
@@ -24 +24 @@
 #include <giet_config.h>
 #include <icu_driver.h>
+#include <tty_driver.h>
 #include <utils.h>
 
-#if !defined(NB_CLUSTERS) 
-# error: You must define NB_CLUSTERS in the hard_config.h file
+#if !defined(X_SIZE) 
+# error: You must define X_SIZE in the hard_config.h file
 #endif
 
-#if (NB_CLUSTERS > 256)
-# error: NB_CLUSTERS cannot be larger than 256!
+#if !defined(Y_SIZE) 
+# error: You must define X_SIZE in the hard_config.h file
+#endif
+
+#if !defined(X_WIDTH) 
+# error: You must define X_WIDTH in the hard_config.h file
+#endif
+
+#if !defined(Y_WIDTH) 
+# error: You must define X_WIDTH in the hard_config.h file
 #endif
 
 #if !defined(NB_PROCS_MAX) 
 # error: You must define NB_PROCS_MAX in the hard_config.h file
-#endif
-
-#if (NB_PROCS_MAX > 8)
-# error: NB_PROCS_MAX cannot be larger than 8!
 #endif
 
@@ -53 +58 @@
 // Returns 0 if success, > 0 if error.
 ////////////////////////////////////////////////////////////////////////////////
-unsigned int _icu_set_mask( unsigned int cluster_id,
+unsigned int _icu_set_mask( unsigned int cluster_xy,
                             unsigned int proc_id,
                             unsigned int value )
 {
     // parameters checking 
-    if (cluster_id >= NB_CLUSTERS) return 1; 
-    if (proc_id >= NB_PROCS_MAX)   return 1; 
+    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
-    _puts("[GIET ERROR] _icu_set_mask should not be used if USE_XICU is set\n");
+    _puts("[GIET ERROR] _icu_set_mask() should not be used if USE_XICU is set\n");
     return 1;
 #else
     unsigned int * icu_address = (unsigned int *) ((unsigned int)&seg_icu_base + 
-                                 (cluster_id * (unsigned int)&vseg_cluster_increment));
+                                 (cluster_xy * (unsigned int)&vseg_cluster_increment));
     icu_address[proc_id * ICU_SPAN + ICU_MASK_SET] = value; 
     return 0;
@@ -78 +86 @@
 // Returns 0 if success, > 0 if error.
 ////////////////////////////////////////////////////////////////////////////////
-unsigned int _icu_get_index( unsigned int cluster_id, 
+unsigned int _icu_get_index( unsigned int cluster_xy, 
                              unsigned int proc_id, 
                              unsigned int * buffer) 
 {
     // parameters checking 
-    if (cluster_id >= NB_CLUSTERS)  return 1;
-    if (proc_id >= NB_PROCS_MAX)    return 1;
+    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
-    _puts("[GIET ERROR] _icu_get_index should not be used if USE_XICU is set\n");
+    _puts("[GIET ERROR] _icu_get_index() should not be used if USE_XICU is set\n");
     return 1;
 #else
     unsigned int* icu_address = (unsigned int *) ((unsigned int)&seg_icu_base + 
-                                 (cluster_id * (unsigned int)&vseg_cluster_increment));
+                                 (cluster_xy * (unsigned int)&vseg_cluster_increment));
     *buffer = icu_address[proc_id * ICU_SPAN + ICU_IT_VECTOR]; 
     return 0;