Changeset 71 for trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/SelfTest/src/test.cpp

Timestamp:

Jan 19, 2008, 12:09:01 PM (16 years ago)

Author:

rosiere

Message:

Modification of Statisctics
Add a new systemC component : Load_Store_Queue (tested with one benchmark and one configuration). Store don't supported the Data Buss Error (Load is supported)

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/SelfTest/src/test.cpp (modified) (3 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/SelfTest/src/test.cpp

@@ -13 +13 @@
 #define CYCLE_MAX     (128*NB_ITERATION)
 
-#define LABEL(str)                                                                       \
-{                                                                                        \
-  cout << "{"+toString(static_cast<uint32_t>(sc_simulation_time()))+"} " << str << endl; \
+#define LABEL(str)                                                      \
+  {                                                                     \
+  msg (_("{%d} %s\n"),static_cast<uint32_t>(sc_simulation_time()),str); \
 } 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)
+#define SC_START(cycle_offset)                                                       \
+  do                                                                                 \
+    {                                                                                \
+      /*cout << "SC_START (begin)" << endl;*/                                        \
+                                                                                     \
+      uint32_t cycle_current = static_cast<uint32_t>(sc_simulation_time());          \
+      if (cycle_offset != 0)                                                         \
+        {                                                                            \
+          cout << "##########[ cycle "<< cycle_current+cycle_offset << " ]" << 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,
            morpheo::behavioural::@NAMESPACE_USE::Parameters * _param)
 {
-  cout << "<" << name << "> : Simulation SystemC" << endl;
+  msg(_("<%s> : Simulation SystemC.\n"),name.c_str());
 
 #ifdef STATISTICS
@@ -68 +67 @@
    ********************************************************/
   
-  cout << "<" << name << "> Instanciation of _@COMPONENT" << endl;
-  
+  msg(_("<%s> : Instanciation of _@COMPONENT.\n"),name.c_str());
+
   (*(_@COMPONENT->in_CLOCK))        (*(in_CLOCK));
   (*(_@COMPONENT->in_NRESET))       (*(in_NRESET));
 
 
-  cout << "<" << name << "> Start Simulation ............" << endl;
+  msg(_("<%s> : Start Simulation ............\n"),name.c_str());
+    
   Time * _time = new Time();
 
@@ -111 +111 @@
   TEST_OK ("End of Simulation");
   delete _time;
-  cout << "<" << name << "> ............ Stop Simulation" << endl;
+
+  msg(_("<%s> : ............ Stop Simulation\n"),name.c_str());
 
   delete in_CLOCK;