Changeset 5 for trunk/IPs/systemC

Timestamp:

Mar 9, 2007, 7:16:58 PM (18 years ago)

Author:

rosiere

Message:

Ajout du composant Meta_Predictor

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor

Files:

• Makefile (added)
• Makefile.deps (added)
• Meta_Predictor_Glue/SelfTest/src/test.cpp (modified) (12 diffs)
• Meta_Predictor_Glue/include/Meta_Predictor_Glue.h (modified) (3 diffs)
• Meta_Predictor_Glue/include/Parameters.h (modified) (1 diff)
• Meta_Predictor_Glue/src/Meta_Predictor_Glue.cpp (modified) (1 diff)
• Meta_Predictor_Glue/src/Meta_Predictor_Glue_allocation.cpp (modified) (3 diffs)
• Meta_Predictor_Glue/src/Meta_Predictor_Glue_deallocation.cpp (modified) (3 diffs)
• Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_branch_complete_history.cpp (modified) (1 diff)
• Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_branch_complete_val.cpp (added)
• Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_predict_history.cpp (modified) (6 diffs)
• Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_body.cpp (modified) (2 diffs)
• Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_declaration.cpp (modified) (1 diff)
• Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_port.cpp (modified) (2 diffs)
• Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_testbench_port.cpp (modified) (2 diffs)
• Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_testbench_transition.cpp (modified) (2 diffs)
• Meta_Predictor_Glue/src/Parameters.cpp (modified) (2 diffs)
• SelfTest (added)
• SelfTest/Makefile (added)
• SelfTest/configuration (added)
• SelfTest/configuration.cfg (added)
• SelfTest/include (added)
• SelfTest/include/test.h (added)
• SelfTest/src (added)
• SelfTest/src/main.cpp (added)
• SelfTest/src/test.cpp (added)
• Two_Level_Branch_Predictor/SelfTest/configuration.cfg (modified) (1 diff)
• Two_Level_Branch_Predictor/SelfTest/src/test.cpp (modified) (1 diff)
• Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h (modified) (1 diff)
• Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor.cpp (modified) (1 diff)
• VERSION (added)
• include (added)
• include/Meta_Predictor.h (added)
• include/Parameters.h (added)
• include/Statistics.h (added)
• include/Types.h (added)
• src (added)
• src/Meta_Predictor.cpp (added)
• src/Meta_Predictor_allocation.cpp (added)
• src/Meta_Predictor_deallocation.cpp (added)
• src/Meta_Predictor_statistics.cpp (added)
• src/Meta_Predictor_transition.cpp (added)
• src/Meta_Predictor_vhdl.cpp (added)
• src/Meta_Predictor_vhdl_body.cpp (added)
• src/Meta_Predictor_vhdl_declaration.cpp (added)
• src/Meta_Predictor_vhdl_port.cpp (added)
• src/Meta_Predictor_vhdl_testbench_label.cpp (added)
• src/Meta_Predictor_vhdl_testbench_port.cpp (added)
• src/Meta_Predictor_vhdl_testbench_transition.cpp (added)
• src/Parameters.cpp (added)
• src/Parameters_msg_error.cpp (added)
• src/Parameters_print.cpp (added)
• src/Statistics.cpp (added)
• src/Statistics_add.cpp (added)
• src/Statistics_print.cpp (added)
• src/Statistics_print_body.cpp (added)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/SelfTest/src/test.cpp

@@ -45 +45 @@
 
     // Interface Branch_complete
+  sc_signal<Tcontrol_t>           ** BRANCH_COMPLETE_VAL                    ;
+  sc_signal<Tcontrol_t>           ** BRANCH_COMPLETE_PREDICTOR_2_VAL        ;
+
   sc_signal<Tcontrol_t>           ** BRANCH_COMPLETE_PREDICTOR_0_ACK        ;
   sc_signal<Tcontrol_t>           ** BRANCH_COMPLETE_PREDICTOR_1_ACK        ;
@@ -57 +60 @@
   sc_signal<Tpht_history_t>       ** BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY;
   sc_signal<Thistory_t>           ** BRANCH_COMPLETE_HISTORY                ;
-
+  sc_signal<Tcontrol_t>           ** BRANCH_COMPLETE_DIRECTION              ;
+  sc_signal<Tcontrol_t>           ** BRANCH_COMPLETE_PREDICTOR_2_DIRECTION  ;
   string rename;
 
@@ -108 +112 @@
 
     // Interface Branch_complete
-    
+    BRANCH_COMPLETE_VAL                     = new sc_signal<Tcontrol_t>     * [_param._nb_branch_complete     ];
+    BRANCH_COMPLETE_PREDICTOR_2_VAL         = new sc_signal<Tcontrol_t>     * [_param._nb_branch_complete     ];
     BRANCH_COMPLETE_PREDICTOR_0_ACK         = new sc_signal<Tcontrol_t>     * [_param._nb_branch_complete     ];
     BRANCH_COMPLETE_PREDICTOR_1_ACK         = new sc_signal<Tcontrol_t>     * [_param._nb_branch_complete     ];
