Changeset 100 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/SelfTest/src/test.cpp

Timestamp:

Jan 8, 2009, 2:06:27 PM (15 years ago)

Author:

rosiere

Message:

1) Bug fix (Operation, Instruction)
2) Modif Return Address Stack
3) Add Soft Test
4) Add Soc Test

Location:

trunk

Files:

• . (modified) (1 prop)
• IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/SelfTest/src/test.cpp (modified) (8 diffs)

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

@@ -362 +362 @@
 
   // Initialisation
+  const bool test1 = false;
+  const bool test2 = true ;
+  const bool test3 = false;
+  const bool test4 = false;
 
   const uint32_t seed = 0;
@@ -402 +406 @@
       LABEL("Iteration %d",iteration);
 
+      if (test1)
       {
         LABEL("Test sequential");
@@ -481 +486 @@
       }
 
+      if (test2)
       {
         LABEL("Test no sequential - L.J");
@@ -489 +495 @@
         for (uint32_t i=0; i<_param->_nb_instruction [context]; i++)
           {
-            Taddress_t addr      = (1<<(_param->_nb_instruction[context]+4));
-            Taddress_t addr_src  = addr+i;
+            Taddress_t pc_current  = (1<<(_param->_nb_instruction[context]+3));
+            Taddress_t pc_previous = pc_current-1;
+            Taddress_t addr_src  = pc_current+i;
             Taddress_t addr_dest = 0xdeadbeef;
-            
-            in_PREDICT_PC_PREVIOUS           [context]->write(0);
-            in_PREDICT_PC_CURRENT            [context]->write(addr);
-            in_PREDICT_PC_CURRENT_IS_DS_TAKE [context]->write(0);
+            Tcontrol_t is_ds_take= rand()%2;
+
+            in_PREDICT_PC_PREVIOUS           [context]->write(pc_previous);
+            in_PREDICT_PC_CURRENT            [context]->write(pc_current);
+            in_PREDICT_PC_CURRENT_IS_DS_TAKE [context]->write(is_ds_take);
 
             bool find = false;
@@ -515 +523 @@
                     LABEL(" * BTB address : 0x%x",out_PREDICT_BTB_ADDRESS    [port]->read());
                     if ((out_PREDICT_BTB_CONTEXT_ID [port]->read() == context) and
-                        (out_PREDICT_BTB_ADDRESS    [port]->read() == addr   ))
+                        (out_PREDICT_BTB_ADDRESS    [port]->read() == (is_ds_take)?pc_previous:pc_current   ))
                       {
                         in_PREDICT_BTB_ACK          [port]->write((rand()%100)<percent_transaction_predict);
@@ -531 +539 @@
                 SC_START(0);
 
+                LABEL ("PREDICT_VAL : %d", in_PREDICT_VAL[context]->read());
+                LABEL ("PREDICT_ACK : %d",out_PREDICT_ACK[context]->read());
+                
                 if (in_PREDICT_VAL[context]->read() and out_PREDICT_ACK[context]->read())
                   {
                     LABEL ("PREDICT         [%d] - Transaction accepted",context);
+                    LABEL ("  * pc_previous: 0x%x",pc_previous );
+                    LABEL ("  * pc_current : 0x%x",pc_current      );
+                    LABEL ("  * addr_src   : 0x%x",addr_src  );
+                    LABEL ("  * addr_dest  : 0x%x",addr_dest );
+                    LABEL ("  * is_ds_take : %d"  ,is_ds_take);
+
                     find = true;
-
-                    TEST(Taddress_t        ,out_PREDICT_PC_NEXT                     [context]->read(),addr_dest);
-                    TEST(Tcontrol_t        ,out_PREDICT_PC_NEXT_IS_DS_TAKE          [context]->read(),i==(_param->_nb_instruction [context]-1));
+                    
+                    Tcontrol_t next_is_ds_take = (not is_ds_take and (i==(_param->_nb_instruction [context]-1)));
+
+                    TEST(Tcontrol_t        ,out_PREDICT_PC_NEXT_IS_DS_TAKE          [context]->read(), next_is_ds_take);
+                    TEST(Taddress_t        ,out_PREDICT_PC_NEXT                     [context]->read(),(next_is_ds_take)?(addr_src+1):addr_dest);
                     TEST(Tinst_ifetch_ptr_t,out_PREDICT_INST_IFETCH_PTR             [context]->read(),i);
-                    TEST(Tbranch_state_t   ,out_PREDICT_BRANCH_STATE                [context]->read(),BRANCH_STATE_NSPEC_TAKE);
+                    TEST(Tbranch_state_t   ,out_PREDICT_BRANCH_STATE                [context]->read(),(next_is_ds_take)?BRANCH_STATE_NONE:BRANCH_STATE_NSPEC_TAKE);
 //                  TEST(Tprediction_ptr_t ,out_PREDICT_BRANCH_UPDATE_PREDICTION_ID [context]->read(),0);
 
-                    uint32_t k=((addr_src%_param->_nb_instruction[context])==_param->_nb_instruction[context]-1)?_param->_nb_instruction[context]:((addr_src%_param->_nb_instruction[context])+2);
+                    uint32_t k=((is_ds_take)?1:((next_is_ds_take)?_param->_nb_instruction[context]:((addr_src%_param->_nb_instruction [context])+2)));
+
+
+// ((addr_src%_param->_nb_instruction[context])==_param->_nb_instruction[context]-1)?_param->_nb_instruction[context]:((addr_src%_param->_nb_instruction[context])+2);
+
                     LABEL("instruction enable : ");
                     LABEL("  [0:%d[ = 1",k);
-                    LABEL("  [%d:%d[ = 1",k,_param->_nb_instruction[context]);
+                    LABEL("  [%d:%d[ = 0",k,_param->_nb_instruction[context]);
                     for (uint32_t j=0; j<k; j++)
-                      TEST(Tcontrol_t        ,out_PREDICT_INSTRUCTION_ENABLE [context][j]->read(),1);
+                    TEST(Tcontrol_t        ,out_PREDICT_INSTRUCTION_ENABLE [context][j]->read(),1);
                     for (uint32_t j=k; j<_param->_nb_instruction[context]; j++)
-                      TEST(Tcontrol_t        ,out_PREDICT_INSTRUCTION_ENABLE [context][j]->read(),0);
+                    TEST(Tcontrol_t        ,out_PREDICT_INSTRUCTION_ENABLE [context][j]->read(),0);
 
                     TEST(Tcontrol_t        ,out_PREDICT_BTB_VAL        [port]->read(),1); 
                     TEST(Tcontext_t        ,out_PREDICT_BTB_CONTEXT_ID [port]->read(),context);
-                    TEST(Taddress_t        ,out_PREDICT_BTB_ADDRESS    [port]->read(),addr);
+                    TEST(Taddress_t        ,out_PREDICT_BTB_ADDRESS    [port]->read(),(is_ds_take)?pc_previous:pc_current);
                   }
                 
@@ -571 +594 @@
           }
       }
-
+      
+      if (test3)
       {
         LABEL("Decod - Ok");
@@ -618 +642 @@
       }
 
+      if (test4)
       {
         LABEL("Decod - Ko");