Changeset 82 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/SelfTest/src

Timestamp:

May 1, 2008, 6:48:45 PM (16 years ago)

Author:

rosiere

Message:

• support locale (now must "just" translate)
• update all component with new test format
• update all component with usage
• New component : decod queue and prediction_unit

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/SelfTest/src/test.cpp (modified) (7 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/SelfTest/src/test.cpp

@@ -7 +7 @@
  */
 
+#define NB_ITERATION  128
+#define CYCLE_MAX     (128*NB_ITERATION)
+
 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/SelfTest/include/test.h"
 #include "Common/include/Test.h"
-
-#define NB_ITERATION  128
-#define CYCLE_MAX     (128*NB_ITERATION)
-
-#define LABEL(str)                                                                       \
-{                                                                                        \
-  cout << "{"+toString(static_cast<uint32_t>(sc_simulation_time()))+"} " << str << endl; \
-} while(0)
-
-static uint32_t cycle = 0;
-
-#define SC_START(cycle_offset)                                          \
-do                                                                      \
-{                                                                       \
-/*cout << "SC_START (begin)" << endl;*/                                 \
-                                                                        \
-  uint32_t cycle_current = static_cast<uint32_t>(sc_simulation_time()); \
-  if (cycle_current != cycle)                                           \
-    {                                                                   \
-      cycle = cycle_current;                                            \
-      cout << "##########[ cycle "<< cycle << " ]" << endl;             \
-    }                                                                   \
-                                                                        \
-  if (cycle_current > CYCLE_MAX)                                        \
-    {                                                                   \
-      TEST_KO("Maximal cycles Reached");                                \
-    }                                                                   \
-  sc_start(cycle_offset);                                               \
-/*cout << "SC_START (end  )" << endl;*/                                 \
-} while(0)
 
 void test (string name,
@@ -49 +22 @@
 #endif
 
-  Register_unit_Glue * _Register_unit_Glue = new Register_unit_Glue (name.c_str(),
+  Register_unit_Glue * _Register_unit_Glue = new Register_unit_Glue 
+    (name.c_str(),
 #ifdef STATISTICS
-                                             _parameters_statistics,
+     _parameters_statistics,
 #endif
-                                             _param);
+     _param,
+     USE_ALL);
   
 #ifdef SYSTEMC
@@ -575 +550 @@
   for (uint32_t iteration=0; iteration<NB_ITERATION; iteration ++)
     {
-      LABEL("Iteration "+toString(iteration));
+      LABEL("Iteration %d",iteration);
 
       if (test_read == true)
@@ -584 +559 @@
               Tcontrol_t      val = (rand()%100)<=percent_transaction;
               
-              LABEL("GPR_READ  ["+toString(j)+"] : "+toString(val)+" - " +toString(static_cast<uint32_t>(context)));
+              LABEL("GPR_READ  [%d] : %d - %d",j,val,context);
               
               in_GPR_READ_VAL           [j] ->write(val);
@@ -623 +598 @@
               Tcontrol_t      val = (rand()%100)<=percent_transaction;
               
-              LABEL("SPR_READ  ["+toString(j)+"] : "+toString(val)+" - " +toString(static_cast<uint32_t>(context)));
+              LABEL("SPR_READ  [%d] : %d - %d",j,val,context);
               
               in_SPR_READ_VAL           [j] ->write(val);
@@ -666 +641 @@
               Tcontrol_t      val = (rand()%100)<=percent_transaction;
               
-              LABEL("GPR_WRITE ["+toString(j)+"] : "+toString(val)+" - " +toString(static_cast<uint32_t>(context)));
-              
+              LABEL("GPR_WRITE [%d] : %d - %d",j,val,context);
+
               in_GPR_WRITE_VAL           [j] ->write(val);
               in_GPR_WRITE_OOO_ENGINE_ID [j] ->write(context);
@@ -701 +676 @@
               Tcontrol_t      val = (rand()%100)<=percent_transaction;
               
-              LABEL("SPR_WRITE ["+toString(j)+"] : "+toString(val)+" - " +toString(static_cast<uint32_t>(context)));
+              LABEL("SPR_WRITE [%d] : %d - %d",j,val,context);
               
               in_SPR_WRITE_VAL           [j] ->write(val);