@@ -120 +125 @@
     BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY = new sc_signal<Tpht_history_t> * [_param._nb_branch_complete     ];
     BRANCH_COMPLETE_HISTORY                 = new sc_signal<Thistory_t>     * [_param._nb_branch_complete     ];
+    BRANCH_COMPLETE_DIRECTION               = new sc_signal<Tcontrol_t>     * [_param._nb_branch_complete     ];
+    BRANCH_COMPLETE_PREDICTOR_2_DIRECTION   = new sc_signal<Tcontrol_t>     * [_param._nb_branch_complete     ];
 
     for (uint32_t i=0; i<_param._nb_branch_complete; i++)
       {
+        rename = "BRANCH_COMPLETE_VAL_"                      +toString(i);
+        BRANCH_COMPLETE_VAL                               [i] = new sc_signal<Tcontrol_t>     (rename.c_str());
+        rename = "BRANCH_COMPLETE_PREDICTOR_2_VAL_"          +toString(i);
+        BRANCH_COMPLETE_PREDICTOR_2_VAL                   [i] = new sc_signal<Tcontrol_t>     (rename.c_str());
         rename = "BRANCH_COMPLETE_PREDICTOR_0_ACK_"          +toString(i);
         BRANCH_COMPLETE_PREDICTOR_0_ACK                   [i] = new sc_signal<Tcontrol_t>     (rename.c_str());
@@ -145 +156 @@
         rename = "BRANCH_COMPLETE_HISTORY_"                +toString(i);
         BRANCH_COMPLETE_HISTORY                           [i] = new sc_signal<Thistory_t>     (rename.c_str());
+        rename = "BRANCH_COMPLETE_DIRECTION_"              +toString(i);
+        BRANCH_COMPLETE_DIRECTION                         [i] = new sc_signal<Tcontrol_t>     (rename.c_str());
+        rename = "BRANCH_COMPLETE_PREDICTOR_2_DIRECTION_"  +toString(i);
+        BRANCH_COMPLETE_PREDICTOR_2_DIRECTION             [i] = new sc_signal<Tcontrol_t>     (rename.c_str());
       }
 
@@ -192 +207 @@
         if (_param._have_meta_predictor)
           {
+        (*(_Meta_Predictor_Glue-> in_BRANCH_COMPLETE_VAL                     [i])) (*(BRANCH_COMPLETE_VAL                     [i]));
+        (*(_Meta_Predictor_Glue->out_BRANCH_COMPLETE_PREDICTOR_2_VAL         [i])) (*(BRANCH_COMPLETE_PREDICTOR_2_VAL         [i]));
+
         (*(_Meta_Predictor_Glue-> in_BRANCH_COMPLETE_PREDICTOR_0_ACK         [i])) (*(BRANCH_COMPLETE_PREDICTOR_0_ACK         [i]));
         (*(_Meta_Predictor_Glue-> in_BRANCH_COMPLETE_PREDICTOR_1_ACK         [i])) (*(BRANCH_COMPLETE_PREDICTOR_1_ACK         [i]));
@@ -214 +232 @@
         (*(_Meta_Predictor_Glue->out_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY [i])) (*(BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY [i]));
         (*(_Meta_Predictor_Glue-> in_BRANCH_COMPLETE_HISTORY                 [i])) (*(BRANCH_COMPLETE_HISTORY                 [i]));
+        if (_param._have_meta_predictor)        
+          {
+        (*(_Meta_Predictor_Glue-> in_BRANCH_COMPLETE_DIRECTION               [i])) (*(BRANCH_COMPLETE_DIRECTION               [i]));
+        (*(_Meta_Predictor_Glue->out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION   [i])) (*(BRANCH_COMPLETE_PREDICTOR_2_DIRECTION   [i]));
+          }
       }
 
@@ -241 +264 @@
   Tcontrol_t     predict_direction                       [_param._nb_prediction];
                 
+  Tcontrol_t     branch_complete_predictor_2_val         [_param._nb_branch_complete];
   Tcontrol_t     branch_complete_ack                     [_param._nb_branch_complete];
   Tbht_history_t branch_complete_predictor_0_bht_history [_param._nb_branch_complete];
@@ -248 +272 @@
   Tbht_history_t branch_complete_predictor_2_bht_history [_param._nb_branch_complete];
   Tpht_history_t branch_complete_predictor_2_pht_history [_param._nb_branch_complete];
+  Tcontrol_t     branch_complete_predictor_2_direction   [_param._nb_branch_complete];
 
   uint32_t shift_0 = 0;
@@ -255 +280 @@
   uint32_t shift_4 = shift_3 + _param._predictor_1_pht_size_counter;
   uint32_t shift_5 = shift_4 + _param._predictor_2_bht_size_shifter;
-//uint32_t shift_5 = shift_5 + _param._predictor_2_pht_size_counter;
+//uint32_t shift_6 = shift_5 + _param._predictor_2_pht_size_counter;
 
   for (uint32_t iteration=0; iteration<NB_ITERATION; iteration ++)
@@ -353 +378 @@
                                                              (branch_complete_predictor_2_bht_history [i] << shift_4) |
                                                              (branch_complete_predictor_2_pht_history [i] << shift_5) );
