Changeset 117 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit

Timestamp:

May 16, 2009, 4:42:39 PM (15 years ago)

Author:

rosiere

Message:

1) Platforms : add new organization for test
2) Load_Store_Unit : add array to count nb_check in store_queue
3) Issue_queue and Core_Glue : rewrite the issue network
4) Special_Register_Unit : add reset value to register CID
5) Softwares : add multicontext test
6) Softwares : add SPECINT
7) Softwares : add MiBench?
7) Read_queue : inhib access for r0
8) Change Core_Glue (network) - dont yet support priority and load balancing scheme

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit

Files:

• include/Parameters.h (modified) (1 diff)
• src/Commit_unit_allocation.cpp (modified) (1 diff)
• src/Commit_unit_genMealy_commit.cpp (modified) (2 diffs)
• src/Commit_unit_genMealy_insert.cpp (modified) (1 diff)
• src/Commit_unit_transition.cpp (modified) (2 diffs)
• src/Parameters.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/include/Parameters.h

@@ -60 +60 @@
   public : uint32_t         ** _array_size_depth        ;//[nb_front_end][nb_context]
 //public : uint32_t            _max_size_depth          ;
-  public : Tpacket_t           _shift_num_bank          ;
-  public : Tpacket_t           _mask_size_bank          ;
+
+//public : Tpacket_t           _shift_num_bank          ;
+  public : Tpacket_t           _mask_num_bank           ;
+  public : Tpacket_t           _shift_num_slot          ;
+//public : Tpacket_t           _mask_num_slot           ;
+    
 
 //public : bool                _have_port_front_end_id  ;

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

@@ -336 +336 @@
 
 #if defined(DEBUG) and defined(DEBUG_Commit_unit) and (DEBUG_Commit_unit == true)
+    directory_init ();
+
     instruction_log_file = new std::ofstream [_param->_nb_thread];
     for (uint32_t i=0; i<_param->_nb_thread; ++i)
       if (_param->_have_thread [i])
         {
-          std::string filename = "Instruction_flow-thread_" + toString(i) + ".log";
+          std::string filename = MORPHEO_LOG+"/"+toString(getpid())+"-Instruction_flow-thread_"+toString(i)+"-"+toString(getpid())+".log";
           
           instruction_log_file [i] .open(filename.c_str() ,std::ios::out | std::ios::trunc);

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

@@ -49 +49 @@
             // packet_id number can 
             Tpacket_t packet_id       = (_param->_have_port_rob_ptr  )?PORT_READ(in_COMMIT_PACKET_ID [i]):0;
-            uint32_t  num_bank        = packet_id >> _param->_shift_num_bank;
+            uint32_t  num_bank        = packet_id & _param->_mask_num_bank;
             uint32_t  num_bank_access = bank_nb_access [num_bank];
             
@@ -62 +62 @@
                 internal_BANK_COMMIT_NUM_INST [num_bank][num_bank_access] = i;
                 
-                Tpacket_t num_packet = packet_id & _param->_mask_size_bank;
+                Tpacket_t num_packet = packet_id >> _param->_shift_num_slot;
                 
                 // find the good entry !!!

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

@@ -99 +99 @@
                         insert_ack       [num_rename_unit][num_inst_insert] = true;
                         
-                        Tpacket_t packet_id = ((num_bank << _param->_shift_num_bank) | reg_BANK_PTR [num_bank]);
+                        Tpacket_t packet_id = ((reg_BANK_PTR [num_bank] << _param->_shift_num_slot) | num_bank);
                         
 #ifdef SYSTEMC_VHDL_COMPATIBILITY

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

@@ -392 +392 @@
                 log_printf(TRACE,Commit_unit,FUNCTION,"    * front_end_id : %d",front_end_id );
                 log_printf(TRACE,Commit_unit,FUNCTION,"    * context_id   : %d",context_id   );
-                log_printf(TRACE,Commit_unit,FUNCTION,"    * rob_ptr      : %d",((num_bank << _param->_shift_num_bank) | entry->ptr));
+                log_printf(TRACE,Commit_unit,FUNCTION,"    * rob_ptr      : %d",((entry->ptr << _param->_shift_num_slot) | num_bank));
                 log_printf(TRACE,Commit_unit,FUNCTION,"    * num_thread   : %d",num_thread   );
                 log_printf(TRACE,Commit_unit,FUNCTION,"    * type         : %s",toString(type).c_str());
@@ -740 +740 @@
                          num_bank                       ,
                          (*it)->ptr                     ,
-                         ((num_bank << _param->_shift_num_bank) | (*it)->ptr),
+                         (((*it)->ptr << _param->_shift_num_slot) | num_bank),
                          (*it)->front_end_id            ,
                          (*it)->context_id              ,

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

@@ -71 +71 @@
     _max_nb_inst_retire       = max<uint32_t>(_nb_inst_retire,_nb_rename_unit);
     _size_bank                = _size_queue/_nb_bank;
-    _shift_num_bank           = log2(_size_bank);
-    _mask_size_bank           = gen_mask<Tpacket_t>(log2(_size_bank));
+
+//  _shift_num_bank           = 0;
+    _mask_num_bank            = gen_mask<Tpacket_t>(log2(_nb_bank));
+    _shift_num_slot           = log2(_nb_bank);
+//  _mask_num_slot            = gen_mask<Tpacket_t>(log2(_size_bank));
 
     _have_port_rename_unit_id = _size_rename_unit_id > 0;