Changeset 15 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src

Timestamp:

Apr 5, 2007, 4:17:30 PM (17 years ago)

Author:

rosiere

Message:

Interface normalisé
Début du banc de registres multi niveaux

Location:

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

Files:

• Branch_History_Table.cpp (modified) (1 diff)
• Branch_History_Table_allocation.cpp (modified) (4 diffs)
• Branch_History_Table_deallocation.cpp (modified) (1 diff)
• Branch_History_Table_vhdl_body.cpp (modified) (3 diffs)
• Branch_History_Table_vhdl_port.cpp (modified) (1 diff)
• Branch_History_Table_vhdl_testbench_port.cpp (modified) (1 diff)
• Branch_History_Table_vhdl_testbench_transition.cpp (modified) (2 diffs)
• Parameters.cpp (modified) (2 diffs)

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

@@ -56 +56 @@
     allocation ();
 
-    // Constant
-    for (uint32_t i=0; i<_param._nb_prediction     ; i++)
-      PORT_WRITE(out_PREDICT_ACK         [i],1);
-    for (uint32_t i=0; i<_param._nb_branch_complete; i++)
-      PORT_WRITE(out_BRANCH_COMPLETE_ACK [i],1);
+//     // Constant
+//     for (uint32_t i=0; i<_param._nb_prediction     ; i++)
+//       PORT_WRITE(out_PREDICT_ACK         [i],1);
+//     for (uint32_t i=0; i<_param._nb_branch_complete; i++)
+//       PORT_WRITE(out_BRANCH_COMPLETE_ACK [i],1);
 
 #if (defined(STATISTICS) || defined (VHDL_TESTBENCH))

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

@@ -23 +23 @@
 
      in_CLOCK           = new SC_CLOCK           ("in_CLOCK");
+     in_NRESET          = new SC_IN (Tcontrol_t) ("in_NRESET");
 
      in_PREDICT_VAL     = new SC_IN (Tcontrol_t) * [_param._nb_prediction];
@@ -102 +103 @@
     name_component = _name+"_RegisterFile";
     