+
+          Tcontrol_t direction_0 = ((_param._predictor_0_have_pht)?(branch_complete_predictor_0_pht_history [i] >> (_param._predictor_0_pht_size_counter-1)):(branch_complete_predictor_0_bht_history [i] >> (_param._predictor_0_bht_size_shifter-1)))&1;
+          Tcontrol_t direction_1 = ((_param._predictor_1_have_pht)?(branch_complete_predictor_1_pht_history [i] >> (_param._predictor_1_pht_size_counter-1)):(branch_complete_predictor_1_bht_history [i] >> (_param._predictor_1_bht_size_shifter-1)))&1;
+          Tcontrol_t direction_2 = ((_param._predictor_2_have_pht)?(branch_complete_predictor_2_pht_history [i] >> (_param._predictor_2_pht_size_counter-1)):(branch_complete_predictor_2_bht_history [i] >> (_param._predictor_2_bht_size_shifter-1)))&1;
+
+          Tcontrol_t direction   = ((rand()%2) != 0);
+          Tcontrol_t val         = ((rand()%2) != 0);
+
+          cout << "{"+toString(static_cast<uint32_t>(sc_simulation_time()))+"} " << endl 
+               << "  * val             : " << val << endl
+               << "  * direction_good  : " << direction << endl
+               << "    * direction_0   : " << direction_0 << endl
+               << "    * direction_1   : " << direction_1 << endl
+               << "    * direction_2   : " << direction_2 << endl;
+          
+          BRANCH_COMPLETE_VAL       [i] ->write (val);
+          BRANCH_COMPLETE_DIRECTION [i] ->write (direction);
+          
+          if (val == 0)
+            {
+              branch_complete_predictor_2_val [i] = val;
+            }
+          else
+            {
+              branch_complete_predictor_2_val [i] = (direction_0 xor direction_1);
+              if (direction_2 == 0)
+                if (direction_0 == direction)
+                  branch_complete_predictor_2_direction [i] = 0;
+                else
+                  branch_complete_predictor_2_direction [i] = 1;
+              else
+                if (direction_1 == direction)
+                  branch_complete_predictor_2_direction [i] = 1;
+                else
+                  branch_complete_predictor_2_direction [i] = 0;
+            }
         }
 
@@ -370 +431 @@
         if (_param._have_meta_predictor)        
           {                                     
+          TEST(Tcontrol_t    , BRANCH_COMPLETE_PREDICTOR_2_VAL         [i]->read(), branch_complete_predictor_2_val         [i]);
+
+          if (branch_complete_predictor_2_val         [i])
+          TEST(Tcontrol_t    , BRANCH_COMPLETE_PREDICTOR_2_DIRECTION   [i]->read(), branch_complete_predictor_2_direction   [i]);  
+
         if (_param._predictor_0_have_bht)
           TEST(Tbht_history_t, BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY [i]->read(), branch_complete_predictor_0_bht_history [i]);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h

@@ -82 +82 @@
 
     // Interface Branch_complete
+  public    : SC_IN (Tcontrol_t)           **  in_BRANCH_COMPLETE_VAL                    ;
+  public    : SC_OUT(Tcontrol_t)           ** out_BRANCH_COMPLETE_PREDICTOR_2_VAL        ;
+
   public    : SC_IN (Tcontrol_t)           **  in_BRANCH_COMPLETE_PREDICTOR_0_ACK        ;
   public    : SC_IN (Tcontrol_t)           **  in_BRANCH_COMPLETE_PREDICTOR_1_ACK        ;
@@ -94 +97 @@
   public    : SC_OUT(Tpht_history_t)       ** out_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY;
   public    : SC_IN (Thistory_t)           **  in_BRANCH_COMPLETE_HISTORY                ;
+  public    : SC_IN (Tcontrol_t)           **  in_BRANCH_COMPLETE_DIRECTION              ;
+  public    : SC_OUT(Tcontrol_t)           ** out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION  ;
 
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
@@ -130 +135 @@
   public  : void     genMealy_predict_ack             (void);
   public  : void     genMealy_predict_history         (void);
+  public  : void     genMealy_branch_complete_val     (void);
   public  : void     genMealy_branch_complete_ack     (void);
   public  : void     genMealy_branch_complete_history (void);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h

@@ -46 +46 @@
   public : const uint32_t _size_history                      ;
 
+  public : const uint32_t _shift_0;
+  public : const uint32_t _shift_1;
+  public : const uint32_t _shift_2;
+  public : const uint32_t _shift_3;
+  public : const uint32_t _shift_4;
+  public : const uint32_t _shift_5;
+  public : const uint32_t _shift_6;
+
     //-----[ methods ]-----------------------------------------------------------
   public : Parameters  (bool     have_meta_predictor               ,

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue.cpp

@@ -163 +163 @@
       }
 #endif    
+
+    if (_param._have_meta_predictor)
+      {
+    log_printf(INFO,Meta_Predictor_Glue,"Meta_Predictor_Glue","method - genMealy_branch_complete_val");
+    SC_METHOD (genMealy_branch_complete_val);
+    dont_initialize ();
+    for (uint32_t i=0; i<_param._nb_branch_complete; i++)
+      {
+        sensitive << *(in_BRANCH_COMPLETE_VAL       [i])
+                  << *(in_BRANCH_COMPLETE_HISTORY   [i])
+                  << *(in_BRANCH_COMPLETE_DIRECTION [i]);
+      }
+
+#ifdef SYSTEMCASS_SPECIFIC
+    // List dependency information
+    for (uint32_t i=0; i<_param._nb_branch_complete; i++)
+      {
+        (*(out_BRANCH_COMPLETE_PREDICTOR_2_VAL       [i])) (*(in_BRANCH_COMPLETE_VAL       [i]));
+        (*(out_BRANCH_COMPLETE_PREDICTOR_2_VAL       [i])) (*(in_BRANCH_COMPLETE_HISTORY   [i]));
+        (*(out_BRANCH_COMPLETE_PREDICTOR_2_VAL       [i])) (*(in_BRANCH_COMPLETE_DIRECTION [i]));
+
+        (*(out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i])) (*(in_BRANCH_COMPLETE_VAL       [i]));
+        (*(out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i])) (*(in_BRANCH_COMPLETE_HISTORY   [i]));
+        (*(out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i])) (*(in_BRANCH_COMPLETE_DIRECTION [i]));
+      }
+#endif    
+      }
 
     log_printf(INFO,Meta_Predictor_Glue,"Meta_Predictor_Glue","method - genMealy_branch_complete_ack");

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_allocation.cpp

