Changeset 779 for trunk/platforms/tsar_generic_xbar/top.cpp

Timestamp:

Aug 28, 2014, 6:04:44 PM (10 years ago)

Author:

meunier

Message:

Trunk:

• Updating python scripts for simulations and graphs for tsar_generic_xbar (support for rwt and mesi)

File:

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

trunk/platforms/tsar_generic_xbar/top.cpp

@@ -121 +121 @@
 ///////////////////////////////////////////////////
 
-#define USE_OPENMP 0
 
 #if USE_OPENMP
@@ -881 +880 @@
 
 
+//#define SC_TRACE
+#ifdef SC_TRACE
+   sc_trace_file * tf = sc_create_vcd_trace_file("my_trace_file");
+
+   if (X_SIZE > 1){
+      for (size_t x = 0; x < (X_SIZE-1); x++){
+         for (size_t y = 0; y < Y_SIZE; y++){
+            for (size_t k = 0; k < 3; k++){
+               signal_dspin_h_cmd_inc[x][y][k].trace(tf, "dspin_h_cmd_inc");
+               signal_dspin_h_cmd_dec[x][y][k].trace(tf, "dspin_h_cmd_dec");
+            }
+
+            for (size_t k = 0; k < 2; k++){
+               signal_dspin_h_rsp_inc[x][y][k].trace(tf, "dspin_h_rsp_inc");
+               signal_dspin_h_rsp_dec[x][y][k].trace(tf, "dspin_h_rsp_dec");
+            }
+         }
+      }
+   }
+
+   if (Y_SIZE > 1) {
+      for (size_t y = 0; y < (Y_SIZE-1); y++){
+         for (size_t x = 0; x < X_SIZE; x++){
+            for (size_t k = 0; k < 3; k++){
+               signal_dspin_v_cmd_inc[x][y][k].trace(tf, "dspin_v_cmd_inc");
+               signal_dspin_v_cmd_dec[x][y][k].trace(tf, "dspin_v_cmd_dec");
+            }
+
+            for (size_t k = 0; k < 2; k++){
+               signal_dspin_v_rsp_inc[x][y][k].trace(tf, "dspin_v_rsp_inc");
+               signal_dspin_v_rsp_dec[x][y][k].trace(tf, "dspin_v_rsp_dec");
+            }
+         }
+      }
+   }
+
+   for (size_t x = 0; x < (X_SIZE); x++){
+      for (size_t y = 0; y < Y_SIZE; y++){
+         std::ostringstream signame;
+         signame << "cluster" << x << "_" << y;
+         clusters[x][y]->trace(tf, signame.str());
+      }
+   }
+#endif
+
+
    ////////////////////////////////////////////////////////
    //   Simulation
@@ -898 +943 @@
                signal_dspin_false_cmd_out[x][y][a][k].read  = true;
             }
-            for (size_t k = 0; k < 2; k++){
-               signal_dspin_false_rsp_in [x][y][a][k].write = false;
-               signal_dspin_false_rsp_in [x][y][a][k].read  = true;
-               signal_dspin_false_rsp_out[x][y][a][k].write = false;
-               signal_dspin_false_rsp_out[x][y][a][k].read  = true;
-            }
+             for (size_t k = 0; k < 2; k++){
+                signal_dspin_false_rsp_in [x][y][a][k].write = false;
+                signal_dspin_false_rsp_in [x][y][a][k].read  = true;
+                signal_dspin_false_rsp_out[x][y][a][k].write = false;
+                signal_dspin_false_rsp_out[x][y][a][k].read  = true;
+             }
          }
       }
@@ -910 +955 @@
    sc_start(sc_core::sc_time(1, SC_NS));
    signal_resetn = true;
-
-#define SC_TRACE
-#ifdef SC_TRACE
-   sc_trace_file * tf = sc_create_vcd_trace_file("my_trace_file");
-
-   if (X_SIZE > 1){
-      for (size_t x = 0; x < (X_SIZE-1); x++){
-         for (size_t y = 0; y < Y_SIZE; y++){
-            for (size_t k = 0; k < 3; k++){
-               signal_dspin_h_cmd_inc[x][y][k].trace(tf, "dspin_h_cmd_inc");
-               signal_dspin_h_cmd_dec[x][y][k].trace(tf, "dspin_h_cmd_dec");
-            }
-
-            for (size_t k = 0; k < 2; k++){
-               signal_dspin_h_rsp_inc[x][y][k].trace(tf, "dspin_h_rsp_inc");
-               signal_dspin_h_rsp_dec[x][y][k].trace(tf, "dspin_h_rsp_dec");
-            }
-         }
-      }
-   }
-
-   if (Y_SIZE > 1) {
-      for (size_t y = 0; y < (Y_SIZE-1); y++){
-         for (size_t x = 0; x < X_SIZE; x++){
-            for (size_t k = 0; k < 3; k++){
-               signal_dspin_v_cmd_inc[x][y][k].trace(tf, "dspin_v_cmd_inc");
-               signal_dspin_v_cmd_dec[x][y][k].trace(tf, "dspin_v_cmd_dec");
-            }
-
-            for (size_t k = 0; k < 2; k++){
-               signal_dspin_v_rsp_inc[x][y][k].trace(tf, "dspin_v_rsp_inc");
-               signal_dspin_v_rsp_dec[x][y][k].trace(tf, "dspin_v_rsp_dec");
-            }
-         }
-      }
-   }
-
-   for (size_t x = 0; x < (X_SIZE); x++){
-      for (size_t y = 0; y < Y_SIZE; y++){
-         std::ostringstream signame;
-         signame << "cluster" << x << "_" << y;
-         clusters[x][y]->trace(tf, signame.str());
-      }
-   }
-#endif
 
    if (debug_ok) {