Changeset 136 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/src

Timestamp:

Oct 20, 2009, 8:52:15 PM (15 years ago)

Author:

rosiere

Message:

1) Add new algo in ifetch queue
2) Add Cancel bit
3) new config

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/src

Files:

• Front_end_allocation.cpp (modified) (2 diffs)
• Parameters.cpp (modified) (3 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/src/Front_end_allocation.cpp

@@ -449 +449 @@
         ////out_DECOD_CONTEXT_ID
 
-        COMPONENT_MAP(_component,src ,"out_DECOD_ADDRESS"                    ,dest, "in_IFETCH_"+toString(num_context)+"_ADDRESS"                    );
-        if (_param->_have_port_inst_ifetch_ptr)
-        COMPONENT_MAP(_component,src ,"out_DECOD_INST_IFETCH_PTR"            ,dest, "in_IFETCH_"+toString(num_context)+"_INST_IFETCH_PTR"            );
-        COMPONENT_MAP(_component,src ,"out_DECOD_BRANCH_STATE"               ,dest, "in_IFETCH_"+toString(num_context)+"_BRANCH_STATE"               );
-        if (_param->_have_port_depth)
-        COMPONENT_MAP(_component,src ,"out_DECOD_BRANCH_UPDATE_PREDICTION_ID",dest, "in_IFETCH_"+toString(num_context)+"_BRANCH_UPDATE_PREDICTION_ID");
-        COMPONENT_MAP(_component,src ,"out_DECOD_EXCEPTION"                  ,dest, "in_IFETCH_"+toString(num_context)+"_EXCEPTION"                  );
-
         for (uint32_t j=0; j<_param->_nb_inst_fetch [i];++j)
           {
@@ -471 +463 @@
             COMPONENT_MAP(_component,src ,"out_DECOD_" +toString(j)+                          "_INSTRUCTION",
                                      dest, "in_IFETCH_"+toString(num_context)+"_"+toString(j)+"_INSTRUCTION");
+
+            COMPONENT_MAP(_component,src ,"out_DECOD_" +toString(j)                          +"_ADDRESS",
+                                     dest, "in_IFETCH_"+toString(num_context)+"_"+toString(j)+"_ADDRESS");
+//          if (_param->_have_port_inst_ifetch_ptr)
+//          COMPONENT_MAP(_component,src ,"out_DECOD_" +toString(j)                          +"_INST_IFETCH_PTR",
+//                                   dest, "in_IFETCH_"+toString(num_context)+"_"+toString(j)+"_INST_IFETCH_PTR");
+            COMPONENT_MAP(_component,src ,"out_DECOD_" +toString(j)                          +"_BRANCH_STATE",
+                                     dest, "in_IFETCH_"+toString(num_context)+"_"+toString(j)+"_BRANCH_STATE");
+            if (_param->_have_port_depth)
+            COMPONENT_MAP(_component,src ,"out_DECOD_" +toString(j)                          +"_BRANCH_UPDATE_PREDICTION_ID",
+                                     dest, "in_IFETCH_"+toString(num_context)+"_"+toString(j)+"_BRANCH_UPDATE_PREDICTION_ID");
+            COMPONENT_MAP(_component,src ,"out_DECOD_" +toString(j)                          +"_EXCEPTION",
+                                     dest, "in_IFETCH_"+toString(num_context)+"_"+toString(j)+"_EXCEPTION");
+
+
           }
       }

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/src/Parameters.cpp

@@ -24 +24 @@
                           morpheo::behavioural::custom::custom_information_t (*get_custom_information) (void),
                           // ifetch_unit                                              
-                          uint32_t              * size_ifetch_queue                   ,
-                          uint32_t              * nb_inst_fetch                       ,
-                          bool                 ** instruction_implemeted              ,
-                          uint32_t              * link_context_to_decod_unit          ,
+                          uint32_t              * size_ifetch_queue                   ,//[nb_context]
+                          ifetch_unit::ifetch_queue::Tifetch_queue_scheme_t
+                                                * ifetch_queue_scheme                 ,//[nb_context]
+                          uint32_t              * nb_inst_fetch                       ,//[nb_context]
+                          bool                 ** instruction_implemeted              ,//[nb_context]
+                          uint32_t              * link_context_to_decod_unit          ,//[nb_context]
                           // decod_unit                                              
                           uint32_t              * size_decod_queue                    ,//[nb_decod_unit]
@@ -74 +76 @@
     _translate_num_context_to_num_thread = translate_num_context_to_num_thread ;
     _size_ifetch_queue                   = size_ifetch_queue                   ;
+    _ifetch_queue_scheme                 = ifetch_queue_scheme                 ;
     _nb_inst_fetch                       = nb_inst_fetch                       ;
     _instruction_implemeted              = instruction_implemeted              ;
@@ -125 +128 @@
       {
         _param_ifetch_unit [i] = new behavioural::core::multi_front_end::front_end::ifetch_unit::Parameters 
-          (_size_ifetch_queue [i]        ,
-           _nb_inst_fetch     [i]        ,
-           log2(_upt_size_queue[i])      ,
+          (_size_ifetch_queue  [i]        ,
+           _ifetch_queue_scheme[i]        ,
+           _nb_inst_fetch      [i]        ,
+           log2(_upt_size_queue[i])       ,
            size_instruction_address      );
       }