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

Timestamp:

Dec 19, 2008, 4:34:00 PM (16 years ago)

Author:

rosiere

Message:

1) Update Prediction Table : statistics
2) Size instruction address on 30 bits
3) Change Log File
4) Add debug_level in simulation configuration file

Location:

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

Files:

• Commit_unit_allocation.cpp (modified) (3 diffs)
• Commit_unit_transition.cpp (modified) (2 diffs)

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

@@ -71 +71 @@
       _ALLOC2_SIGNAL_IN ( in_INSERT_NO_EXECUTE              ,"no_execute"           ,Tcontrol_t        ,1                                   ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]);
       _ALLOC2_SIGNAL_IN ( in_INSERT_IS_DELAY_SLOT           ,"is_delay_slot"        ,Tcontrol_t        ,1                                   ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]);
-      _ALLOC2_SIGNAL_IN ( in_INSERT_ADDRESS                 ,"address"              ,Tgeneral_data_t   ,_param->_size_instruction_address   ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]);
+      _ALLOC2_SIGNAL_IN ( in_INSERT_ADDRESS                 ,"address"              ,Taddress_t        ,_param->_size_instruction_address   ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]);
       _ALLOC2_SIGNAL_IN ( in_INSERT_EXCEPTION               ,"exception"            ,Texception_t      ,_param->_size_exception             ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]);
       _ALLOC2_SIGNAL_IN ( in_INSERT_EXCEPTION_USE           ,"exception_use"        ,Texception_t      ,_param->_size_exception             ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]);
@@ -138 +138 @@
       ALLOC1_SIGNAL_IN ( in_COMMIT_EXCEPTION         ,"exception"  ,Texception_t      ,_param->_size_exception       );
       ALLOC1_SIGNAL_IN ( in_COMMIT_NO_SEQUENCE       ,"no_sequence",Tcontrol_t        ,1                             );
-      ALLOC1_SIGNAL_IN ( in_COMMIT_ADDRESS           ,"address"    ,Tgeneral_data_t   ,_param->_size_instruction_address);
+      ALLOC1_SIGNAL_IN ( in_COMMIT_ADDRESS           ,"address"    ,Taddress_t        ,_param->_size_instruction_address);
 //    ALLOC1_SIGNAL_OUT(out_COMMIT_NUM_REG_RD        ,"num_reg_rd" ,Tgeneral_address_t,_param->_size_general_register+_param->_size_rename_unit_id);
       ALLOC1_SIGNAL_OUT(out_COMMIT_NUM_REG_RD        ,"num_reg_rd" ,Tgeneral_address_t,_param->_size_general_register);
@@ -185 +185 @@
       ALLOC_SIGNAL_OUT(out_UPDATE_ADDRESS_EPCR             ,"address_epcr"    ,Taddress_t         ,_param->_size_instruction_address);
       ALLOC_SIGNAL_OUT(out_UPDATE_ADDRESS_EEAR_VAL         ,"address_eear_val",Tcontrol_t         ,1);
-      ALLOC_SIGNAL_OUT(out_UPDATE_ADDRESS_EEAR             ,"address_eear"    ,Taddress_t         ,_param->_size_instruction_address);
+      ALLOC_SIGNAL_OUT(out_UPDATE_ADDRESS_EEAR             ,"address_eear"    ,Tgeneral_data_t    ,_param->_size_general_data);
     }
 

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

@@ -75 +75 @@
                   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,"    * type           : %s",toString_type(type).c_str());
+                  log_printf(TRACE,Commit_unit,FUNCTION,"    * type           : %s",toString(type).c_str());
                   log_printf(TRACE,Commit_unit,FUNCTION,"    * operation      : %d",operation );
                   log_printf(TRACE,Commit_unit,FUNCTION,"    * exception      : %d",exception );
@@ -478 +478 @@
              it++)
           {
-            log_printf(TRACE,Commit_unit,FUNCTION,"      [%d] %.8x (%.8x) %s - ptr : %d",
+            log_printf(TRACE,Commit_unit,FUNCTION,"      [%.4d] %.4d %.4d %.4d %.4d, %.3d %.3d, %.8x %.1d, %.1d %.4d, %.1d %.4d, %s - %d",
                        x,
-                       (*it)->address,
-                       (*it)->address<<2,
-                       toString((*it)->state).c_str(),
-                       (*it)->ptr);
+                       (*it)->front_end_id            ,
+                       (*it)->context_id              ,
+                       (*it)->rename_unit_id          ,
+                       (*it)->depth                   ,
+                       (*it)->type                    ,
+                       (*it)->operation               ,
+                       (*it)->address                 ,
+                       (*it)->is_delay_slot           ,
+                       (*it)->use_store_queue         ,
+                       (*it)->store_queue_ptr_write   ,
+                       (*it)->use_load_queue          ,
+                       (*it)->load_queue_ptr_write    ,
+                       toString((*it)->state).c_str() ,
+                       (*it)->ptr                     );
+            log_printf(TRACE,Commit_unit,FUNCTION,"             %.1d %.5d %.6d, %.1d %.5d %.6d, %.1d %.5d %.6d, %.1d %.1d %.6d %.6d, %.1d %.1d %.6d %.6d ",
+                       (*it)->read_ra                 ,
+                       (*it)->num_reg_ra_log          ,
+                       (*it)->num_reg_ra_phy          ,
+                       (*it)->read_rb                 ,
+                       (*it)->num_reg_rb_log          ,
+                       (*it)->num_reg_rb_phy          ,
+                       (*it)->read_rc                 ,
+                       (*it)->num_reg_rc_log          ,
+                       (*it)->num_reg_rc_phy          ,
+                       (*it)->write_rd                ,
+                       (*it)->num_reg_rd_log          ,
+                       (*it)->num_reg_rd_phy_old      ,
+                       (*it)->num_reg_rd_phy_new      ,
+                       (*it)->write_re                ,
+                       (*it)->num_reg_re_log          ,
+                       (*it)->num_reg_re_phy_old      ,
+                       (*it)->num_reg_re_phy_new      );
+            
+            log_printf(TRACE,Commit_unit,FUNCTION,"             %.2d %.2d %.1d %.1d %.8x %s",
+                       (*it)->exception     ,
+                       (*it)->exception_use ,
+                       (*it)->flags         ,
+                       (*it)->no_sequence   ,
+                       (*it)->data_commit   ,
+                       toString((*it)->event_state).c_str()
+                       );
+
             x++;
           }