Changeset 113 for trunk/IPs/systemC/processor/Morpheo/Common

Timestamp:

Apr 14, 2009, 8:39:12 PM (16 years ago)

Author:

rosiere

Message:

1) Add modelsim simulation systemC
2) Modelsim cosimulation systemC / VHDL is not finish !!!! (cf execute_queue and write_unit)
3) Add multi architecture
5) Add template for comparator, multiplier and divider
6) Change Message
Warning) Various test macro have change, many selftest can't compile

Location:

trunk/IPs/systemC/processor/Morpheo/Common

Files:

• Makefile.defs (modified) (1 diff)
• Makefile.deps (modified) (1 diff)
• include/BitManipulation.h (modified) (1 diff)
• include/Debug.h (modified) (3 diffs)
• include/Environment.h (modified) (1 diff)
• include/Message.h (modified) (3 diffs)
• include/Systemc.h (added)
• include/Test.h (modified) (10 diffs)
• include/Time.h (modified) (3 diffs)
• src/MemCheck.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Common/Makefile.defs

@@ -5 +5 @@
 # 
 
+ENTITY                          = Common
+
 #-----[ Directory ]----------------------------------------
 DIR_COMPONENT_MORPHEO           = ..

trunk/IPs/systemC/processor/Morpheo/Common/Makefile.deps

@@ -16 +16 @@
 #-----[ Library ]------------------------------------------
 
+Common_SOURCES          =       $(Common_DIR)/src/*.cpp
+
 Common_LIBRARY          =       -lCommon
 

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

@@ -42 +42 @@
   };
 
+  template <typename T>
+  T gen_mask_not   (uint32_t size)
+  { 
+    return gen_mask_not<T>(size-1,0);
+  };
+
   //............................................................................
   // mask, mask_not ............................................................

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

@@ -24 +24 @@
  */
 
+#include "Common/include/Systemc.h"
 #include "Common/include/Message.h"
 #include "Common/include/FromString.h"
