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

Timestamp:

Feb 16, 2010, 1:35:48 PM (14 years ago)

Author:

rosiere

Message:

Various modif (add test, and vhdl)

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp (modified) (6 diffs)

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

@@ -252 +252 @@
                       entry->rename_unit_id          = x;
                       entry->depth                   = (_param->_have_port_depth)?PORT_READ(in_INSERT_DEPTH [x][y]):0;
+#ifdef STATISTICS
+                      entry->instruction             = PORT_READ(in_INSERT_INSTRUCTION           [x][y]);
+#endif
                       entry->type                    = type;
                       entry->operation               = operation;
@@ -266 +269 @@
                       entry->num_reg_ra_log          = PORT_READ(in_INSERT_NUM_REG_RA_LOG        [x][y]);
                       entry->num_reg_ra_phy          = PORT_READ(in_INSERT_NUM_REG_RA_PHY        [x][y]);
+#endif
                       entry->read_rb                 = PORT_READ(in_INSERT_READ_RB               [x][y]);
+#ifdef DEBUG
                       entry->num_reg_rb_log          = PORT_READ(in_INSERT_NUM_REG_RB_LOG        [x][y]);
                       entry->num_reg_rb_phy          = PORT_READ(in_INSERT_NUM_REG_RB_PHY        [x][y]);
@@ -287 +292 @@
 #ifdef DEBUG        
                       entry->address                 = PORT_READ(in_INSERT_ADDRESS               [x][y]);
-#else
-                      entry->address                 = 0; // not necessary
 #endif                
                       entry->address_next            = PORT_READ(in_INSERT_ADDRESS_NEXT          [x][y]);
@@ -823 +826 @@
                         if (retire_ok)
                           {
-                            (*_stat_nb_inst_retire_ok [num_thread]) ++;
-                            (*_stat_nb_inst_type      [type]      ) ++;
+                            uint32_t instruction = entry->instruction;
+
+                            (*_stat_nb_inst_retire_ok   [num_thread] ) ++;
+                            (*_stat_nb_inst_instruction [instruction]) ++;
+                            (*_stat_nb_inst_type        [type]       ) ++;
                           }
                         else
@@ -1048 +1054 @@
                       // Read information
                       rob_state_t  state        = entry->state;
-                      Tdepth_t     depth        = entry->depth;
-                      
-                      Tdepth_t     depth_min    = (_param->_have_port_depth)?PORT_READ(in_DEPTH_MIN[front_end_id][context_id]):0;
-                      Tdepth_t     depth_max    = (_param->_have_port_depth)?PORT_READ(in_DEPTH_MAX[front_end_id][context_id]):0;
-                      Tcontrol_t   depth_full   = PORT_READ(in_DEPTH_FULL [front_end_id][context_id]);
+//                       Tdepth_t     depth        = entry->depth;
+                      
+//                       Tdepth_t     depth_min    = (_param->_have_port_depth)?PORT_READ(in_DEPTH_MIN[front_end_id][context_id]):0;
+//                       Tdepth_t     depth_max    = (_param->_have_port_depth)?PORT_READ(in_DEPTH_MAX[front_end_id][context_id]):0;
+//                       Tcontrol_t   depth_full   = PORT_READ(in_DEPTH_FULL [front_end_id][context_id]);
                       
                       // is a valid instruction ?
@@ -1088 +1094 @@
                       
                       log_printf(TRACE,Commit_unit,FUNCTION,"    * is_valid        : %d ((depth == depth_min) and not flush)",is_valid);
-                      log_printf(TRACE,Commit_unit,FUNCTION,"    * depth           : %d",depth    );
-                      log_printf(TRACE,Commit_unit,FUNCTION,"    * depth_min       : %d",depth_min);
-                      log_printf(TRACE,Commit_unit,FUNCTION,"    * depth_max       : %d",depth_max);
-                      log_printf(TRACE,Commit_unit,FUNCTION,"    * depth_full      : %d",depth_full);
+//                       log_printf(TRACE,Commit_unit,FUNCTION,"    * depth           : %d",depth    );
+//                       log_printf(TRACE,Commit_unit,FUNCTION,"    * depth_min       : %d",depth_min);
+//                       log_printf(TRACE,Commit_unit,FUNCTION,"    * depth_max       : %d",depth_max);
+//                       log_printf(TRACE,Commit_unit,FUNCTION,"    * depth_full      : %d",depth_full);
                       log_printf(TRACE,Commit_unit,FUNCTION,"    * speculative     : %d",speculative);
                       log_printf(TRACE,Commit_unit,FUNCTION,"    * flush           : %d",flush);