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

Timestamp:

Jul 17, 2007, 4:47:56 PM (17 years ago)

Author:

rosiere

Message:

Modification des classes d'encapsulation des interfaces.
Stable sur tous les composants actuels

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/src/test.cpp (modified) (8 diffs)

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

@@ -10 +10 @@
 
 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h"
-#include "Include/Test.h"
-#include "Include/BitManipulation.h"
+#include "Common/include/Test.h"
+#include "Common/include/BitManipulation.h"
 void test (string name,
            morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters param)
@@ -132 +132 @@
   sc_start(0);
 
+  NRESET->write(0);
+  sc_start(5);
+  NRESET->write(1);
+
   for (uint32_t i=0; i<param._nb_prediction; i++)
     PREDICT_VAL                  [i]->write(0);
@@ -156 +160 @@
       uint32_t nb_reg_by_group = (1<<(param._pht_size_address-size_address_shift));
 
+//       cout << "pht_size_address           : " << param._pht_size_address << endl;
+//       cout << "size_address_shift         : " << size_address_shift << endl;
+//       cout << "nb_group                   : " << nb_group           << endl;
+//       cout << "nb_reg_by_group            : " << nb_reg_by_group    << endl;
+
       cout << "{"+toString(static_cast<uint32_t>(sc_simulation_time()))+"} Init pht" << endl;
       
@@ -168 +177 @@
           for (uint32_t j=0; j<nb_reg_by_group; j++)
             {
+              cout << "j : " << j << " on " << nb_reg_by_group << endl;
               BRANCH_COMPLETE_ADDRESS [num_port_branch_complete]->write(j);
-              
+
               sc_start(1);
 
               // wait ackwolegde
               while (BRANCH_COMPLETE_ACK [num_port_branch_complete] -> read() == 0)
-                sc_start(1);
+                {
+                  sc_start(1);
+                }
             }
         }
@@ -195 +207 @@
       // wait ackwolegde
       while (BRANCH_COMPLETE_ACK [num_port_branch_complete] -> read() == 0)
-        sc_start(1);
+        {
+          sc_start(1);
+        }
     }
 
@@ -225 +239 @@
       // wait ackwolegde
       while (PREDICT_ACK [num_port_predict] -> read() == 0)
-        sc_start(1);
+        {
+          sc_start(1);
+        }
       PREDICT_ACK                  [num_port_predict        ]->write(0);
 
@@ -231 +247 @@
 
       // Test
+      cout << "{"+toString(static_cast<uint32_t>(sc_simulation_time()))+"} Predict (Test)   : " << endl; 
       if (param._have_bht)
-      TEST(Tbht_history_t,bht_history             ,PREDICT_BHT_HISTORY[num_port_predict]->read());
+        {
+          cout << "\tbht_history " << PREDICT_BHT_HISTORY[num_port_predict]->read() << endl;
+          TEST(Tbht_history_t,bht_history             ,PREDICT_BHT_HISTORY[num_port_predict]->read());
+        }
       if (param._have_pht)
-      TEST(Tpht_history_t,pht_history[bht_history],PREDICT_PHT_HISTORY[num_port_predict]->read());
+        {
+          cout << "\tpht_history " << PREDICT_PHT_HISTORY[num_port_predict]->read() << endl;
+          TEST(Tpht_history_t,pht_history[bht_history],PREDICT_PHT_HISTORY[num_port_predict]->read());
+        }
 
       // update
@@ -267 +290 @@
       // wait ackwolegde
       while (BRANCH_COMPLETE_ACK [num_port_branch_complete] -> read() == 0)
-        sc_start(1);
-
+        {
+          sc_start(1);
+        }
       BRANCH_COMPLETE_VAL          [num_port_branch_complete]->write(0);
     }