Changeset 111 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop

Timestamp:

Feb 27, 2009, 7:37:40 PM (15 years ago)

Author:

rosiere

Message:

1) Decod_queue : multi implementation (one_fifo, multi_fifo)
2) Issue_queue : multi implementation (in_order, out_of_order)
3) Direction : Add Meta predictor
4) Context_State : re add Branch_complete, More priority to Load miss (is not speculative)
5) Return_Address_Stack : update reg_PREDICT pointer on decod miss prediction
6) UPT : Fix bug in multi event
7) Prediction_glue : in read_stack case, insert in UPT pc_next
8) Rename select : when rob have an event (need flush), read_r{a,b,c} and write_r{d,e} is set at 0

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop

Files:

• Multi_Execute_unit/Execute_unit/Load_store_unit/include/Types.h (modified) (1 diff)
• Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit.cpp (modified) (1 diff)
• Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_genMoore.cpp (modified) (1 diff)
• Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_transition.cpp (modified) (1 diff)
• Multi_Write_unit/Write_unit/Execute_queue/src/Parameters.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/include/Types.h

@@ -217 +217 @@
   template<> inline morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_execute_unit::execute_unit::load_store_unit::Tspeculative_load_t fromString<morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_execute_unit::execute_unit::load_store_unit::Tspeculative_load_t>(const std::string& x)
   {
-    if ( (x.compare("0")                       == 0) or
+    if ( (x.compare(toString(static_cast<uint32_t>(morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_execute_unit::execute_unit::load_store_unit::NO_SPECULATIVE_LOAD    ))) == 0) or
          (x.compare("no_speculative_load")     == 0))
       return morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_execute_unit::execute_unit::load_store_unit::NO_SPECULATIVE_LOAD;
-    if ( (x.compare("1")                       == 0) or
+    if ( (x.compare(toString(static_cast<uint32_t>(morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_execute_unit::execute_unit::load_store_unit::SPECULATIVE_LOAD_ACCESS))) == 0) or
          (x.compare("speculative_load_access") == 0))
       return morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_execute_unit::execute_unit::load_store_unit::SPECULATIVE_LOAD_ACCESS;
-    if ( (x.compare("2")                       == 0) or
+    if ( (x.compare(toString(static_cast<uint32_t>(morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_execute_unit::execute_unit::load_store_unit::SPECULATIVE_LOAD_COMMIT))) == 0) or
          (x.compare("speculative_load_commit") == 0))
       return morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_execute_unit::execute_unit::load_store_unit::SPECULATIVE_LOAD_COMMIT;
-//     if ( (x.compare("3")                       == 0) or
+//     if ( (x.compare(toString(static_cast<uint32_t>(morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_execute_unit::execute_unit::load_store_unit::SPECULATIVE_LOAD_BYPASS)))) or
 //          (x.compare("speculative_load_bypass") == 0))
 //       return morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_execute_unit::execute_unit::load_store_unit::SPECULATIVE_LOAD_BYPASS;

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit.cpp

@@ -73 +73 @@
     if (usage_is_set(_usage,USE_SYSTEMC))
       { 
+
     // Function pointer
-
     switch (_param->_speculative_load)
       {

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_genMoore.cpp

@@ -25 +25 @@
     log_function(Read_queue,FUNCTION,_name.c_str());
 
-    bool not_full  = not (_queue->size() == _param->_size_queue);
+    bool not_full  = _queue->size() < _param->_size_queue;
     bool not_empty = not _queue->empty();
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_transition.cpp

@@ -142 +142 @@
 #if (DEBUG >= DEBUG_TRACE) and (DEBUG_Read_queue == true)
         log_printf(TRACE,Read_queue,FUNCTION,"  * Dump Read_queue");
-        log_printf(TRACE,Read_queue,FUNCTION,"    * size : %d",(int)_queue->size());
+        log_printf(TRACE,Read_queue,FUNCTION,"    * size : %d / %d",(int)_queue->size(),_param->_size_queue);
 
         if (_queue->size()>0)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Execute_queue/src/Parameters.cpp

@@ -39 +39 @@
     test();
 
-    _size_internal_queue = 
-      (log2( nb_context   )      +
-       log2( nb_front_end )      +
-       log2( nb_ooo_engine)      +
-       log2( nb_packet    )      +      
-//      size_operation           +
-//      size_type                +
-        size_special_data        +
-       _size_exception           +
-       1                         +
-        size_general_data        +
-        size_general_data 
-       );
-
     if (is_toplevel)
       {
@@ -71 +57 @@
         copy();
       }
+
+    _size_internal_queue = 
+      (_size_context_id          +
+       _size_front_end_id        +
+       _size_ooo_engine_id       +
+       _size_rob_ptr             +      
+//     _size_operation           +
+//     _size_type                +
+       _size_special_data        +
+       _size_exception           +
+       1                         +
+       _size_general_data        +
+       _size_general_data 
+       );
 
     log_printf(FUNC,Execute_queue,FUNCTION,"End");