Changeset 129 for trunk/IPs

Timestamp:

Jun 29, 2009, 6:38:40 PM (15 years ago)

Author:

rosiere

Message:

1) Debug_Signal

Location:

trunk/IPs/systemC/processor/Morpheo

Files:

• Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/SelfTest/src/test.cpp (modified) (1 diff)
• Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_genMealy_commit.cpp (modified) (3 diffs)
• Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_genMoore.cpp (modified) (6 diffs)
• Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/src/test.cpp (modified) (3 diffs)
• Behavioural/Core/Multi_OOO_Engine/OOO_Engine/SelfTest/debug.cfg (added)
• Behavioural/include/Debug_signal.h (added)
• Behavioural/include/Signal.h (modified) (2 diffs)
• Behavioural/include/Version.h (modified) (1 diff)
• Behavioural/src/Debug_signal.cpp (added)
• Behavioural/src/Model.cpp (modified) (2 diffs)
• Behavioural/src/Model_get_debug.cpp (modified) (2 diffs)
• Behavioural/src/Model_get_type.cpp (modified) (2 diffs)
• Behavioural/src/Model_print.cpp (modified) (2 diffs)
• Behavioural/src/Model_set_model.cpp (modified) (2 diffs)
• Behavioural/src/Signal_link.cpp (modified) (2 diffs)
• Common/include/Debug.h (modified) (1 diff)
• Common/include/Types.h (modified) (2 diffs)
• Files/Instance_x1_w8_2.cfg (modified) (1 diff)
• Files/Instance_x4_w8_2.cfg (added)
• Files/Morpheo-Dhrystone.sim (added)
• Files/debug.sim (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/SelfTest/src/test.cpp

@@ -30 +30 @@
 
   simulation_init(0,0,0,false,false);
+  _model.set_model(NAME_Commit_unit, MODEL_SYSTEMC, true);
 
   debug_idle_cycle = CYCLE_MAX;

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_genMealy_commit.cpp

@@ -45 +45 @@
     for (uint32_t i=0; i<_param->_nb_inst_commit; i++)
       {
-        commit_ack        [i] = false;
+        commit_ack [i] = false;
 
         // Test if have valid instruction
@@ -51 +51 @@
           {
             // packet_id number can 
-            Tpacket_t packet_id       = (_param->_have_port_rob_ptr  )?PORT_READ(in_COMMIT_PACKET_ID [i]):0;
+            Tpacket_t packet_id       = (_param->_have_port_rob_ptr)?PORT_READ(in_COMMIT_PACKET_ID [i]):0;
             uint32_t  num_bank        = packet_id & _param->_mask_num_bank;
             uint32_t  num_bank_access = bank_nb_access [num_bank];
@@ -59 +59 @@
               {
                 // find
-                bank_nb_access    [num_bank] ++;
-                commit_ack        [i] = true;
+                bank_nb_access  [num_bank] ++;
+                commit_ack      [i] = true;
 
                 internal_BANK_COMMIT_VAL      [num_bank][num_bank_access] = true;

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_genMoore.cpp

@@ -30 +30 @@
     // ===================================================================
     {
-      uint32_t nb_scan_bank = 0; // last scan bank
+      uint32_t num_scan_bank = 0; // last scan bank
       bool     can_continue = true;
 
@@ -48 +48 @@
           Tcontrol_t val = false;
 
-          for (uint32_t j=nb_scan_bank; j<_param->_nb_bank; j++)
+          for (uint32_t j=num_scan_bank; j<_param->_nb_bank; j++)
             {
-              nb_scan_bank ++;
+              num_scan_bank ++;
               
               // translate bank number
@@ -82 +82 @@
                             );
                   
+                  event_nb_inst [front_end_id][context_id] ++;
+
                   can_continue &= (((state == ROB_STORE_OK          ) or
                                     (state == ROB_STORE_OK_WAIT_END ) or
@@ -90 +92 @@
                                         (reg_EVENT_PACKET[front_end_id][context_id] == num_packet)) and
                                    not ((reg_EVENT_NB_INST [front_end_id][context_id] > 0) and
-                                        ((++event_nb_inst [front_end_id][context_id]) >= reg_EVENT_NB_INST [front_end_id][context_id]))
+                                        ((event_nb_inst [front_end_id][context_id]) >= reg_EVENT_NB_INST [front_end_id][context_id]))
                                    );
 
@@ -129 +131 @@
       // Branchement must be send at the prediction unit
 
-      uint32_t nb_scan_bank = 0; // last scan bank
+      uint32_t num_scan_bank = 0; // last scan bank
 
       // for each port, find a valid branchement.
@@ -138 +140 @@
           Tcontrol_t  val  = false;
           
-          for (uint32_t j=nb_scan_bank; j<_param->_nb_bank; j++)
+          for (uint32_t j=num_scan_bank; j<_param->_nb_bank; j++)
             {
-              nb_scan_bank ++;
+              num_scan_bank ++;
 
               // translate bank number

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/src/test.cpp

@@ -18 +18 @@
   morpheo::behavioural::Parameters_Statistics * _parameters_statistics = new morpheo::behavioural::Parameters_Statistics (5,CYCLE_MAX);
 #endif
+
+  simulation_init(0,0,0,false,false);
+  _model.set_model(NAME_Rename_unit                      , MODEL_SYSTEMC, true);
+  _model.set_model(NAME_Load_Store_pointer_unit          , MODEL_SYSTEMC, true);
+  _model.set_model(NAME_Register_translation_unit        , MODEL_SYSTEMC, true);
+  _model.set_model(NAME_Dependency_checking_unit         , MODEL_SYSTEMC, true);
+  _model.set_model(NAME_Free_List_unit                   , MODEL_SYSTEMC, true);
+  _model.set_model(NAME_Register_Address_Translation_unit, MODEL_SYSTEMC, true);
+  _model.set_model(NAME_Register_translation_unit_Glue   , MODEL_SYSTEMC, true);
+  _model.set_model(NAME_Stat_List_unit                   , MODEL_SYSTEMC, true);
+  _model.set_model(NAME_Rename_select                    , MODEL_SYSTEMC, true);
+  _model.set_model(NAME_Rename_unit_Glue                 , MODEL_SYSTEMC, true);
 
   Tusage_t _usage = USE_ALL;
@@ -386 +398 @@
   in_NRESET->write(1);  
 
+#ifdef SELFTEST
   LABEL("Loop of Test");
 
@@ -394 +407 @@
       SC_START(1);
     }
+#else
+  SC_START(1000);
+#endif
 
   /********************************************************

trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Signal.h

@@ -23 +23 @@
 #include "Behavioural/include/Direction.h"
 #include "Behavioural/include/XML.h"
+#include "Behavioural/include/Debug_signal.h"
 #include "Common/include/ErrorMorpheo.h"
 #include "Common/include/ToBase2.h"
@@ -159 +160 @@
       _sc_signal      = sc_signal;
       _sc_signal_map  = sc_signal;
+
+      DEBUG_SIGNAL_ADD(sc_signal);
 
       if (typeid(T) == typeid(bool    ))

trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h

@@ -10 +10 @@
 #define MORPHEO_MAJOR_VERSION "0"
 #define MORPHEO_MINOR_VERSION "2"
-#define MORPHEO_REVISION      "128"
+#define MORPHEO_REVISION      "129"
 #define MORPHEO_CODENAME      "Castor"
 
-#define MORPHEO_DATE_DAY      "26"  
+#define MORPHEO_DATE_DAY      "29"  
 #define MORPHEO_DATE_MONTH    "06"
 #define MORPHEO_DATE_YEAR     "2009" 

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model.cpp

@@ -16 +16 @@
   Model::Model (void)
   {
-    log_begin(Behavioural,FUNCTION);
+//     log_begin(Behavioural,FUNCTION);
 
     set_model(NAME_true ,MODEL_SYSTEMC,true );
     set_model(NAME_false,MODEL_SYSTEMC,false);
 
-    log_end(Behavioural,FUNCTION);
+//     log_end(Behavioural,FUNCTION);
   }
 
@@ -28 +28 @@
   Model::~Model(void)
   {
-    log_begin(Behavioural,FUNCTION);
-    log_end(Behavioural,FUNCTION);
+//     log_begin(Behavioural,FUNCTION);
+//     log_end(Behavioural,FUNCTION);
   }
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model_get_debug.cpp

@@ -16 +16 @@
   bool Model::get_debug (std::string component)
   {
-    log_begin(Behavioural,FUNCTION);
+//     log_begin(Behavioural,FUNCTION);
 
     bool _return;
@@ -27 +27 @@
       _return = default_debug;
     
-    log_end(Behavioural,FUNCTION);
+//     log_end(Behavioural,FUNCTION);
 
     return _return;

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model_get_type.cpp

@@ -16 +16 @@
   model_type_t Model::get_type (std::string component)
   {
-    log_begin(Behavioural,FUNCTION);
+//     log_begin(Behavioural,FUNCTION);
 
     model_type_t _return;
@@ -27 +27 @@
       _return = default_type;
 
-    log_end(Behavioural,FUNCTION);
+//     log_end(Behavioural,FUNCTION);
 
     return _return;

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model_print.cpp

@@ -16 +16 @@
   void Model::print (void)
   {
-    log_begin(Behavioural,FUNCTION);
+//     log_begin(Behavioural,FUNCTION);
 
     msgInformation("Model Information [type, model simulation, debug verbosity]\n");
@@ -24 +24 @@
       msgInformation("  * %s\t%s\t%s\n",(it->first).c_str(), toString(it->second.type).c_str(), toString(it->second.debug).c_str());
 
-    log_end(Behavioural,FUNCTION);
+//     log_end(Behavioural,FUNCTION);
   }
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model_set_model.cpp

@@ -16 +16 @@
   void Model::set_model (std::string component, model_type_t type, bool debug)
   {
-    log_begin(Behavioural,FUNCTION);
+//     log_begin(Behavioural,FUNCTION);
 
     model_t model;
@@ -24 +24 @@
     models [component] = model;
 
-    log_end(Behavioural,FUNCTION);
+//     log_end(Behavioural,FUNCTION);
   }
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Signal_link.cpp

@@ -27 +27 @@
       throw (ERRORMORPHEO (FUNCTION,"Signal \""+_name+"\", can't map with signal \""+        get_name()+"\", because the first signal is not already allocate."));
     if (signal_dest->_is_allocate == false)
-      throw (ERRORMORPHEO (FUNCTION,"Signal \""+_name+"\", can't map with signal \""+signal_dest->get_name()+"\", because the second signal is not already allocate."));
+      throw (ERRORMORPHEO (FUNCTION,"Signal \""+_name+"\", can't map with signal \""+signal_dest->get_name()+"\", because the second signal is not already allocate.\n"));
 
     // Test if type is compatible
     if (_type_info != signal_dest->_type_info)
-      throw (ERRORMORPHEO (FUNCTION,toString(_("Signal \"%s\" can't been linked with signal \"%s\" : incompatible type (%s != %s)."),
+      throw (ERRORMORPHEO (FUNCTION,toString(_("Signal \"%s\" can't been linked with signal \"%s\" : incompatible type (%s != %s).\n"),
                                              _name.c_str(),
                                              signal_dest->get_name().c_str(),
@@ -54 +54 @@
       throw (ERRORMORPHEO (FUNCTION,"Signal \""+_name+"\" can't been linked with signal \""+signal_dest->get_name()+"\" : illegal direction ("+toString(signal_src->_direction)+" with "+toString(signal_dest->_direction)+")."));
 
+
+    if (_size != signal_dest->get_size())
+      msgWarning(_("The size of the signal \"%s\" (%d) is different with the signal \"%s\" (%d).\n"),
+                 _name.c_str(),
+                 _size,
+                 signal_dest->get_name().c_str(),
+                 signal_dest->get_size());
 
     // Multi consumer is authorized , no to multi producer!

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

@@ -81 +81 @@
       debug_init();                                                     \
                                                                         \
-      if (debug_test_simulation_time)                                   \
-        if ((debug == DEBUG_ALL ) or                                    \
-            (DEBUG_ ## level == DEBUG_NONE) or                          \
-            (( DEBUG_ ## level <= debug) and                            \
-             ( morpheo::behavioural::_model.get_debug(NAME_ ## component))) ) \
-          {                                                             \
-            if (DEBUG_ ## level <= DEBUG_INFO)                          \
-              {                                                         \
-                msg("%s ",MSG_INFORMATION);                             \
-              }                                                         \
-            else                                                        \
-              {                                                         \
-                msg("%s ",MSG_DEBUG);                                   \
-              }                                                         \
+      if (debug_test_simulation_time and                                \
+          ((debug == DEBUG_ALL ) or                                     \
+           (( DEBUG_ ## level <= debug) and                             \
+            ( morpheo::behavioural::_model.get_debug(NAME_ ## component))))) \
+        {                                                               \
+          if (DEBUG_ ## level <= DEBUG_INFO)                            \
+            {                                                           \
+              msg("%s ",MSG_INFORMATION);                               \
+            }                                                           \
+          else                                                          \
+            {                                                           \
+              msg("%s ",MSG_DEBUG);                                     \
+            }                                                           \
                                                                         \
-            if (debug >= DEBUG_ALL )                                    \
-              {                                                         \
-                switch (DEBUG_ ## level)                                \
-                  {                                                     \
-                  case DEBUG_NONE  : msg(_("(none       ) ")); break;   \
-                  case DEBUG_INFO  : msg(_("(information) ")); break;   \
-                  case DEBUG_TRACE : msg(_("(trace      ) ")); break;   \
-                  case DEBUG_FUNC  : msg(_("(function   ) ")); break;   \
-                  case DEBUG_ALL   : msg(_("(all        ) ")); break;   \
-                  default          : msg(_("(undefine   ) ")); break;   \
-                  }                                                     \
-              }                                                         \
-            if (debug >= DEBUG_FUNC)                                    \
-              {                                                         \
-                msg(  "<%s> " ,func);                                   \
-                msg(_("In file %s, "),__FILE__);                        \
-                msg(_("at line %d " ),__LINE__);                        \
-                msg(  ": " );                                           \
-              }                                                         \
-            msg(str);                                                   \
-            msg("\n");                                                  \
-          }                                                             \
+          if (debug >= DEBUG_FUNC)                                      \
+            {                                                           \
+              msg(  "<%s> " ,func);                                     \
+              msg(_("In file %s, "),__FILE__);                          \
+              msg(_("at line %d " ),__LINE__);                          \
+              msg(  ": " );                                             \
+            }                                                           \
+          msg(str);                                                     \
+          msg("\n");                                                    \
+        }                                                               \
     } while(0)
 

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

@@ -10 +10 @@
 
 #include <stdint.h>
+#include "Behavioural/include/Debug_signal.h"
 
 namespace morpheo              {
@@ -41 +42 @@
 #  define SC_OUT(type)             sc_out   <type >
                                  
-#  define PORT_READ(sig)           sig->read()
-#  define PORT_WRITE(sig,val)      sig->write(val)
+#  define PORT_READ(sig)                                      sig->read()
+#  define PORT_WRITE(sig,val)      do {DEBUG_SIGNAL_ACCESS(sig); sig->write(val);} while(0)
 //#define INTERNAL_READ(sig)       (*sig)
 //#define INTERNAL_WRITE(sig,val)  (*sig) = val

trunk/IPs/systemC/processor/Morpheo/Files/Instance_x1_w8_2.cfg

@@ -7 +7 @@
     <parameter name="nb_inst_fetch"                         value="8" />
     <parameter name="ras_size_queue"                        value="16" />
-    <parameter name="upt_size_queue"                        value="16" />
+    <parameter name="upt_size_queue"                        value="8" />
     <parameter name="ufpt_size_queue"                       value="8" />
 

trunk/IPs/systemC/processor/Morpheo/Files/debug.sim

@@ -25 +25 @@
   <parameter  name="simulation_file_with_date"              value="0"       />
                                                             
-  <parameter  name="debug_level"                            value="3"       />
+  <parameter  name="debug_level"                            value="2"       />
   <parameter  name="debug_cycle_start"                      value="0"       />
   <parameter  name="debug_cycle_stop"                       value="100"     />
@@ -109 +109 @@
 
   <component  name="Behavioural"                            model="systemc" debug="1" />
-  <component  name="Interface"                              model="systemc" debug="1" />
-  <component  name="Allocation"                             model="systemc" debug="1" />
+  <component  name="Interface"                              model="systemc" debug="0" />
+  <component  name="Allocation"                             model="systemc" debug="0" />
 
 </parameters>