@@ -64 +65 @@
 #define debug_test_simulation_time                                      \
   (not debug_cycle_test or                                              \
-   ( (sc_simulation_time() >= debug_cycle_start) and                    \
-    ((sc_simulation_time() <= debug_cycle_stop) or                      \
+   ( (simulation_cycle() >= debug_cycle_start) and                    \
+    ((simulation_cycle() <= debug_cycle_stop) or                      \
       (debug_cycle_stop == -1))))
 #else
@@ -149 +150 @@
   do                                                                    \
     {                                                                   \
-      log_printf(TRACE,component,func,_("[%d] %s.%s"),static_cast<uint32_t>(sc_simulation_time()),name,func); \
+      log_printf(TRACE,component,func,_("[%d] %s.%s"),static_cast<uint32_t>(simulation_cycle()),name,func); \
     } while(0)
 

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

@@ -14 +14 @@
 
 #if (defined(STATISTICS) and not defined(SYSTEMC))
-#  error "To have the statistics, you must set flags SYSTEMC"
+# error "To have the statistics, you must set flags SYSTEMC"
 #endif
 
 #if (defined(INFORMATION) and not defined(STATISTICS))
-#  error "To have the information, you must set flags STATISTICS"
+# error "To have the information, you must set flags STATISTICS"
 #endif
 
 #if (defined(VHDL_TESTBENCH) and not defined(SYSTEMC))
-#  error "To have the vhdl's test bench, you must set flags SYSTEMC"
+# error "To have the vhdl's test bench, you must set flags SYSTEMC"
 #endif
 
 #if (defined(VHDL_TESTBENCH) and not defined(VHDL))
-#  error "To have the vhdl's test bench, you must set flags VHDL"
+# error "To have the vhdl's test bench, you must set flags VHDL"
 #endif
 
 #if (defined(VHDL_TESTBENCH_ASSERT) and not defined(VHDL_TESTBENCH))
-#  error "To have an assert in vhdl's test bench, you must set flags VHDL_TESTBENCH"
+# error "To have an assert in vhdl's test bench, you must set flags VHDL_TESTBENCH"
 #endif
 
 #if (defined(VHDL_TESTBENCH) and defined(SYSTEMC))
-#  define SYSTEMC_VHDL_COMPATIBILITY
+# define SYSTEMC_VHDL_COMPATIBILITY
 #endif
 
 #if (defined(DEBUG))
-#  define DEBUG_TEST
+# define DEBUG_TEST
+#endif
+
+#if defined(MTI_SYSTEMC) and defined(SYSTEMC) and defined(VHDL)
+# define MODELSIM_COSIMULATION
 #endif
 

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

@@ -33 +33 @@
 #  define MSG_INFORMATION   _("[1;32m[INFORMATION][0m")
 #  define MSG_BREAKPOINT    _("[1;38m[   BREAK   ][0m")
+#  define MSG_VHDL          _("[1;34m[   VHDL    ][0m")
 #else
 #  define MSG_DEBUG         _("[   DEBUG   ]")
@@ -39 +40 @@
 #  define MSG_INFORMATION   _("[INFORMATION]")
 #  define MSG_BREAKPOINT    _("[   BREAK   ]")
+#  define MSG_VHDL          _("[   VHDL    ]")
 #endif
 
@@ -84 +86 @@
 
 #define msg(arg...)             fmsg(stdout,arg)
+#define err(arg...)             fmsgError(stderr,arg)
+
 #define msgDebug(arg...)        fmsgDebug(stdout,arg)
 #define msgError(arg...)        fmsgError(stdout,arg)
 #define msgWarning(arg...)      fmsgWarning(stdout,arg)
 #define msgInformation(arg...)  fmsgInformation(stdout,arg)
-#define err(arg...)             fmsgError(stderr,arg)
 
 }; // end namespace morpheo

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

@@ -16 +16 @@
 #include "Common/include/ErrorMorpheo.h"
 #include "Common/include/ToString.h"
-
+#include "Common/include/Systemc.h"
 namespace morpheo {
 
@@ -26 +26 @@
 inline void test_ko_error (void)
 {
-  std::string msg = "Test ko : error in test \""+morpheo::toString(num_test)+"\"";
+  std::string msg = morpheo::toString(_("Test ko : error in test \"%d\""),num_test);
   throw (morpheo::ErrorMorpheo (msg));
 }
@@ -33 +33 @@
 inline void test_ko (char * file, uint32_t line, T exp1, T exp2)
 {
-  fflush (stdout);
-  fflush (stderr);
-
-  std::cerr << "[" << num_test << "] : " << STR_KO
-       << "\tline " << line                      << std::endl
-       << " * Localisation"                      << std::endl
-       << "   - File : " << file                 << std::endl
-       << "   - Line : " << line                 << std::endl
-       << " * Expression is different"           << std::endl
-       << "   - exp1 : "+morpheo::toString(exp1) << std::endl
-       << "   - exp2 : "+morpheo::toString(exp2) << std::endl;
+  msgError(_("[%d] : %s\n"),num_test,STR_KO);
+  msgError(_(" * Localisation\n"));
+  msgError(_("   - File  : %s\n"),file);
+  msgError(_("   - Line  : %d\n"),line);
+  msgError(_(" * Expression is different\n"));
+  msgError(_("   - exp1  : %s\n"),morpheo::toString(exp1).c_str());
+  msgError(_("   - exp2  : %s\n"),morpheo::toString(exp2).c_str());
 
   test_ko_error ();
@@ -50 +46 @@
 inline void test_ko (char * file, uint32_t line)
 {
-  fflush (stdout);
-  fflush (stderr);
-
-  std::cerr << "[" << num_test << "] : " << STR_KO
-       << "\tline " << line                           << std::endl
-       << " * Localisation"                           << std::endl
-       << "   - File : " << file                      << std::endl
-       << "   - Line : " << line                      << std::endl;
+  msgError(_("[%d] : %s\n"),num_test,STR_KO);
+  msgError(_(" * Localisation\n"));
+  msgError(_("   - File  : %s\n"),file);
+  msgError(_("   - Line  : %d\n"),line);
   
   test_ko_error ();
@@ -64 +56 @@
 inline void test_ok ()
 {
-  fflush (stdout);
-  fflush (stderr);
-
-  msg (_("[%d] : %s\n"), num_test,STR_OK);
+  msgInformation (_("[%d] : %s\n"), num_test,STR_OK);
 
   num_test ++;
@@ -74 +63 @@
 inline void test_ok (char * file, uint32_t line)
 {
-  fflush (stdout);
-  fflush (stderr);
-
-  msg (_("[%d] : %s\n"), num_test,STR_OK);
-  msg (_("\tline %d\n"), line);
+  msgInformation (_("[%d] : %s (line %d)\n"), num_test,STR_OK,line);
+  msgInformation (_("   - Line  : %d\n"), line);
 
   num_test ++;
@@ -86 +72 @@
 inline void test_ok (char * file, uint32_t line, T exp)
 {
-  fflush (stdout);
-  fflush (stderr);
-
-  msg (_("[%d] : %s\n"), num_test, STR_OK);
-  msg (_("\tline %d\n"), line);
-  msg (_("\tvalue %s\n"), (morpheo::toString(exp)).c_str());
+  msgInformation (_("[%d] : %s\n"), num_test, STR_OK);
+  msgInformation (_("   - Line  : %d\n"), line);
+  msgInformation (_("   - Value : %s\n"), (morpheo::toString(exp)).c_str());
 
   num_test ++;
@@ -112 +95 @@
 #define LABEL(str...)                                                   \
   {                                                                     \
-    msg (_("{%d} "),static_cast<uint32_t>(sc_simulation_time()));       \
-    msg (str);                                                          \
-    msg (_("\n"));                                                      \
-    fflush (stdout);                                                    \
+    msgInformation (_("{%.0f} "),simulation_cycle());                \
+    msg            (str);                                               \
+    msg            (_("\n"));                                           \
   } while(0)
 
@@ -122 +104 @@
 #endif
 
-#define SC_START(cycle_offset)                                          \
+#define SC_CYCLE(cycle_offset)                                          \
   do                                                                    \
     {                                                                   \
-      /*cout << "SC_START (begin)" << endl;*/                           \
+      /*cout << "SC_CYCLE (begin)" << endl;*/                           \
                                                                         \
-      uint32_t cycle_current = static_cast<uint32_t>(sc_simulation_time()); \
+      double cycle_current = simulation_cycle();                        \
       if (cycle_offset != 0)                                            \
         {                                                               \
-          cout << "##########[ cycle "<< cycle_current+cycle_offset << " ] (" << __LINE__ << ")" << endl; \
+          msgInformation(_("##########[ cycle %.0f ] (%d)\n"),cycle_current+cycle_offset,__LINE__); \
         }                                                               \
                                                                         \
@@ -138 +120 @@
         }                                                               \
                                                                         \
-      sc_start(cycle_offset);                                           \
+      simulation_run(cycle_offset);                                     \
                                                                         \
-      /*cout << "SC_START (end  )" << endl;*/                           \
+      /*cout << "SC_CYCLE (end  )" << endl;*/                           \
     } while(0)
 
-
+// old support
+#ifndef MTI_SYSTEMC
+# define SC_START(x) SC_CYCLE(x)
+#endif
 
 };

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

@@ -9 +9 @@
 #include <iostream>
 #include <sys/time.h>
+#include "Common/include/Systemc.h"
 
 namespace morpheo {
@@ -28 +29 @@
   { 
 #ifdef SYSTEMC
-    nb_cycles_begin = sc_simulation_time();
+    nb_cycles_begin = simulation_cycle();
 #endif
     gettimeofday(&time_begin,NULL);
@@ -48 +49 @@
     if (x.systemc)
       {
-        double nb_cycles_end = sc_simulation_time();
+        double nb_cycles_end = simulation_cycle();
         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);
         

trunk/IPs/systemC/processor/Morpheo/Common/src/MemCheck.cpp

@@ -10 +10 @@
 // Global flags set by macros in MemCheck.h
 bool traceFlag  = false;
-bool activeFlag = true;
+bool activeFlag = false;
 
 namespace {