@@ -114 +114 @@
     if (_param._have_meta_predictor)
       {
+     in_BRANCH_COMPLETE_VAL                     = new SC_IN (Tcontrol_t)     * [_param._nb_branch_complete     ];
+    out_BRANCH_COMPLETE_PREDICTOR_2_VAL         = new SC_OUT(Tcontrol_t)     * [_param._nb_branch_complete     ];
+
      in_BRANCH_COMPLETE_PREDICTOR_0_ACK         = new SC_IN (Tcontrol_t)     * [_param._nb_branch_complete     ];
      in_BRANCH_COMPLETE_PREDICTOR_1_ACK         = new SC_IN (Tcontrol_t)     * [_param._nb_branch_complete     ];
@@ -135 +138 @@
     out_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY = new SC_OUT(Tpht_history_t) * [_param._nb_branch_complete     ];
      in_BRANCH_COMPLETE_HISTORY                 = new SC_IN (Thistory_t)     * [_param._nb_branch_complete     ];
-
+    if (_param._have_meta_predictor)
+      {
+     in_BRANCH_COMPLETE_DIRECTION               = new SC_IN (Tcontrol_t)     * [_param._nb_branch_complete     ];
+    out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION   = new SC_OUT(Tcontrol_t)     * [_param._nb_branch_complete     ];
+      }
     for (uint32_t i=0; i<_param._nb_branch_complete; i++)
       {
         if (_param._have_meta_predictor)
           {
+        rename = " in_BRANCH_COMPLETE_VAL_"                      +toString(i);
+         in_BRANCH_COMPLETE_VAL                               [i] = new SC_IN (Tcontrol_t)     (rename.c_str());
+        
+        rename = "out_BRANCH_COMPLETE_PREDICTOR_2_VAL_"          +toString(i);
+        out_BRANCH_COMPLETE_PREDICTOR_2_VAL                   [i] = new SC_OUT(Tcontrol_t)     (rename.c_str());
+
         rename = " in_BRANCH_COMPLETE_PREDICTOR_0_ACK_"          +toString(i);
          in_BRANCH_COMPLETE_PREDICTOR_0_ACK                   [i] = new SC_IN (Tcontrol_t)     (rename.c_str());
@@ -187 +200 @@
         rename = " in_BRANCH_COMPLETE_HISTORY_"                +toString(i);
          in_BRANCH_COMPLETE_HISTORY                           [i] = new SC_IN (Thistory_t)     (rename.c_str());
-      }
-
+
+        if (_param._have_meta_predictor)
+          {
+        rename = " in_BRANCH_COMPLETE_DIRECTION_"              +toString(i);
+         in_BRANCH_COMPLETE_DIRECTION                         [i] = new SC_IN (Tcontrol_t)     (rename.c_str());
+
+        rename = "out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION_"  +toString(i);
+        out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION             [i] = new SC_OUT(Tcontrol_t)     (rename.c_str());
+          }
+      }
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_deallocation.cpp

@@ -84 +84 @@
         if (_param._have_meta_predictor)
         {
+        delete  in_BRANCH_COMPLETE_VAL                               [i];
+        delete out_BRANCH_COMPLETE_PREDICTOR_2_VAL                   [i];
+
         delete  in_BRANCH_COMPLETE_PREDICTOR_0_ACK                   [i];
         delete  in_BRANCH_COMPLETE_PREDICTOR_1_ACK                   [i];
@@ -106 +109 @@
         delete out_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY           [i];
         delete  in_BRANCH_COMPLETE_HISTORY                           [i];
+        if (_param._have_meta_predictor)
+          {
+        delete  in_BRANCH_COMPLETE_DIRECTION                         [i];
+        delete out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION             [i];
+          }
       }
 
     if (_param._have_meta_predictor)
     {
+    delete  in_BRANCH_COMPLETE_VAL                     ;
+    delete out_BRANCH_COMPLETE_PREDICTOR_2_VAL         ;
+
     delete  in_BRANCH_COMPLETE_PREDICTOR_0_ACK         ;
     delete  in_BRANCH_COMPLETE_PREDICTOR_1_ACK         ;
@@ -131 +142 @@
     delete out_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY ;
     delete  in_BRANCH_COMPLETE_HISTORY                 ;
-
+    if (_param._have_meta_predictor)
+      {
+    delete  in_BRANCH_COMPLETE_DIRECTION               ;
+    delete out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION   ;
+      }
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_branch_complete_history.cpp

@@ -28 +28 @@
           {
         if (_param._predictor_0_have_bht)
-          {
-        PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY [i], history & gen_mask<Tbht_history_t>(_param._predictor_0_bht_size_shifter));
-        history >>= _param._predictor_0_bht_size_shifter;
-          }
+        PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY [i], (history >> _param._shift_0) & gen_mask<Tbht_history_t>(_param._predictor_0_bht_size_shifter));
         if (_param._predictor_0_have_pht)
-          {
-        PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_0_PHT_HISTORY [i], history & gen_mask<Tpht_history_t>(_param._predictor_0_pht_size_counter));
-        history >>= _param._predictor_0_pht_size_counter;
+        PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_0_PHT_HISTORY [i], (history >> _param._shift_1) & gen_mask<Tpht_history_t>(_param._predictor_0_pht_size_counter));
           }
 
         if (_param._predictor_1_have_bht)
           {
-        PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_1_BHT_HISTORY [i], history & gen_mask<Tbht_history_t>(_param._predictor_1_bht_size_shifter));
-        history >>= _param._predictor_1_bht_size_shifter;
-          }
+        PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_1_BHT_HISTORY [i], (history >> _param._shift_2) & gen_mask<Tbht_history_t>(_param._predictor_1_bht_size_shifter));
+
         if (_param._predictor_1_have_pht)
