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

Timestamp:

Oct 13, 2010, 8:15:51 PM (14 years ago)

Author:

rosiere

Message:

1) add test with SPECINT2K
2) new config of Selftest
3) modif RAT to support multiple depth_save ... but not finish (need fix Update Prediction Table)
4) add Function_pointer but need fix

File:

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

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

@@ -48 +48 @@
               _nb_cycle_idle            [i][j] = 0;
 
-              reg_NB_INST_COMMIT_ALL    [i][j] = 0;
-              reg_NB_INST_COMMIT_MEM    [i][j] = 0;
-                                        
               reg_EVENT_STATE           [i][j] = COMMIT_EVENT_STATE_NO_EVENT;
 //            reg_EVENT_FLUSH           [i][j] = false;
@@ -72 +69 @@
               reg_PC_CURRENT_IS_DS_TAKE [i][j] = 0;
               reg_PC_NEXT               [i][j] = (0x100+4)>>2;
+
+              reg_NB_INST_COMMIT_ALL    [i][j] = 0;
+              reg_NB_INST_COMMIT_MEM    [i][j] = 0;
+                          
+              if (_param->_front_end_rat_scheme[i] == RAT_DEPTH_SAVE)
+                for (uint32_t k=0; k<_param->_nb_branch_speculated[i][j]; ++k)
+                  reg_NB_INST_DEPTH [i][j][k] = 0;
             }
 
@@ -281 +285 @@
                       uint32_t  ptr   = reg_BANK_PTR [num_bank];
 
+                      // entry->restore                 = false;
                       entry->ptr                     = ptr;
                       entry->front_end_id            = front_end_id;
@@ -353 +358 @@
                               {
                               case TYPE_BRANCH : {entry->state=(no_execute==1)?ROB_BRANCH_COMPLETE:ROB_BRANCH_WAIT_END  ; break;}
-                              case TYPE_MEMORY : {entry->state=(no_execute==1)?ROB_END_OK_SPECULATIVE:(entry->state=(is_store  ==1)?ROB_STORE_WAIT_END_OK:ROB_OTHER_WAIT_END); break;}
+                              case TYPE_MEMORY : {entry->state=(no_execute==1)?ROB_END_OK_SPECULATIVE:(entry->state=(is_store==1)?ROB_STORE_WAIT_END_OK:ROB_OTHER_WAIT_END); break;}
                               default          : {entry->state=(no_execute==1)?ROB_END_OK_SPECULATIVE:ROB_OTHER_WAIT_END; break;}
                               }
@@ -378 +383 @@
                       if (type == TYPE_MEMORY)
                         reg_NB_INST_COMMIT_MEM [front_end_id][context_id] ++;
-                      
+
+                      if (_param->_front_end_rat_scheme[front_end_id] == RAT_DEPTH_SAVE)
+                      reg_NB_INST_DEPTH [front_end_id][context_id][entry->depth] ++;
 
                       // flush = present event or future event.
@@ -856 +863 @@
                     if (type == TYPE_MEMORY)
                     reg_NB_INST_COMMIT_MEM [front_end_id][context_id] --;
-                    
+                    if (_param->_front_end_rat_scheme[front_end_id] == RAT_DEPTH_SAVE)
+                    reg_NB_INST_DEPTH      [front_end_id][context_id][entry->depth] --;
                     // Update pointer
                     reg_NUM_BANK_HEAD = (num_bank+1)%_param->_nb_bank;
