Changeset 803 for trunk/platforms/tsar_generic_leti/top.cpp

Timestamp:

Sep 12, 2014, 3:10:04 PM (9 years ago)

Author:

cfuguet

Message:

tsar_generic_leti: Using the new P_WIDTH constant from hard_config.h

• This constant is used in the clusters to compute the procesor id which now is: (((x << Y_WIDTH) + y) << P_WIDTH) + lpid

• Introducing the p_width constant in the arch.py files

File:

• trunk/platforms/tsar_generic_leti/top.cpp (modified) (4 diffs)

trunk/platforms/tsar_generic_leti/top.cpp

@@ -272 +272 @@
             trace_proc_ok = true;
             trace_proc_id = (size_t) strtol(argv[n + 1], NULL, 0);
-            size_t cluster_xy = trace_proc_id / NB_PROCS_MAX ;
+            size_t cluster_xy = trace_proc_id >> P_WIDTH ;
             size_t x          = cluster_xy >> Y_WIDTH;
             size_t y          = cluster_xy & ((1<<Y_WIDTH)-1);
-            size_t l          = trace_proc_id % NB_PROCS_MAX ;
+            size_t l          = trace_proc_id & ((1<<P_WIDTH)-1) ;
 
             assert( (x < X_SIZE) and (y < Y_SIZE) and (l < NB_PROCS_MAX) and
@@ -324 +324 @@
             "Illegal Y_SIZE parameter" );
 
+    assert( (P_WIDTH <= 2) and
+            "P_WIDTH parameter cannot be larger than 2" );
+
     assert( (NB_PROCS_MAX <= 4) and
             "Illegal NB_PROCS_MAX parameter" );
@@ -664 +667 @@
                 Y_WIDTH,
                 vci_srcid_width - X_WIDTH - Y_WIDTH,   // l_id width,
+                P_WIDTH,
                 MEMC_TGTID,
                 XICU_TGTID,
@@ -1177 +1181 @@
             if ( trace_proc_ok )
             {
-                l = trace_proc_id % NB_PROCS_MAX ;
-                x = (trace_proc_id / NB_PROCS_MAX) >> Y_WIDTH ;
-                y = (trace_proc_id / NB_PROCS_MAX) & ((1<<Y_WIDTH) - 1);
+                l = trace_proc_id & ((1<<P_WIDTH)-1) ;
+                x = (trace_proc_id >> P_WIDTH) >> Y_WIDTH ;
+                y = (trace_proc_id >> P_WIDTH) & ((1<<Y_WIDTH) - 1);
 
                 std::ostringstream proc_signame;