-          {
-        PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_1_PHT_HISTORY [i], history & gen_mask<Tpht_history_t>(_param._predictor_1_pht_size_counter));
-        history >>= _param._predictor_1_pht_size_counter;
-          }
+        PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_1_PHT_HISTORY [i], (history >> _param._shift_3) & gen_mask<Tpht_history_t>(_param._predictor_1_pht_size_counter));
           }
 
         if (_param._predictor_2_have_bht)
-          {
-        PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_2_BHT_HISTORY [i], history & gen_mask<Tbht_history_t>(_param._predictor_2_bht_size_shifter));
-        history >>= _param._predictor_2_bht_size_shifter;
-          }
+        PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_2_BHT_HISTORY [i], (history >> _param._shift_4) & gen_mask<Tbht_history_t>(_param._predictor_2_bht_size_shifter));
         if (_param._predictor_2_have_pht)
-          {
-        PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY [i], history & gen_mask<Tpht_history_t>(_param._predictor_2_pht_size_counter));
-        history >>= _param._predictor_2_pht_size_counter;
-          }
+        PORT_WRITE(out_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY [i], (history >> _param._shift_5) & gen_mask<Tpht_history_t>(_param._predictor_2_pht_size_counter));
       }
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_predict_history.cpp

@@ -35 +35 @@
         predictor_2_pht_history   = PORT_READ(in_PREDICT_PREDICTOR_2_PHT_HISTORY [i]);
         predictor_2_pht_direction = predictor_2_pht_history >> (_param._predictor_2_pht_size_counter-1);
-        history                   = (history << _param._predictor_2_pht_size_counter) | predictor_2_pht_history;
+        history                  |= (predictor_2_pht_history << _param._shift_5);
           }
         if (_param._predictor_2_have_bht)
@@ -41 +41 @@
         predictor_2_bht_history   = PORT_READ(in_PREDICT_PREDICTOR_2_BHT_HISTORY [i]);
         predictor_2_bht_direction = predictor_2_bht_history >> (_param._predictor_2_bht_size_shifter-1);
-        history                   = (history << _param._predictor_2_bht_size_shifter) | predictor_2_bht_history;
+        history                  |= (predictor_2_bht_history << _param._shift_4);
           }
 
@@ -52 +52 @@
         predictor_1_pht_history   = PORT_READ(in_PREDICT_PREDICTOR_1_PHT_HISTORY [i]);
         predictor_1_pht_direction = predictor_1_pht_history >> (_param._predictor_1_pht_size_counter-1);
-        history                   = (history << _param._predictor_1_pht_size_counter) | predictor_1_pht_history;
+        history                  |= (predictor_1_pht_history << _param._shift_3);
           }
         if (_param._predictor_1_have_bht)
@@ -58 +58 @@
         predictor_1_bht_history   = PORT_READ(in_PREDICT_PREDICTOR_1_BHT_HISTORY [i]);
         predictor_1_bht_direction = predictor_1_bht_history >> (_param._predictor_1_bht_size_shifter-1);
