Changeset 146 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Instance_fromInternalStructure.cpp

Timestamp:

Feb 1, 2011, 9:57:54 PM (13 years ago)

Author:

rosiere

Message:

1) Integration of RegisterFile_Internal_Banked in RegisterFile?
2) Erase "read_write" interface in RegisterFile_Monolithic component
3) Add smith predictor parameters in Load_store_pointer_unit.
4) Fix not statistics flags

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Instance_fromInternalStructure.cpp (modified) (4 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Instance_fromInternalStructure.cpp

@@ -178 +178 @@
     // load_store_unit
     //-----------------------------------------------------
-    ALLOC1(_param->_size_store_queue                   ,uint32_t    ,_param->_nb_load_store_unit);
-    ALLOC1(_param->_size_load_queue                    ,uint32_t    ,_param->_nb_load_store_unit);
-    ALLOC1(_param->_size_speculative_access_queue      ,uint32_t    ,_param->_nb_load_store_unit);
-    ALLOC1(_param->_nb_store_queue_bank                ,uint32_t    ,_param->_nb_load_store_unit);
-    ALLOC1(_param->_nb_load_queue_bank                 ,uint32_t    ,_param->_nb_load_store_unit);
-    ALLOC1(_param->_nb_port_check                      ,uint32_t    ,_param->_nb_load_store_unit);
+    ALLOC1(_param->_size_store_queue                   ,uint32_t     ,_param->_nb_load_store_unit);
+    ALLOC1(_param->_size_load_queue                    ,uint32_t     ,_param->_nb_load_store_unit);
+    ALLOC1(_param->_size_speculative_access_queue      ,uint32_t     ,_param->_nb_load_store_unit);
+    ALLOC1(_param->_nb_store_queue_bank                ,uint32_t     ,_param->_nb_load_store_unit);
+    ALLOC1(_param->_nb_load_queue_bank                 ,uint32_t     ,_param->_nb_load_store_unit);
+    ALLOC1(_param->_nb_port_check                      ,uint32_t     ,_param->_nb_load_store_unit);
     ALLOC1(_param->_speculative_load                   ,core::multi_execute_loop::execute_loop::Tspeculative_load_t,_param->_nb_load_store_unit);
-    ALLOC1(_param->_speculative_commit_predictor_scheme,Tpredictor_t,_param->_nb_load_store_unit);
-    ALLOC2(_param->_lsu_pht_size_counter               ,uint32_t    ,_param->_nb_load_store_unit,1);
-    ALLOC2(_param->_lsu_pht_nb_counter                 ,uint32_t    ,_param->_nb_load_store_unit,1);
-    ALLOC1(_param->_nb_bypass_memory                   ,uint32_t    ,_param->_nb_load_store_unit);
-    ALLOC1(_param->_nb_cache_port                      ,uint32_t    ,_param->_nb_load_store_unit);
-    ALLOC1(_param->_nb_inst_memory                     ,uint32_t    ,_param->_nb_load_store_unit);
+    ALLOC1(_param->_speculative_commit_predictor_scheme,Tpredictor_t ,_param->_nb_load_store_unit);
+    ALLOC2(_param->_lsu_pht_size_counter               ,uint32_t     ,_param->_nb_load_store_unit,1);
+    ALLOC2(_param->_lsu_pht_nb_counter                 ,uint32_t     ,_param->_nb_load_store_unit,1);
+    ALLOC2(_param->_lsu_pht_scheme                     ,Tpht_scheme_t,_param->_nb_load_store_unit,1);
+    ALLOC1(_param->_nb_bypass_memory                   ,uint32_t     ,_param->_nb_load_store_unit);
+    ALLOC1(_param->_nb_cache_port                      ,uint32_t     ,_param->_nb_load_store_unit);
+    ALLOC1(_param->_nb_inst_memory                     ,uint32_t     ,_param->_nb_load_store_unit);
 
     for (uint32_t i=0; i<_param->_nb_load_store_unit; ++i)
@@ -220 +221 @@
           {
           //log_printf(INFO,Configuration,FUNCTION,_("PREDICTOR [%d][%d]"),i,j);
-        _param->_lsu_pht_size_counter             [i][j] = fromString<uint32_t    > (getParam("lsu_pht_size_counter"               ,"load_store_unit",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
-        _param->_lsu_pht_nb_counter               [i][j] = fromString<uint32_t    > (getParam("lsu_pht_nb_counter"                 ,"load_store_unit",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
+        _param->_lsu_pht_size_counter             [i][j] = fromString<uint32_t     > (getParam("lsu_pht_size_counter"               ,"load_store_unit",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
+        _param->_lsu_pht_nb_counter               [i][j] = fromString<uint32_t     > (getParam("lsu_pht_nb_counter"                 ,"load_store_unit",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
+        _param->_lsu_pht_scheme                   [i][j] = fromString<Tpht_scheme_t> (getParam("lsu_pht_scheme"                     ,"load_store_unit",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
           }
 
@@ -309 +311 @@
     // front_end
     //-----------------------------------------------------
-    ALLOC1(_param->_nb_context                    ,uint32_t    ,_param->_nb_front_end);
-    ALLOC1(_param->_nb_decod_unit                 ,uint32_t    ,_param->_nb_front_end);
-    ALLOC1(_param->_nb_inst_branch_predict        ,uint32_t    ,_param->_nb_front_end);
-    ALLOC1(_param->_nb_inst_branch_decod          ,uint32_t    ,_param->_nb_front_end);
-    ALLOC1(_param->_nb_inst_branch_update         ,uint32_t    ,_param->_nb_front_end);
-    ALLOC1(_param->_btb_size_queue                ,uint32_t    ,_param->_nb_front_end);
-    ALLOC1(_param->_btb_associativity             ,uint32_t    ,_param->_nb_front_end);
-    ALLOC1(_param->_btb_size_counter              ,uint32_t    ,_param->_nb_front_end);
-    ALLOC1(_param->_btb_victim_scheme             ,Tvictim_t   ,_param->_nb_front_end);
-    ALLOC1(_param->_dir_predictor_scheme          ,Tpredictor_t,_param->_nb_front_end);
-    ALLOC2(_param->_dir_have_bht                  ,bool        ,_param->_nb_front_end,3);
-    ALLOC2(_param->_dir_bht_size_shifter          ,uint32_t    ,_param->_nb_front_end,3);
-    ALLOC2(_param->_dir_bht_nb_shifter            ,uint32_t    ,_param->_nb_front_end,3);
-    ALLOC2(_param->_dir_have_pht                  ,bool        ,_param->_nb_front_end,3);
-    ALLOC2(_param->_dir_pht_size_counter          ,uint32_t    ,_param->_nb_front_end,3);
-    ALLOC2(_param->_dir_pht_nb_counter            ,uint32_t    ,_param->_nb_front_end,3);
-    ALLOC2(_param->_dir_pht_size_address_share    ,uint32_t    ,_param->_nb_front_end,3);
+    ALLOC1(_param->_nb_context                    ,uint32_t     ,_param->_nb_front_end);
+    ALLOC1(_param->_nb_decod_unit                 ,uint32_t     ,_param->_nb_front_end);
+    ALLOC1(_param->_nb_inst_branch_predict        ,uint32_t     ,_param->_nb_front_end);
+    ALLOC1(_param->_nb_inst_branch_decod          ,uint32_t     ,_param->_nb_front_end);
+    ALLOC1(_param->_nb_inst_branch_update         ,uint32_t     ,_param->_nb_front_end);
+    ALLOC1(_param->_btb_size_queue                ,uint32_t     ,_param->_nb_front_end);
+    ALLOC1(_param->_btb_associativity             ,uint32_t     ,_param->_nb_front_end);
+    ALLOC1(_param->_btb_size_counter              ,uint32_t     ,_param->_nb_front_end);
+    ALLOC1(_param->_btb_victim_scheme             ,Tvictim_t    ,_param->_nb_front_end);
+    ALLOC1(_param->_dir_predictor_scheme          ,Tpredictor_t ,_param->_nb_front_end);
+    ALLOC2(_param->_dir_have_bht                  ,bool         ,_param->_nb_front_end,3);
+    ALLOC2(_param->_dir_bht_size_shifter          ,uint32_t     ,_param->_nb_front_end,3);
+    ALLOC2(_param->_dir_bht_nb_shifter            ,uint32_t     ,_param->_nb_front_end,3);
+    ALLOC2(_param->_dir_have_pht                  ,bool         ,_param->_nb_front_end,3);
+    ALLOC2(_param->_dir_pht_size_counter          ,uint32_t     ,_param->_nb_front_end,3);
+    ALLOC2(_param->_dir_pht_nb_counter            ,uint32_t     ,_param->_nb_front_end,3);
+    ALLOC2(_param->_dir_pht_size_address_share    ,uint32_t     ,_param->_nb_front_end,3);
+    ALLOC2(_param->_dir_pht_scheme                ,Tpht_scheme_t,_param->_nb_front_end,3);
 
     for (uint32_t i=0; i<_param->_nb_front_end; ++i)
@@ -356 +359 @@
           //log_printf(INFO,Configuration,FUNCTION,_("PREDICTOR [%d][%d]"),i,j);
 
-        _param->_dir_have_bht               [i][j] = fromString<bool        >(getParam("dir_have_bht"              ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
-        _param->_dir_bht_size_shifter       [i][j] = fromString<uint32_t    >(getParam("dir_bht_size_shifter"      ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
-        _param->_dir_bht_nb_shifter         [i][j] = fromString<uint32_t    >(getParam("dir_bht_nb_shifter"        ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
-        _param->_dir_have_pht               [i][j] = fromString<bool        >(getParam("dir_have_pht"              ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
-        _param->_dir_pht_size_counter       [i][j] = fromString<uint32_t    >(getParam("dir_pht_size_counter"      ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
-        _param->_dir_pht_nb_counter         [i][j] = fromString<uint32_t    >(getParam("dir_pht_nb_counter"        ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
-        _param->_dir_pht_size_address_share [i][j] = fromString<uint32_t    >(getParam("dir_pht_size_address_share","front_end",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
+        _param->_dir_have_bht               [i][j] = fromString<bool         >(getParam("dir_have_bht"              ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
+        _param->_dir_bht_size_shifter       [i][j] = fromString<uint32_t     >(getParam("dir_bht_size_shifter"      ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
+        _param->_dir_bht_nb_shifter         [i][j] = fromString<uint32_t     >(getParam("dir_bht_nb_shifter"        ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
+        _param->_dir_have_pht               [i][j] = fromString<bool         >(getParam("dir_have_pht"              ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
+        _param->_dir_pht_size_counter       [i][j] = fromString<uint32_t     >(getParam("dir_pht_size_counter"      ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
+        _param->_dir_pht_nb_counter         [i][j] = fromString<uint32_t     >(getParam("dir_pht_nb_counter"        ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
+        _param->_dir_pht_size_address_share [i][j] = fromString<uint32_t     >(getParam("dir_pht_size_address_share","front_end",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
+        _param->_dir_pht_scheme             [i][j] = fromString<Tpht_scheme_t>(getParam("dir_pht_scheme"            ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), ""));
           }
       }