Changeset 50 for trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/SelfTest

Timestamp:

Aug 17, 2007, 6:00:56 PM (17 years ago)

Author:

rosiere

Message:

Changement dans le répertoire "New_Component" afin que les composants nouvellement crées peuvent compiler

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/SelfTest

Files:

• include/test.h (modified) (2 diffs)
• src/main.cpp (modified) (1 diff)
• src/test.cpp (modified) (6 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/SelfTest/include/test.h

@@ -13 +13 @@
 #include <string>
 #include <iostream>
+#include <sys/time.h>
 
 #include "Behavioural/@DIRECTORY/include/@COMPONENT.h"
@@ -23 +24 @@
 
 void test    (string name,
-              morpheo::behavioural::@NAMESPACE_USE::Parameters param);
+              morpheo::behavioural::@NAMESPACE_USE::Parameters * param);
+
+class Time 
+{
+private : timeval time_begin;
+// private : timeval time_end;
+  
+public  : Time ()
+  {
+    gettimeofday(&time_begin     ,NULL);
+  };
+
+public  : ~Time ()
+  {
+    cout << *this;
+  };
+
+public  : friend ostream& operator<< (ostream& output_stream,
+                                      const Time & x)
+  {
+    timeval time_end;
+    
+    gettimeofday(&time_end       ,NULL);
+    
+    uint32_t nb_cycles = static_cast<uint32_t>(sc_simulation_time());
+
+    double average = static_cast<double>(nb_cycles) / static_cast<double>(time_end.tv_sec-x.time_begin.tv_sec);
+    
+    output_stream << nb_cycles << "\t(" << average << " cycles / seconds )" << endl;
+
+    return output_stream;
+  }
+};

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

@@ -40 +40 @@
   try 
     {
-      morpheo::behavioural::@NAMESPACE_USE::Parameters param (//size_data,
-                                                              //nb_port  
-                                                             );
+      morpheo::behavioural::@NAMESPACE_USE::Parameters * param = new morpheo::behavioural::@NAMESPACE_USE::Parameters
+        (//size_data,
+         //nb_port  
+        );
       
-      cout << param.print(1);
+      cout << param->print(1);
       
       test (name,param);

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

@@ -7 +7 @@
  */
 
-#define NB_ITERATION 1
-
-#define LABEL(str) do {cout << "{"+toString(static_cast<uint32_t>(sc_simulation_time()))+"} " << str << endl; _@COMPONENT->vhdl_testbench_label(str);} while (0)
-
 #include "Behavioural/@DIRECTORY/SelfTest/include/test.h"
 #include "Common/include/Test.h"
 
+#define NB_ITERATION  1
+#define CYCLE_MAX     (128*NB_ITERATION)
+
+#define LABEL(str)                                                                       \
+{                                                                                        \
+  cout << "{"+toString(static_cast<uint32_t>(sc_simulation_time()))+"} " << str << endl; \
+} while(0)
+
+#define SC_START(cycle)                                        \
+do                                                             \
+{                                                              \
+  if (static_cast<uint32_t>(sc_simulation_time()) > CYCLE_MAX) \
+    {                                                          \
+      TEST_KO("Maximal cycles Reached");                       \
+    }                                                          \
+  sc_start(cycle);                                             \
+} while(0)
+
 void test (string name,
-           morpheo::behavioural::@NAMESPACE_USE::Parameters _param)
+           morpheo::behavioural::@NAMESPACE_USE::Parameters * _param)
 {
   cout << "<" << name << "> : Simulation SystemC" << endl;
@@ -23 +37 @@
                                              morpheo::behavioural::Parameters_Statistics(5,50),
 #endif
-                                             _param);
+                                             *_param);
   
 #ifdef SYSTEMC
@@ -48 +62 @@
 
   cout << "<" << name << "> Start Simulation ............" << endl;
+  Time * _time = new Time();
 
   /********************************************************
@@ -60 +75 @@
   srand(seed);
 
-  sc_start(0);
+  SC_START(0);
   LABEL("Initialisation");
 
@@ -69 +84 @@
       LABEL("Iteration "+toString(iteration));
 
-      sc_start(1);
+      SC_START(1);
     }
 
@@ -76 +91 @@
    ********************************************************/
 
+  TEST_OK ("End of Simulation");
+  delete _time;
   cout << "<" << name << "> ............ Stop Simulation" << endl;