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

Timestamp:

Jan 21, 2009, 10:53:13 PM (15 years ago)

Author:

rosiere

Message:

Fix Bug :
1) Load Store Unit : check big endian
2) Commit unit & RAT : add retire_event interface

File:

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

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

@@ -41 +41 @@
           for (uint32_t j=0; j<_param->_nb_context [i]; j++)
             {
-              reg_NB_INST_COMMIT_ALL [i][j] = 0;
-              reg_NB_INST_COMMIT_MEM [i][j] = 0;
-
-              reg_EVENT_STATE        [i][j] = EVENT_STATE_NO_EVENT;
+              reg_NB_INST_COMMIT_ALL    [i][j] = 0;
+              reg_NB_INST_COMMIT_MEM    [i][j] = 0;
+                                        
+              reg_EVENT_STATE           [i][j] = EVENT_STATE_NO_EVENT;
+              reg_EVENT_FLUSH           [i][j] = false;
+
+//            reg_PC_PREVIOUS           [i][j] = (0x100-4)>>2;
+              reg_PC_CURRENT            [i][j] = (0x100  )>>2;
+              reg_PC_CURRENT_IS_DS      [i][j] = 0;
+              reg_PC_CURRENT_IS_DS_TAKE [i][j] = 0;
+//            reg_PC_NEXT               [i][j] = (0x100+4)>>2;
             }
 
@@ -62 +69 @@
             switch (reg_EVENT_STATE [i][j])
               {
-              case EVENT_STATE_EVENT    : reg_EVENT_STATE [i][j] = EVENT_STATE_WAITEND ; break;
-              case EVENT_STATE_END      : reg_EVENT_STATE [i][j] = EVENT_STATE_NO_EVENT; break;
+              case EVENT_STATE_EVENT    : 
+                {
+                  if (internal_RETIRE_EVENT_VAL [i][j] and in_RETIRE_EVENT_ACK [i][j])
+                    reg_EVENT_STATE [i][j] = EVENT_STATE_WAITEND ; 
+                  break;
+                }
+              case EVENT_STATE_WAITEND  : 
+                {
+                  if (reg_NB_INST_COMMIT_ALL [i][j] == 0)
+                    {
+                      reg_EVENT_STATE [i][j] = EVENT_STATE_END;
+                      reg_EVENT_FLUSH [i][j] = false;
+                    }
+                  break;
+                }
+              case EVENT_STATE_END      :
+                {
+                  reg_EVENT_STATE [i][j] = EVENT_STATE_NO_EVENT;
+                  break;
+                }
 //            case EVENT_STATE_NO_EVENT : 
-//            case EVENT_STATE_WAITEND  : 
               default : break;
               }
@@ -324 +348 @@
                 {
                   reg_EVENT_STATE [front_end_id][context_id] = EVENT_STATE_EVENT;
-
-                  // !!!!!!!!!!! Compute address
+                  reg_EVENT_FLUSH [front_end_id][context_id] = true;
+
+                  // TODO Compute address !!!!!!!!!!!
                 }
               
@@ -332 +357 @@
               if (type == TYPE_MEMORY)
                 reg_NB_INST_COMMIT_MEM [front_end_id][context_id] --;
-
-              if (reg_NB_INST_COMMIT_ALL [front_end_id][context_id] == 0)
-                reg_EVENT_STATE [front_end_id][context_id] = EVENT_STATE_END;
 
               reg_NUM_BANK_HEAD = (reg_NUM_BANK_HEAD+1)%_param->_nb_bank;
@@ -416 +438 @@
 
               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_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 ?
@@ -433 +455 @@
               // ....... max ...X... min ....... KO
               
-              Tcontrol_t   is_valid      = ((depth == depth_min) or 
-                                            depth_full or
-                                            ((depth_min <= depth_max)?
-                                             ((depth >= depth_min) and (depth <=depth_max)):
-                                             ((depth >= depth_min) or  (depth <=depth_max))));
+//               Tcontrol_t   is_valid      = ((depth == depth_min) or 
+//                                             depth_full or
+//                                             ((depth_min <= depth_max)?
+//                                              ((depth >= depth_min) and (depth <=depth_max)):
+//                                              ((depth >= depth_min) or  (depth <=depth_max))));
+
+              bool         flush         = reg_EVENT_FLUSH [front_end_id][context_id];
+              Tcontrol_t   is_valid      = ((depth == depth_min) and not flush);
 
               log_printf(TRACE,Commit_unit,FUNCTION,"  * HEAD              [%d]",i);
@@ -443 +468 @@
               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_max       : %d",depth_max);
+              log_printf(TRACE,Commit_unit,FUNCTION,"    * flush           : %d",flush);
 
               //------------------------------------------------------
@@ -522 +548 @@
     for (uint32_t i=0; i<_param->_nb_front_end; i++)
       for (uint32_t j=0; j<_param->_nb_context [i]; j++)
-        log_printf(TRACE,Commit_unit,FUNCTION,"    * num_inst[%d][%d] all : %d, mem : %d",i,j,reg_NB_INST_COMMIT_ALL[i][j],reg_NB_INST_COMMIT_MEM[i][j]);
+        {
+          log_printf(TRACE,Commit_unit,FUNCTION,"    * [%d][%d] num_inst_all : %d, num_inst_mem : %d",i,j,reg_NB_INST_COMMIT_ALL[i][j],reg_NB_INST_COMMIT_MEM[i][j]);
+          log_printf(TRACE,Commit_unit,FUNCTION,"    * [%d][%d] state        : %s",i,j,toString(reg_EVENT_STATE [i][j]).c_str());
+        }
         
     for (uint32_t i=0; i<_param->_nb_bank; i++)
       {
-        log_printf(TRACE,Commit_unit,FUNCTION,"    * Bank[%d] size : %d, ptr : %d",i,(int)_rob[i].size(), reg_BANK_PTR [i]);
+        log_printf(TRACE,Commit_unit,FUNCTION,"    * Bank [%d] size : %d, ptr : %d",i,(int)_rob[i].size(), reg_BANK_PTR [i]);
 
 #ifdef STATISTICS