-        history                   = (history << _param._predictor_1_bht_size_shifter) | predictor_1_bht_history;
+        history                  |= (predictor_1_bht_history << _param._shift_2) ;
           }
         if (_param._predictor_0_have_pht)
@@ -64 +64 @@
         predictor_0_pht_history   = PORT_READ(in_PREDICT_PREDICTOR_0_PHT_HISTORY [i]);
         predictor_0_pht_direction = predictor_0_pht_history >> (_param._predictor_0_pht_size_counter-1);
-        history                   = (history << _param._predictor_0_pht_size_counter) | predictor_0_pht_history;
+        history                  |= (predictor_0_pht_history << _param._shift_1);
           }
         if (_param._predictor_0_have_bht)
@@ -70 +70 @@
         predictor_0_bht_history   = PORT_READ(in_PREDICT_PREDICTOR_0_BHT_HISTORY [i]);
         predictor_0_bht_direction = predictor_0_bht_history >> (_param._predictor_0_bht_size_shifter-1);
-        history                   = (history << _param._predictor_0_bht_size_shifter) | predictor_0_bht_history;
+        history                  |= (predictor_0_bht_history << _param._shift_0);
           }
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_body.cpp

@@ -71 +71 @@
         vhdl.set_body ("");
         if (_param._have_meta_predictor)
-          vhdl.set_body ("out_PREDICT_DIRECTION_"+toString(i)+"   <= predictor_0_direction_"+toString(i)+" when predictor_2_direction_"+toString(i)+"='0' else predictor_1_direction_"+toString(i)+";");
+          vhdl.set_body ("out_PREDICT_DIRECTION_"+toString(i)+"   <= predict_predictor_0_direction_"+toString(i)+" when predict_predictor_2_direction_"+toString(i)+"='0' else predict_predictor_1_direction_"+toString(i)+";");
         else
-          vhdl.set_body ("out_PREDICT_DIRECTION_"+toString(i)+"   <= predictor_2_direction_"+toString(i)+";");
+          vhdl.set_body ("out_PREDICT_DIRECTION_"+toString(i)+"   <= predict_predictor_2_direction_"+toString(i)+";");
       }
 
