Changeset 107 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/src/Prediction_unit_Glue_genMealy_predict.cpp

Timestamp:

Feb 11, 2009, 12:03:25 AM (15 years ago)

Author:

rosiere

Message:

1) Fix test in Direction_Glue for Conditionnal Branch
2) Fix Instruction Address Compute

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/src/Prediction_unit_Glue_genMealy_predict.cpp (modified) (12 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/src/Prediction_unit_Glue_genMealy_predict.cpp

@@ -117 +117 @@
             //  if pc_current is a delay slot, then pc_previous is a branchement instruction, also hit must be set.
             //  else : an another branch instruction have eject this branch : can't accurate
-            Tcontrol_t          hit         = PORT_READ(in_PREDICT_BTB_HIT[i]);
-            Tcontrol_t          is_accurate = PORT_READ(in_PREDICT_BTB_IS_ACCURATE  [i]) and not (pc_current_is_ds_take and not hit);
+            Tcontrol_t          hit             = PORT_READ(in_PREDICT_BTB_HIT[i]);
+            Tcontrol_t          is_accurate     = not (pc_current_is_ds_take and not hit);
+            Tcontrol_t          btb_is_accurate = PORT_READ(in_PREDICT_BTB_IS_ACCURATE  [i]);
 
             log_printf(TRACE,Prediction_unit_Glue,FUNCTION,"    * hit                   : %d"    ,hit);
             log_printf(TRACE,Prediction_unit_Glue,FUNCTION,"    * is_accurate           : %d"    ,is_accurate);
+            log_printf(TRACE,Prediction_unit_Glue,FUNCTION,"    * btb_is_accurate       : %d"    ,btb_is_accurate);
 
             // STEP (3) : Test if BTB find a branch instruction in the packet
@@ -158 +160 @@
                 else
                   {
+                    log_printf(TRACE,Prediction_unit_Glue,FUNCTION,"      * branch is not in the last slot of the packet");
+
                     Tbranch_condition_t condition    = PORT_READ(in_PREDICT_BTB_CONDITION    [i]);
                     Taddress_t          address_dest = PORT_READ(in_PREDICT_BTB_ADDRESS_DEST [i]);
@@ -166 +170 @@
                     log_printf(TRACE,Prediction_unit_Glue,FUNCTION,"    * address_src           : 0x%.8x (0x%.8x)",address_src ,address_src <<2);
                     log_printf(TRACE,Prediction_unit_Glue,FUNCTION,"    * address_dest          : 0x%.8x (0x%.8x)",address_dest,address_dest<<2);
-                    
+
                     switch (condition)
                       {
@@ -178 +182 @@
                           pc_next      = address_dest;
                           branch_state = BRANCH_STATE_NSPEC_TAKE;
+//                        is_accurate &= btb_is_accurate;
+
                           break;
                         }
@@ -190 +196 @@
                           pc_next      = address_dest;
                           branch_state = BRANCH_STATE_NSPEC_TAKE;
+//                        is_accurate &= btb_is_accurate;
+
                           break;
                         }
@@ -201 +209 @@
                           // Test direction
                           direction = PORT_READ(in_PREDICT_DIR_DIRECTION [i]); // Direction is not the "flag predict" ... also flag_unset and flag_set is the same
-                          if (direction = 1)
+                          if (direction == 1)
                             {
                               branch_state = BRANCH_STATE_SPEC_TAKE;
@@ -211 +219 @@
                               pc_next      = address_src+2; // +1 = delay slot
                             }
+
+//                        is_accurate &= btb_is_accurate;
                           break;
                         }
@@ -223 +233 @@
                           pc_next      = address_dest;
                           branch_state = BRANCH_STATE_SPEC_TAKE;
+                          is_accurate &= btb_is_accurate;
+
                           break;
                         }
@@ -235 +247 @@
                           pc_next      = address_dest;
                           branch_state = BRANCH_STATE_NSPEC_TAKE;
+                          is_accurate &= btb_is_accurate;
+
                           break;
                         }
@@ -244 +258 @@
                           push         = false;
                           direction    = true;
-                          pc_next      = PORT_READ(in_PREDICT_RAS_ADDRESS_POP  [i]);
+                          pc_next      = PORT_READ(in_PREDICT_RAS_HIT [i])?PORT_READ(in_PREDICT_RAS_ADDRESS_POP [i]):address_dest;
                           branch_state = BRANCH_STATE_SPEC_TAKE;
+                          is_accurate  &= (PORT_READ(in_PREDICT_RAS_HIT [i]) or btb_is_accurate); // if miss - prediction is not accurate
+
                           break;
                         }
@@ -255 +271 @@
                       }
                     
+                    log_printf(TRACE,Prediction_unit_Glue,FUNCTION,"    * direction             : %d",direction);
+                    log_printf(TRACE,Prediction_unit_Glue,FUNCTION,"    * branch_state          : %d",branch_state);
+                    log_printf(TRACE,Prediction_unit_Glue,FUNCTION,"    * pc_next               : %.8x",pc_next);
+
                     if (use_dir)
                       {
@@ -270 +290 @@
                         PORT_WRITE(out_PREDICT_RAS_PUSH         [i], push); 
                         PORT_WRITE(out_PREDICT_RAS_ADDRESS_PUSH [i], address_src+2); 
-                        
-                        is_accurate &= PORT_READ(in_PREDICT_RAS_HIT [i]); // if miss - prediction is not accurate
                       }