@@ -1191 +1199 @@
                           switch (state)
                             {
-                            case ROB_BRANCH_WAIT_END             : {state = ROB_EVENT_WAIT_END; break;}
-                            case ROB_BRANCH_COMPLETE             : {state = ROB_END_MISS      ; break;}
+                            case ROB_BRANCH_WAIT_END             : {state = ROB_EVENT_WAIT_END   ; break;}
+                            case ROB_BRANCH_COMPLETE             : {state = ROB_END_MISS         ; break;}
                             case ROB_END_BRANCH_MISS             :
-                            case ROB_END_BRANCH_MISS_SPECULATIVE : {state = ROB_END_MISS      ; break;}
+                            case ROB_END_BRANCH_MISS_SPECULATIVE : {state = ROB_END_MISS         ; break;}
                             case ROB_END_LOAD_MISS               :
                             case ROB_END_LOAD_MISS_UPDATE        :
-                            case ROB_END_LOAD_MISS_SPECULATIVE   : {state = ROB_END_MISS      ; break;}
-                            case ROB_STORE_OK                    : {state = ROB_STORE_KO      ; break;}
+                            case ROB_END_LOAD_MISS_SPECULATIVE   : {state = ROB_END_MISS         ; break;}
+                            case ROB_STORE_OK                    : {state = ROB_STORE_KO         ; break;}
                             case ROB_STORE_WAIT_END_OK           : {state = ROB_STORE_WAIT_END_KO; break;}
                             case ROB_STORE_OK_WAIT_END           : {state = ROB_STORE_KO_WAIT_END; break;}
-                            case ROB_OTHER_WAIT_END              : {state = ROB_EVENT_WAIT_END; break;}
+                            case ROB_OTHER_WAIT_END              : {state = ROB_EVENT_WAIT_END   ; break;}
                             case ROB_END_OK                      :
-                            case ROB_END_OK_SPECULATIVE          : {state = ROB_END_MISS      ; break;}
+                            case ROB_END_OK_SPECULATIVE          : {state = ROB_END_MISS         ; break;}
                             case ROB_END_KO                      :
-                            case ROB_END_KO_SPECULATIVE          : {state = ROB_END_MISS      ; break;}
+                            case ROB_END_KO_SPECULATIVE          : {state = ROB_END_MISS         ; break;}
                             case ROB_END_EXCEPTION_UPDATE        :
                             case ROB_END_EXCEPTION               :
-                            case ROB_END_EXCEPTION_WAIT_HEAD     : {state = ROB_END_MISS      ; break;}
+                            case ROB_END_EXCEPTION_WAIT_HEAD     : {state = ROB_END_MISS         ; break;}
                               
                               // don't change state -> wait
@@ -1348 +1356 @@
 //          log_printf(TRACE,Commit_unit,FUNCTION,"      * EVENT             : %d (bank %d, ptr %d)",((reg_EVENT_NUM_PTR [i][j] << _param->_shift_num_slot) | reg_EVENT_NUM_BANK [i][j]), reg_EVENT_NUM_BANK [i][j],reg_EVENT_NUM_PTR [i][j]);
 //          log_printf(TRACE,Commit_unit,FUNCTION,"      * EVENT_CAN_RESTART : %d",reg_EVENT_CAN_RESTART [i][j]);
-            log_printf(TRACE,Commit_unit,FUNCTION,"      * EVENT_DEPTH       : %d - type %s",reg_EVENT_DEPTH [i][j],toString(reg_EVENT_TYPE [i][j]).c_str());
+            log_printf(TRACE,Commit_unit,FUNCTION,"      * EVENT_DEPTH       : %d",reg_EVENT_DEPTH [i][j]);
+            log_printf(TRACE,Commit_unit,FUNCTION,"      * EVENT_TYPE        : %s",toString(reg_EVENT_TYPE [i][j]).c_str());
             log_printf(TRACE,Commit_unit,FUNCTION,"      * EVENT_LAST        : %d - packet %d - ptr %d (bank %d, ptr %d)",reg_EVENT_LAST [i][j],reg_EVENT_PACKET[i][j],((reg_EVENT_LAST_NUM_PTR [i][j] << _param->_shift_num_slot) | reg_EVENT_LAST_NUM_BANK [i][j]), reg_EVENT_LAST_NUM_BANK [i][j],reg_EVENT_LAST_NUM_PTR [i][j]);
             log_printf(TRACE,Commit_unit,FUNCTION,"      * EVENT_NEXT        : stop : %d - packet : %d",reg_EVENT_NEXT_STOP  [i][j],reg_EVENT_NEXT_PACKET[i][j]);
@@ -1436 +1445 @@
         }
 
-      log_printf(TRACE,Commit_unit,FUNCTION,"  * Dump RAT Update Table");
+      log_printf(TRACE,Commit_unit,FUNCTION,"  * Dump RAT_Update Table");
       for (uint32_t i=0; i<_param->_nb_front_end; ++i)
         for (uint32_t j=0; j<_param->_nb_context[i]; ++j)