@@ -82 +82 @@
     for (uint32_t i=0; i<_param._nb_branch_complete; i++)
       {
+        // branch_complete_predictor_2 val and directionn
+        if (_param._have_meta_predictor)
+          {
+        vhdl.set_body ("out_BRANCH_COMPLETE_PREDICTOR_2_VAL_"+toString(i)+"       <= (branch_complete_predictor_0_direction_"+toString(i)+" xor branch_complete_predictor_1_direction_"+toString(i)+") and "+"in_BRANCH_COMPLETE_VAL_"+toString(i)+";");
+        vhdl.set_body ("out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION_"+toString(i)+" <= (branch_complete_predictor_0_direction_"+toString(i)+" and not in_BRANCH_COMPLETE_DIRECTION_"+toString(i)+") or (branch_complete_predictor_1_direction_"+toString(i)+" and in_BRANCH_COMPLETE_DIRECTION_"+toString(i)+");");
+          }
+
         string meta_predictor_ack =  (_param._have_meta_predictor==true)?("in_BRANCH_COMPLETE_PREDICTOR_0_ACK_"+toString(i)+" and in_BRANCH_COMPLETE_PREDICTOR_1_ACK_"+toString(i)):"'1'";
 
-        vhdl.set_body ("out_BRANCH_COMPLETE_ACK_"+toString(i)+" <= "+meta_predictor_ack+" and "+"in_BRANCH_COMPLETE_PREDICTOR_2_ACK_"+toString(i)+";");
+        vhdl.set_body ("out_BRANCH_COMPLETE_ACK_"+toString(i)+"                   <= "+meta_predictor_ack+" and "+"in_BRANCH_COMPLETE_PREDICTOR_2_ACK_"+toString(i)+";");
 
         uint32_t index=_param._size_history;

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_declaration.cpp

@@ -26 +26 @@
           {
         if (_param._predictor_0_have_pht)
-          vhdl.set_alias ("predictor_0_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_0_PHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_0_pht_size_counter-1,_param._predictor_0_pht_size_counter-1));
+          vhdl.set_alias ("predict_predictor_0_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_0_PHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_0_pht_size_counter-1,_param._predictor_0_pht_size_counter-1));
         else
-          vhdl.set_alias ("predictor_0_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_0_BHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_0_bht_size_shifter-1,_param._predictor_0_bht_size_shifter-1));
+          vhdl.set_alias ("predict_predictor_0_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_0_BHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_0_bht_size_shifter-1,_param._predictor_0_bht_size_shifter-1));
         if (_param._predictor_1_have_pht)
-          vhdl.set_alias ("predictor_1_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_1_PHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_1_pht_size_counter-1,_param._predictor_1_pht_size_counter-1));
+          vhdl.set_alias ("predict_predictor_1_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_1_PHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_1_pht_size_counter-1,_param._predictor_1_pht_size_counter-1));
         else
-          vhdl.set_alias ("predictor_1_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_1_BHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_1_bht_size_shifter-1,_param._predictor_1_bht_size_shifter-1));
+          vhdl.set_alias ("predict_predictor_1_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_1_BHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_1_bht_size_shifter-1,_param._predictor_1_bht_size_shifter-1));
           }
 
         if (_param._predictor_2_have_pht)
-          vhdl.set_alias ("predictor_2_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_2_PHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_2_pht_size_counter-1,_param._predictor_2_pht_size_counter-1));
+          vhdl.set_alias ("predict_predictor_2_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_2_PHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_2_pht_size_counter-1,_param._predictor_2_pht_size_counter-1));
         else
-          vhdl.set_alias ("predictor_2_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_2_BHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_2_bht_size_shifter-1,_param._predictor_2_bht_size_shifter-1));
+          vhdl.set_alias ("predict_predictor_2_direction_"+toString(i),std_logic(1), "in_PREDICT_PREDICTOR_2_BHT_HISTORY_"+toString(i),std_logic_range(_param._predictor_2_bht_size_shifter-1,_param._predictor_2_bht_size_shifter-1));
       }
+
+    if (_param._have_meta_predictor)
+      {
+    for (uint32_t i=0; i<_param._nb_branch_complete; i++)
+      {
+//      if (_param._predictor_2_have_pht)
+//      vhdl.set_alias ("branch_complete_predictor_2_direction_"+toString(i),std_logic(1)," in_BRANCH_COMPLETE_HISTORY_"+toString(i),std_logic_range(_param._shift_6-1, _param._shift_6-1));
+//      else
+//      vhdl.set_alias ("branch_complete_predictor_2_direction_"+toString(i),std_logic(1)," in_BRANCH_COMPLETE_HISTORY_"+toString(i),std_logic_range(_param._shift_5-1, _param._shift_5-1));
+
+        if (_param._predictor_1_have_pht)
+        vhdl.set_alias ("branch_complete_predictor_1_direction_"+toString(i),std_logic(1)," in_BRANCH_COMPLETE_HISTORY_"+toString(i),std_logic_range(_param._shift_4-1, _param._shift_4-1));
+        else
+        vhdl.set_alias ("branch_complete_predictor_1_direction_"+toString(i),std_logic(1)," in_BRANCH_COMPLETE_HISTORY_"+toString(i),std_logic_range(_param._shift_3-1, _param._shift_3-1));
+
+        if (_param._predictor_0_have_pht)
+        vhdl.set_alias ("branch_complete_predictor_0_direction_"+toString(i),std_logic(1)," in_BRANCH_COMPLETE_HISTORY_"+toString(i),std_logic_range(_param._shift_2-1, _param._shift_2-1));
+        else
+        vhdl.set_alias ("branch_complete_predictor_0_direction_"+toString(i),std_logic(1)," in_BRANCH_COMPLETE_HISTORY_"+toString(i),std_logic_range(_param._shift_1-1, _param._shift_1-1));
+
+      }
+      }
+
+
+
     log_printf(FUNC,Meta_Predictor_Glue,"vhdl_declaration","End");
   };

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_port.cpp

@@ -55 +55 @@
         if (_param._have_meta_predictor)
           {
+        vhdl.set_port (" in_BRANCH_COMPLETE_VAL_"+toString(i)+"                    ", IN, 1);
+        vhdl.set_port ("out_BRANCH_COMPLETE_PREDICTOR_2_VAL_"+toString(i)+"        ",OUT, 1);
+
         vhdl.set_port (" in_BRANCH_COMPLETE_PREDICTOR_0_ACK_"+toString(i)+"        ", IN, 1);
         vhdl.set_port (" in_BRANCH_COMPLETE_PREDICTOR_1_ACK_"+toString(i)+"        ", IN, 1);
@@ -78 +81 @@
 
         vhdl.set_port (" in_BRANCH_COMPLETE_HISTORY_"+toString(i)+"                ", IN,_param._size_history);
+        if (_param._have_meta_predictor)
+          {
+        vhdl.set_port (" in_BRANCH_COMPLETE_DIRECTION_"+toString(i)+"              ", IN,1);
+        vhdl.set_port ("out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION_"+toString(i)+"  ",OUT,1);
+          }
       }
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_testbench_port.cpp

@@ -55 +55 @@
         if (_param._have_meta_predictor)
           {
+        _vhdl_testbench->set_port (" in_BRANCH_COMPLETE_VAL_"+toString(i)+"                    ", IN, 1);
+        _vhdl_testbench->set_port ("out_BRANCH_COMPLETE_PREDICTOR_2_VAL_"+toString(i)+"        ",OUT, 1);
+
         _vhdl_testbench->set_port (" in_BRANCH_COMPLETE_PREDICTOR_0_ACK_"+toString(i)+"        ", IN, 1);
         _vhdl_testbench->set_port (" in_BRANCH_COMPLETE_PREDICTOR_1_ACK_"+toString(i)+"        ", IN, 1);
@@ -78 +81 @@
 
         _vhdl_testbench->set_port (" in_BRANCH_COMPLETE_HISTORY_"+toString(i)+"                ", IN,_param._size_history);
+        if (_param._have_meta_predictor)
+          {
+        _vhdl_testbench->set_port (" in_BRANCH_COMPLETE_DIRECTION_"+toString(i)+"              ", IN,1);
+        _vhdl_testbench->set_port ("out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION_"+toString(i)+"  ",OUT,1);
+          }
       }
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_testbench_transition.cpp

@@ -62 +62 @@
         if (_param._have_meta_predictor)
           {
+        _vhdl_testbench->add_input (PORT_READ( in_BRANCH_COMPLETE_VAL             [i]));
+        _vhdl_testbench->add_output(PORT_READ(out_BRANCH_COMPLETE_PREDICTOR_2_VAL [i]));
+
         _vhdl_testbench->add_input (PORT_READ( in_BRANCH_COMPLETE_PREDICTOR_0_ACK [i]));
         _vhdl_testbench->add_input (PORT_READ( in_BRANCH_COMPLETE_PREDICTOR_1_ACK [i]));
@@ -84 +87 @@
         _vhdl_testbench->add_output(PORT_READ(out_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY [i]));
 
-        _vhdl_testbench->add_input (PORT_READ( in_BRANCH_COMPLETE_HISTORY [i]));
+        _vhdl_testbench->add_input (PORT_READ( in_BRANCH_COMPLETE_HISTORY   [i]));
+        if (_param._have_meta_predictor)
+          {
+        _vhdl_testbench->add_input (PORT_READ( in_BRANCH_COMPLETE_DIRECTION [i]));
+        _vhdl_testbench->add_output(PORT_READ(out_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION [i]));
+          }
       }
     

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/src/Parameters.cpp

@@ -53 +53 @@
     _size_history                       (_predictor_0_bht_size_shifter + _predictor_0_pht_size_counter +
                                          _predictor_1_bht_size_shifter + _predictor_1_pht_size_counter +
-                                         _predictor_2_bht_size_shifter + _predictor_2_pht_size_counter )
+                                         _predictor_2_bht_size_shifter + _predictor_2_pht_size_counter ),
+
+    _shift_0                            (0),
+    _shift_1                            (_shift_0 + _predictor_0_bht_size_shifter),
+    _shift_2                            (_shift_1 + _predictor_0_pht_size_counter),
+    _shift_3                            (_shift_2 + _predictor_1_bht_size_shifter),
+    _shift_4                            (_shift_3 + _predictor_1_pht_size_counter),
+    _shift_5                            (_shift_4 + _predictor_2_bht_size_shifter),
+    _shift_6                            (_shift_5 + _predictor_2_pht_size_counter)
   {
     log_printf(FUNC,Meta_Predictor_Glue,"Parameters","Begin");
@@ -81 +89 @@
     _nb_branch_complete                 (param._nb_branch_complete                 ),
 
-    _size_history                       (param._size_history                       )
+    _size_history                       (param._size_history                       ),
+
+    _shift_0                            (param._shift_0                            ),
+    _shift_1                            (param._shift_1                            ),
+    _shift_2                            (param._shift_2                            ),
+    _shift_3                            (param._shift_3                            ),
+    _shift_4                            (param._shift_4                            ),
+    _shift_5                            (param._shift_5                            ),
+    _shift_6                            (param._shift_6                            )
+
   {
     log_printf(FUNC,Meta_Predictor_Glue,"Parameters","Begin");

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/configuration.cfg

@@ -1 +1 @@
 Two_Level_Branch_Predictor
 1       1       +1      # have_bht           
-6       8       +1      # bht_size_shifter   
-64      64      *2      # bht_nb_shifter     
-0       1       +1      # have_pht           
-4       4       +1      # pht_size_counter   
-256     512     *2      # pht_nb_counter     
-0       2       +1      # pht_size_address_share
+8       8       +1      # bht_size_shifter   
+512     512     *2      # bht_nb_shifter     
+1       1       +1      # have_pht           
+8       8       +1      # pht_size_counter   
+512     512     *2      # pht_nb_counter     
+2       2       +1      # pht_size_address_share
 16      16      +1      # size_address      
-1       1       +1      # nb_prediction     
-1       1       +1      # nb_branch_complete
+2       2       +1      # nb_prediction     
+2       2       +1      # nb_branch_complete

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/src/test.cpp

@@ -220 +220 @@
       cout << "{"+toString(static_cast<uint32_t>(sc_simulation_time()))+"} Predict          : bht_history " << bht_history << " - pht_history " << pht_history[bht_history] << endl; 
 
+
       // Ask a new prediction
       PREDICT_VAL                  [num_port_predict        ]->write(1);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h

@@ -51 +51 @@
   protected : const Parameters _param;
 //#ifdef STATISTICS
-//  protected : const morpheo::behavioural::Parameters_Statistics _param_statistics;
+//protected : const morpheo::behavioural::Parameters_Statistics _param_statistics;
 //#endif
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor.cpp

@@ -57 +57 @@
     allocation ();
 
+#if (defined(STATISTICS) || defined (VHDL_TESTBENCH))
     SC_METHOD (transition);
     dont_initialize ();
     sensitive_pos << *(in_CLOCK);
+#endif
 
 //     SC_METHOD (genMoore);