Changeset 97 for trunk/IPs/systemC/processor/Morpheo/Common/include

Timestamp:

Dec 19, 2008, 4:34:00 PM (16 years ago)

Author:

rosiere

Message:

1) Update Prediction Table : statistics
2) Size instruction address on 30 bits
3) Change Log File
4) Add debug_level in simulation configuration file

Location:

trunk/IPs/systemC/processor/Morpheo/Common/include

Files:

• Debug.h (modified) (9 diffs)
• Message.h (modified) (1 diff)
• Time.h (modified) (2 diffs)

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

@@ -9 +9 @@
  * function to help the debugging :
  *
- *  - debug_tab
  *  - log_printf
  *  - log_begin
@@ -26 +25 @@
 
 #include "Common/include/Message.h"
+#include "Common/include/FromString.h"
+#include "Common/include/ChangeCase.h"
 #include "Behavioural/include/Debug_component.h"
 #include <systemc.h>
@@ -36 +37 @@
 namespace morpheo {
 
-enum _debug_verbosity 
+typedef enum 
   {
     DEBUG_NONE ,
@@ -43 +44 @@
     DEBUG_FUNC ,
     DEBUG_ALL
-  };
-
-std::string debug_tab     (void);
-void        debug_tab_inc (void);
-void        debug_tab_dec (void);
-
+  } debug_verbosity_t;
+
+  extern debug_verbosity_t debug;
+
+void        debug_init    (void);
+void        debug_init    (debug_verbosity_t level);
 #ifdef DEBUG
+
 # define log_printf(level, component, func, str... )                    \
   do                                                                    \
     {                                                                   \
-      if ((DEBUG == DEBUG_ALL ) or                                      \
+      debug_init();                                                     \
+                                                                        \
+      if ((debug == DEBUG_ALL ) or                                      \
           (DEBUG_ ## level == DEBUG_NONE) or                            \
-          (( DEBUG_ ## level     <= DEBUG) and                          \
+          (( DEBUG_ ## level     <= debug) and                          \
            ( DEBUG_ ## component == true )) )                           \
         {                                                               \
@@ -67 +71 @@
             }                                                           \
                                                                         \
-          if (DEBUG >= DEBUG_FUNC)                                      \
-            {                                                           \
-              msg("%s",debug_tab().c_str());                            \
-            }                                                           \
-          if (DEBUG >= DEBUG_ALL )                                      \
+          if (debug >= DEBUG_ALL )                                      \
             {                                                           \
               switch (DEBUG_ ## level)                                  \
@@ -83 +83 @@
                 }                                                       \
             }                                                           \
-          if (DEBUG >= DEBUG_FUNC)                                      \
+          if (debug >= DEBUG_FUNC)                                      \
             {                                                           \
               msg(  "<%s> " ,func);                                     \
@@ -98 +98 @@
   do                                                                    \
     {                                                                   \
-      debug_tab_inc ();                                                 \
       log_printf(FUNC,component,func,_("Begin"));                       \
     } while(0)
@@ -106 +105 @@
     {                                                                   \
       log_printf(FUNC,component,func,_("End"));                         \
-      debug_tab_dec ();                                                 \
     } while(0)
 
@@ -172 +170 @@
 #endif
 
+
+  template<> inline debug_verbosity_t fromString<debug_verbosity_t> (const std::string& x)
+  {
+    std::string y=x;
+    LowerCase(y);
+
+    if ( (y.compare("0")     == 0) or
+         (y.compare("none")  == 0))
+      return DEBUG_NONE ;
+    if ( (y.compare("1")     == 0) or
+         (y.compare("info")  == 0))
+      return DEBUG_INFO ;
+    if ( (y.compare("2")     == 0) or
+         (y.compare("trace") == 0))
+      return DEBUG_TRACE;
+    if ( (y.compare("3")     == 0) or
+         (y.compare("func")  == 0))
+      return DEBUG_FUNC ;
+    if ( (y.compare("4")     == 0) or
+         (y.compare("all")   == 0))
+      return DEBUG_ALL  ;
+
+#ifdef DEBUG
+    return DEBUG;
+#else
+    return DEBUG_NONE ;
+#endif
+  }
+
 }; // end namespace morpheo
 #endif // !DEBUG_H

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

@@ -41 +41 @@
 #endif
 
-#ifdef LOG_FILE
 extern FILE * log_stream;
-void log_init (void);
+FILE * log      (FILE * stream);
+void   log_init (bool        have_file,
+                 std::string directory,
+                 std::string file="");
 
 #define fmsg(stream,arg...)                     \
   do                                            \
     {                                           \
-      log_init();                               \
-      fprintf(log_stream,arg);                  \
-      fflush(log_stream);                       \
+      FILE * _stream = log(stream);             \
+      fprintf(_stream,arg);                     \
+      fflush(_stream);                          \
     } while (0)
-
-#else
-
-#define fmsg(stream,arg...)                     \
-  do                                            \
-    {                                           \
-      fprintf(stream,arg);                      \
-      fflush(stream);                           \
-    } while (0) 
-
-#endif
 
 #define fmsgDebug(stream,arg...)                \

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

@@ -15 +15 @@
 {
 #ifdef SYSTEMC
-private : double   nb_cycles_begin;
+private : const bool systemc;
+private : double     nb_cycles_begin;
 #endif
-private : timeval  time_begin;
+private : timeval    time_begin;
 // private : timeval time_end;
   
-public  : Time ()
+public  : Time (bool systemc=true)
+#ifdef SYSTEMC
+  :
+  systemc (systemc)
+#endif
   { 
 #ifdef SYSTEMC
@@ -41 +46 @@
     
 #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 << "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;
+    if (x.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 << "Timing : " << nb_cycles_end << " cycles \t(" << average << " cycles/s)" << std::endl;
+      }
+    else
 #endif
-    
+      {
+        double average       = static_cast<double>(time_end.tv_sec-x.time_begin.tv_sec+1);
+        
+        output << "Timing : " << average << " s" << std::endl;
+      }
+
     return output;
   }