Changeset 263 for soft/giet_vm/giet_xml/mapping_info.h

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_xml/mapping_info.h (modified) (4 diffs)

soft/giet_vm/giet_xml/mapping_info.h

@@ -132 +132 @@
 {
     unsigned int signature;          // must contain MAPPING_SIGNATURE
-    unsigned int clusters;           // number of clusters
-    unsigned int cluster_x;          // number of cluster in a row
-    unsigned int cluster_y;          // number of cluster in a column
+    unsigned int x_size;             // actual number of clusters in a row
+    unsigned int y_size;             // actual number of clusters in a column
+    unsigned int x_width;            // number of bits to encode x coordinate 
+    unsigned int y_width;            // number of bits to encode y coordinate 
     unsigned int globals;            // number of vsegs mapped in all vspaces
     unsigned int vspaces;            // number of virtual spaces
@@ -183 +184 @@
 typedef struct __attribute__((packed))  mapping_cluster_s 
 {
+    unsigned int    x;               // x coordinate
+    unsigned int    y;               // y coordinate
+
     unsigned int    psegs;           // number of psegs in cluster
     unsigned int    pseg_offset;     // index of first pseg in pseg set
@@ -237 +241 @@
     paddr_t         length;          // size (bytes)
     unsigned int    type;            // RAM / PERI
-    unsigned int    cluster;         // index of cluster containing pseg
+    unsigned int    clusterid;       // linear index in array of clusters
     unsigned int    next_vseg;       // linked list of vsegs mapped on pseg
 } mapping_pseg_t;
@@ -246 +250 @@
 {
     char            name[32];        // task name (unique in vspace)
-    unsigned int    clusterid;       // physical cluster index
+    unsigned int    clusterid;       // linear index in array of clusters
     unsigned int    proclocid;       // processor local index (inside cluster)
     unsigned int    stack_vobjid;    // stack vobj index in vspace