Changeset 88 for trunk/IPs/systemC/processor/Morpheo/Common/include/Time.h

Timestamp:

Dec 10, 2008, 7:31:39 PM (16 years ago)

Author:

rosiere

Message:

Almost complete design
with Test and test platform

File:

• trunk/IPs/systemC/processor/Morpheo/Common/include/Time.h (modified) (3 diffs)

trunk/IPs/systemC/processor/Morpheo/Common/include/Time.h

@@ -1 @@
-#ifndef TIME_H
-#define TIME_H
+#ifndef Morpheo_Time_h
+#define Morpheo_Time_h
 
 #ifdef SYSTEMC
@@ -10 +10 @@
 #include <sys/time.h>
 
+namespace morpheo {
+
 class Time 
 {
-private : timeval time_begin;
+#ifdef SYSTEMC
+private : double   nb_cycles_begin;
+#endif
+private : timeval  time_begin;
 // private : timeval time_end;
   
 public  : Time ()
-  {
-    gettimeofday(&time_begin     ,NULL);
+  { 
+#ifdef SYSTEMC
+    nb_cycles_begin = sc_simulation_time();
+#endif
+    gettimeofday(&time_begin,NULL);
   };
-
+  
 public  : ~Time ()
   {
@@ -25 +33 @@
   };
 
-public  : friend std::ostream& operator<< (std::ostream& output_stream,
+public  : friend std::ostream& operator<< (std::ostream& output,
                                            const Time & x)
   {
     timeval time_end;
     
-    gettimeofday(&time_end       ,NULL);
+    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+1);
+#ifdef SYSTEMC
+    double nb_cycles_end = sc_simulation_time();
+    double average       = static_cast<double>(nb_cycles_end-x.nb_cycles_begin+1) / static_cast<double>(time_end.tv_sec-x.time_begin.tv_sec+1);
     
-    output_stream << "Timing : " << nb_cycles << " cycles \t(" << average << " cycles/s)" << std::endl;
-
-    return output_stream;
+    output << "Timing : " << nb_cycles_end << " cycles \t(" << average << " cycles/s)" << std::endl;
+#else
+    double average       = static_cast<double>(time_end.tv_sec-x.time_begin.tv_sec+1);
+    
+    output << "Timing : " average << " s" << std::endl;
+#endif
+    
+    return output;
   }
 };
 
+}; // end namespace morpheo
+
 #endif