Changeset 263 for soft/giet_vm/giet_common/utils.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_common/utils.c (modified) (11 diffs)

soft/giet_vm/giet_common/utils.c

@@ -19 +19 @@
 
 // This global variable is allocated in the boot.c file or in kernel_init.c file
-extern static_scheduler_t* _schedulers[NB_CLUSTERS * NB_PROCS_MAX];
+extern static_scheduler_t* _schedulers[X_SIZE * Y_SIZE * NB_PROCS_MAX];
 
 ///////////////////////////////////////////////////////////////////////////////////
@@ -565 +565 @@
     return (mapping_pseg_t *) ((char *) header +
             MAPPING_HEADER_SIZE +
-            MAPPING_CLUSTER_SIZE * header->clusters);
+            MAPPING_CLUSTER_SIZE * X_SIZE * Y_SIZE);
 }
 /////////////////////////////////////////////////////////////////////////////
@@ -572 +572 @@
     return (mapping_vspace_t *)  ((char *) header +
             MAPPING_HEADER_SIZE +
-            MAPPING_CLUSTER_SIZE * header->clusters +
+            MAPPING_CLUSTER_SIZE * X_SIZE * Y_SIZE +
             MAPPING_PSEG_SIZE * header->psegs);
 }
@@ -580 +580 @@
     return (mapping_vseg_t *) ((char *) header +
             MAPPING_HEADER_SIZE +
-            MAPPING_CLUSTER_SIZE * header->clusters +
+            MAPPING_CLUSTER_SIZE * X_SIZE * Y_SIZE +
             MAPPING_PSEG_SIZE * header->psegs +
             MAPPING_VSPACE_SIZE * header->vspaces);
@@ -589 +589 @@
     return (mapping_vobj_t *) ((char *) header +
             MAPPING_HEADER_SIZE +
-            MAPPING_CLUSTER_SIZE * header->clusters +
+            MAPPING_CLUSTER_SIZE * X_SIZE * Y_SIZE +
             MAPPING_PSEG_SIZE * header->psegs +
             MAPPING_VSPACE_SIZE * header->vspaces +
@@ -599 +599 @@
     return (mapping_task_t *) ((char *) header +
             MAPPING_HEADER_SIZE +
-            MAPPING_CLUSTER_SIZE * header->clusters +
+            MAPPING_CLUSTER_SIZE * X_SIZE * Y_SIZE +
             MAPPING_PSEG_SIZE * header->psegs +
             MAPPING_VSPACE_SIZE * header->vspaces +
@@ -610 +610 @@
     return (mapping_proc_t *) ((char *) header +
             MAPPING_HEADER_SIZE +
-            MAPPING_CLUSTER_SIZE * header->clusters +
+            MAPPING_CLUSTER_SIZE * X_SIZE * Y_SIZE +
             MAPPING_PSEG_SIZE * header->psegs +
             MAPPING_VSPACE_SIZE * header->vspaces +
@@ -622 +622 @@
     return (mapping_irq_t *) ((char *) header +
             MAPPING_HEADER_SIZE +
-            MAPPING_CLUSTER_SIZE * header->clusters +
+            MAPPING_CLUSTER_SIZE * X_SIZE * Y_SIZE +
             MAPPING_PSEG_SIZE * header->psegs +
             MAPPING_VSPACE_SIZE * header->vspaces +
@@ -635 +635 @@
     return (mapping_coproc_t *) ((char *) header +
             MAPPING_HEADER_SIZE +
-            MAPPING_CLUSTER_SIZE * header->clusters +
+            MAPPING_CLUSTER_SIZE * X_SIZE * Y_SIZE +
             MAPPING_PSEG_SIZE * header->psegs +
             MAPPING_VSPACE_SIZE * header->vspaces +
@@ -649 +649 @@
     return (mapping_cp_port_t *) ((char *) header +
             MAPPING_HEADER_SIZE +
-            MAPPING_CLUSTER_SIZE * header->clusters +
+            MAPPING_CLUSTER_SIZE * X_SIZE * Y_SIZE +
             MAPPING_PSEG_SIZE * header->psegs +
             MAPPING_VSPACE_SIZE * header->vspaces +
@@ -664 +664 @@
     return (mapping_periph_t *) ((char *) header +
             MAPPING_HEADER_SIZE +
-            MAPPING_CLUSTER_SIZE * header->clusters +
+            MAPPING_CLUSTER_SIZE * X_SIZE * Y_SIZE +
             MAPPING_PSEG_SIZE * header->psegs +
             MAPPING_VSPACE_SIZE * header->vspaces +