-    component_RegisterFile = new morpheo::behavioural::generic::registerfile::RegisterFile (name_component.c_str(),
+    component_RegisterFile = new morpheo::behavioural::generic::registerfile::registerfile_monolithic::RegisterFile_Monolithic(name_component.c_str(),
 #ifdef STATISTICS
                                                                                             _param_statistics            ,
@@ -109 +110 @@
      
     // Instantiation
-    (*(component_RegisterFile->in_CLOCK))        (*(in_CLOCK));
+    (*(component_RegisterFile->in_CLOCK ))       (*(in_CLOCK ));
+    (*(component_RegisterFile->in_NRESET))       (*(in_NRESET));
     
     for (uint32_t i=0; i<_param._nb_prediction; i++)
       {
-        (*(component_RegisterFile-> in_READ_ENABLE   [i])) (*( in_PREDICT_VAL      [i]));
+        (*(component_RegisterFile-> in_READ_VAL      [i])) (*( in_PREDICT_VAL      [i]));
+        (*(component_RegisterFile->out_READ_ACK      [i])) (*(out_PREDICT_ACK      [i]));
         (*(component_RegisterFile-> in_READ_ADDRESS  [i])) (*( in_PREDICT_ADDRESS  [i]));
         (*(component_RegisterFile->out_READ_DATA     [i])) (*(out_PREDICT_HISTORY  [i]));    
@@ -120 +123 @@
     for (uint32_t i=0; i<_param._nb_branch_complete; i++)
       {
-        (*(component_RegisterFile-> in_WRITE_ENABLE  [i])) (*(    in_BRANCH_COMPLETE_VAL      [i]));
+        (*(component_RegisterFile-> in_WRITE_VAL     [i])) (*(    in_BRANCH_COMPLETE_VAL      [i]));
+        (*(component_RegisterFile->out_WRITE_ACK     [i])) (*(   out_BRANCH_COMPLETE_ACK      [i]));
         (*(component_RegisterFile-> in_WRITE_ADDRESS [i])) (*(    in_BRANCH_COMPLETE_ADDRESS  [i]));
         (*(component_RegisterFile-> in_WRITE_DATA    [i])) (*(signal_BRANCH_COMPLETE_HISTORY  [i]));    

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

@@ -20 +20 @@
   {
     delete in_CLOCK;
+    delete in_NRESET;
 
     for (uint32_t i=0; i<_param._nb_prediction; i++)

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

@@ -20 +20 @@
   void Branch_History_Table::vhdl_body (Vhdl & vhdl)
   {
-    vhdl.set_body ("-- Output : always at '1'");
-    for (uint32_t i=0; i<_param._nb_branch_complete; i++)
-      vhdl.set_body ("out_BRANCH_COMPLETE_ACK_"+toString(i)+" <= '1';");
-    for (uint32_t i=0; i<_param._nb_prediction     ; i++)
-      vhdl.set_body ("out_PREDICT_ACK_"+toString(i)+"         <= '1';");
-    vhdl.set_body ("");
+//     vhdl.set_body ("-- Output : always at '1'");
+//     for (uint32_t i=0; i<_param._nb_branch_complete; i++)
+//       vhdl.set_body ("out_BRANCH_COMPLETE_ACK_"+toString(i)+" <= '1';");
+//     for (uint32_t i=0; i<_param._nb_prediction     ; i++)
+//       vhdl.set_body ("out_PREDICT_ACK_"+toString(i)+"         <= '1';");
+//     vhdl.set_body ("");
 
     list<string> list_port_map;
@@ -40 +40 @@
     list_port_map.clear();
     vhdl.set_body_component_port_map (list_port_map,"in_CLOCK","in_CLOCK");
+    vhdl.set_body_component_port_map (list_port_map,"in_NRESET","in_NRESET");
+
     for (uint32_t i=0; i<_param._nb_prediction; i++)
       {
-        vhdl.set_body_component_port_map (list_port_map," in_READ_ENABLE_"+toString(i)+"  "," in_PREDICT_VAL_"+toString(i));
+        vhdl.set_body_component_port_map (list_port_map," in_READ_VAL_"+toString(i)+"     "," in_PREDICT_VAL_"+toString(i));
+        vhdl.set_body_component_port_map (list_port_map,"out_READ_ACK_"+toString(i)+"     ","out_PREDICT_ACK_"+toString(i));
         vhdl.set_body_component_port_map (list_port_map," in_READ_ADDRESS_"+toString(i)+" "," in_PREDICT_ADDRESS_"+toString(i));
         vhdl.set_body_component_port_map (list_port_map,"out_READ_DATA_"+toString(i)+"    ","out_PREDICT_HISTORY_"+toString(i));    
@@ -49 +52 @@
     for (uint32_t i=0; i<_param._nb_branch_complete; i++)
       {
-        vhdl.set_body_component_port_map (list_port_map," in_WRITE_ENABLE_"+toString(i)+" ","    in_BRANCH_COMPLETE_VAL_"+toString(i)+"");
+        vhdl.set_body_component_port_map (list_port_map," in_WRITE_VAL_"+toString(i)+"    ","    in_BRANCH_COMPLETE_VAL_"+toString(i)+"");
+        vhdl.set_body_component_port_map (list_port_map,"out_WRITE_ACK_"+toString(i)+"    ","   out_BRANCH_COMPLETE_ACK_"+toString(i)+"");
         vhdl.set_body_component_port_map (list_port_map," in_WRITE_ADDRESS_"+toString(i)+"","    in_BRANCH_COMPLETE_ADDRESS_"+toString(i));
         vhdl.set_body_component_port_map (list_port_map," in_WRITE_DATA_"+toString(i)+"   ","signal_BRANCH_COMPLETE_HISTORY_"+toString(i));

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

@@ -21 +21 @@
   {
     vhdl.set_port (" in_CLOCK" , IN, 1);
+    vhdl.set_port (" in_NRESET", IN, 1);
     
     for (uint32_t i=0; i<_param._nb_prediction; i++)

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

@@ -19 +19 @@
   void Branch_History_Table::vhdl_testbench_port (void)
   {
+    _vhdl_testbench->set_port (" in_NRESET", IN, 1);
     for (uint32_t i=0; i<_param._nb_prediction; i++)
       {

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

@@ -25 +25 @@
 #endif    
 
+    _vhdl_testbench->add_input  (PORT_READ( in_NRESET));
+
     for (uint32_t i=0; i<_param._nb_prediction; i++)
       {
         _vhdl_testbench->add_input  (PORT_READ( in_PREDICT_VAL     [i]));
-        _vhdl_testbench->add_output (PORT_READ(out_PREDICT_ACK     [i]));
+        _vhdl_testbench->add_output (PORT_READ(component_RegisterFile->out_READ_ACK  [i]));
         _vhdl_testbench->add_input  (PORT_READ( in_PREDICT_ADDRESS [i]));
         _vhdl_testbench->add_output (PORT_READ(component_RegisterFile->out_READ_DATA [i]));
@@ -37 +39 @@
        {
          _vhdl_testbench->add_input  (PORT_READ( in_BRANCH_COMPLETE_VAL     [i]));
-         _vhdl_testbench->add_output (PORT_READ(out_BRANCH_COMPLETE_ACK     [i]));
+         _vhdl_testbench->add_output (PORT_READ(component_RegisterFile->out_WRITE_ACK [i]));
          _vhdl_testbench->add_input  (PORT_READ( in_BRANCH_COMPLETE_ADDRESS [i]));
          _vhdl_testbench->add_input  (PORT_READ( in_BRANCH_COMPLETE_HISTORY [i]));

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

@@ -32 +32 @@
                                                                              morpheo::behavioural::generic::shifter::internal_left_shift,
                                                                              morpheo::behavioural::generic::shifter::external_completion),
-    _param_registerfile = new morpheo::behavioural::generic::registerfile::Parameters (nb_prediction      ,
-                                                                                       nb_branch_complete ,
-                                                                                       nb_shifter         ,
-                                                                                       size_shifter       );
+    _param_registerfile = new morpheo::behavioural::generic::registerfile::registerfile_monolithic::Parameters (nb_prediction      ,
+                                                                                                                nb_branch_complete ,
+                                                                                                                nb_shifter         ,
+                                                                                                                size_shifter       );
     
     test();
@@ -54 +54 @@
                                                                              true),
 
-    _param_registerfile = new morpheo::behavioural::generic::registerfile::Parameters (param._nb_prediction      ,
-                                                                                       param._nb_branch_complete ,
-                                                                                       param._nb_shifter         ,
-                                                                                       param._size_shifter       );
+    _param_registerfile = new morpheo::behavioural::generic::registerfile::registerfile_monolithic::Parameters (param._nb_prediction      ,
+                                                                                                                param._nb_branch_complete ,
+                                                                                                                param._nb_shifter         ,
+                                                                                                                param._size_shifter       );