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

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/src

Files:

• OOO_Engine_allocation.cpp (modified) (2 diffs)
• Parameters.cpp (modified) (8 diffs)
• Parameters_print.cpp (modified) (1 diff)

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

@@ -674 +674 @@
                     COMPONENT_MAP(_component,src , "in_RETIRE_EVENT_"+toString(x)+"_"+toString(k)+"_STATE",
                                              dest,"out_RETIRE_EVENT_"+toString(j)+"_"+toString(k)+"_STATE");
-                    x++;
-                    ++it;
                   }
+                x++;
+                ++it;
               }
         }
@@ -885 +885 @@
           COMPONENT_MAP(_component,src , "in_COMMIT_"+toString(i)+"_WEN"        ,
                                    dest,"out_COMMIT_"+toString(i)+"_WEN"        );
+//        if (_param->_have_port_context_id)
+//        COMPONENT_MAP(_component,src , "in_COMMIT_"+toString(i)+"_CONTEXT_ID"  ,
+//                                 dest,"out_COMMIT_"+toString(i)+"_CONTEXT_ID"  );
+//        if (_param->_have_port_front_end_id)
+//        COMPONENT_MAP(_component,src , "in_COMMIT_"+toString(i)+"_FRONT_END_ID",
+//                                 dest,"out_COMMIT_"+toString(i)+"_FRONT_END_ID");
           if (_param->_have_port_rob_ptr)
           COMPONENT_MAP(_component,src , "in_COMMIT_"+toString(i)+"_PACKET_ID"  ,

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

@@ -25 +25 @@
                           uint32_t            * nb_inst_insert                   ,//[nb_rename_unit]
                           uint32_t            * nb_inst_retire                   ,//[nb_rename_unit]
-                          uint32_t              nb_inst_issue                    ,
+//                        uint32_t              nb_inst_issue                    ,
                           uint32_t            * nb_inst_execute                  ,//[nb_execute_loop]
                           uint32_t              nb_inst_reexecute                ,
@@ -49 +49 @@
                           Tpriority_t           issue_priority                   ,
                           Tload_balancing_t     issue_load_balancing             ,
-                          bool               ** table_routing                    ,//[nb_rename_unit][nb_inst_issue]
-                          bool               ** table_issue_type                 ,//[nb_inst_issue][nb_type]
+//                           bool               ** table_routing                    ,//[nb_rename_unit][nb_inst_issue]
+//                           bool               ** table_issue_type                 ,//[nb_inst_issue][nb_type]
                           // Reexecute
                           uint32_t              size_reexecute_queue             ,
@@ -63 +63 @@
                           uint32_t            * nb_reg_free                      ,//[nb_rename_unit]
                           uint32_t            * nb_rename_unit_bank              ,//[nb_rename_unit]
-//                           uint32_t            * size_read_counter                ,//[nb_rename_unit]
+//                        uint32_t            * size_read_counter                ,//[nb_rename_unit]
                           uint32_t            * nb_load_store_queue              ,//[nb_rename_unit]
                           uint32_t           ** size_store_queue                 ,//[nb_rename_unit][nb_load_store_queue]
@@ -87 +87 @@
     _nb_inst_insert                    = nb_inst_insert                   ;
     _nb_inst_retire                    = nb_inst_retire                   ;
-    _nb_inst_issue                     = nb_inst_issue                    ;
+//  _nb_inst_issue                     = nb_inst_issue                    ;
     _nb_inst_execute                   = nb_inst_execute                  ;
     _nb_inst_reexecute                 = nb_inst_reexecute                ;
@@ -107 +107 @@
     _issue_priority                    = issue_priority                   ;
     _issue_load_balancing              = issue_load_balancing             ;
-    _table_routing                     = table_routing                    ;
-    _table_issue_type                  = table_issue_type                 ;
+//     _table_routing                     = table_routing                    ;
+//     _table_issue_type                  = table_issue_type                 ;
     _size_reexecute_queue              = size_reexecute_queue             ;
     _reexecute_priority                = reexecute_priority               ;
@@ -265 +265 @@
        _commit_load_balancing   ,
        _nb_rename_unit_select   ,
-       _nb_thread                          ,
+       _nb_thread               ,
        _translate_num_context_to_num_thread
        );
@@ -284 +284 @@
         size_store_queue_ptr    ,
         size_load_queue_ptr     ,
-       _nb_inst_issue           ,
+//     _nb_inst_issue           ,
        _nb_inst_insert          ,
        _nb_inst_reexecute       ,
        _nb_rename_unit_select   ,
        _issue_priority          ,
-       _issue_load_balancing    ,
-       _table_routing           ,
-       _table_issue_type        
+       _issue_load_balancing    // ,
+//        _table_routing           ,
+//        _table_issue_type        
        );
+
+    _nb_inst_issue = _param_issue_queue->_nb_inst_issue;
 
     _param_reexecute_unit        = new morpheo::behavioural::core::multi_ooo_engine::ooo_engine::reexecute_unit::Parameters  
@@ -319 +321 @@
        _nb_context            ,
        _nb_inst_reexecute     ,
-       _implement_group       
+       _implement_group       ,
+       _translate_num_context_to_num_thread
        );
 

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

@@ -58 +58 @@
     str+= toString(MSG_INFORMATION)+"   * issue_priority                   : "+toString<Tpriority_t      >(_issue_priority                   )+"\n";
     str+= toString(MSG_INFORMATION)+"   * issue_load_balancing             : "+toString<Tload_balancing_t>(_issue_load_balancing             )+"\n";
-    for (uint32_t i=0; i<_nb_rename_unit; ++i)
-    for (uint32_t j=0; j<_nb_inst_issue ; ++j)
-    str+= toString(MSG_INFORMATION)+"   * table_routing                      ["+toString(i)+"]["+toString(j)+"] : "+toString<bool             >(_table_routing [i][j]             )+"\n";//[nb_rename_unit][nb_inst_issue]
-    for (uint32_t i=0; i<_nb_inst_issue ; ++i)
-    for (uint32_t j=0; j<_nb_type; ++j)
-    str+= toString(MSG_INFORMATION)+"   * table_issue_type                   ["+toString(i)+"]["+toString(j)+"] : "+toString<bool             >(_table_issue_type [i][j]          )+"\n";//[nb_inst_issue][nb_type]
+//  for (uint32_t i=0; i<_nb_rename_unit; ++i)
+//  for (uint32_t j=0; j<_nb_inst_issue ; ++j)
+//  str+= toString(MSG_INFORMATION)+"   * table_routing                      ["+toString(i)+"]["+toString(j)+"] : "+toString<bool             >(_table_routing [i][j]             )+"\n";//[nb_rename_unit][nb_inst_issue]
+//  for (uint32_t i=0; i<_nb_inst_issue ; ++i)
+//  for (uint32_t j=0; j<_nb_type; ++j)
+//  str+= toString(MSG_INFORMATION)+"   * table_issue_type                   ["+toString(i)+"]["+toString(j)+"] : "+toString<bool             >(_table_issue_type [i][j]          )+"\n";//[nb_inst_issue][nb_type]
     str+= toString(MSG_INFORMATION)+"   * size_reexecute_queue             : "+toString<uint32_t         >(_size_reexecute_queue             )+"\n";
     str+= toString(MSG_INFORMATION)+"   * reexecute_priority               : "+toString<Tpriority_t      >(_reexecute_priority               )+"\n";