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

Timestamp:

Dec 19, 2008, 4:34:00 PM (16 years ago)

Author:

rosiere

Message:

1) Update Prediction Table : statistics
2) Size instruction address on 30 bits
3) Change Log File
4) Add debug_level in simulation configuration file

File:

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

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

@@ -21 +21 @@
     // Common
     //-----------------------------------------------------
-    log_printf(INFO,Configuration,FUNCTION,_("COMMON"));
+  //log_printf(INFO,Configuration,FUNCTION,_("COMMON"));
 
     _param->_size_general_data   = fromString<uint32_t>(getParam("size_data"          , ""));
@@ -46 +46 @@
     ALLOC1(_param->_ras_size_queue   ,uint32_t,_param->_nb_thread);
     ALLOC1(_param->_upt_size_queue   ,uint32_t,_param->_nb_thread);
+    ALLOC1(_param->_ufpt_size_queue  ,uint32_t,_param->_nb_thread);
     
     for (uint32_t i=0; i<_param->_nb_thread; ++i)
       {
-        log_printf(INFO,Configuration,FUNCTION,_("THREAD [%d]"),i);
+      //log_printf(INFO,Configuration,FUNCTION,_("THREAD [%d]"),i);
 
         _param->_size_ifetch_queue [i] = fromString<uint32_t>(getParam("size_ifetch_queue", "thread",toString(i).c_str(),""));
@@ -55 +56 @@
         _param->_ras_size_queue    [i] = fromString<uint32_t>(getParam("ras_size_queue"   , "thread",toString(i).c_str(),""));
         _param->_upt_size_queue    [i] = fromString<uint32_t>(getParam("upt_size_queue"   , "thread",toString(i).c_str(),""));
+        _param->_ufpt_size_queue   [i] = fromString<uint32_t>(getParam("ufpt_size_queue"  , "thread",toString(i).c_str(),""));
 
         // just read !!!
@@ -85 +87 @@
     for (uint32_t i=0; i<_param->_nb_decod_bloc; ++i)
       {
-        log_printf(INFO,Configuration,FUNCTION,_("DECOD_BLOC [%d]"),i);
+      //log_printf(INFO,Configuration,FUNCTION,_("DECOD_BLOC [%d]"),i);
 
         _param->_size_decod_queue              [i] = fromString<uint32_t         > (getParam("size_decod_queue"             , "decod_bloc",toString(i).c_str(),""));
@@ -111 +113 @@
     for (uint32_t i=0; i<_param->_nb_rename_bloc; ++i)
       {
-        log_printf(INFO,Configuration,FUNCTION,_("RENAME_BLOC [%d]"),i);
+      //log_printf(INFO,Configuration,FUNCTION,_("RENAME_BLOC [%d]"),i);
 
         _param->_nb_inst_insert                    [i] = fromString<uint32_t         > (getParam("nb_inst_insert"                   , "rename_bloc",toString(i).c_str(),""));
@@ -134 +136 @@
     for (uint32_t i=0; i<_param->_nb_read_bloc; ++i)
       {
-        log_printf(INFO,Configuration,FUNCTION,_("READ_BLOC [%d]"),i);
+      //log_printf(INFO,Configuration,FUNCTION,_("READ_BLOC [%d]"),i);
 
         _param->_size_read_queue                    [i] = fromString<uint32_t> (getParam("size_read_queue"                   ,"read_bloc",toString(i).c_str(),""));
@@ -150 +152 @@
     for (uint32_t i=0; i<_param->_nb_write_bloc; ++i)
       {
-        log_printf(INFO,Configuration,FUNCTION,_("WRITE_BLOC [%d]"),i);
+      //log_printf(INFO,Configuration,FUNCTION,_("WRITE_BLOC [%d]"),i);
 
         _param->_size_write_queue   [i] = fromString<uint32_t> (getParam("size_write_queue"  ,"write_bloc",toString(i).c_str(),""));
@@ -171 +173 @@
     for (uint32_t i=0; i<_param->_nb_load_store_unit; ++i)
       {
-        log_printf(INFO,Configuration,FUNCTION,_("LOAD_STORE_UNIT [%d]"),i);
+      //log_printf(INFO,Configuration,FUNCTION,_("LOAD_STORE_UNIT [%d]"),i);
 
         _param->_size_store_queue              [i] = fromString<uint32_t> (getParam("size_store_queue"             ,"load_store_unit",toString(i).c_str(),""));
@@ -192 +194 @@
     for (uint32_t i=0; i<_param->_nb_functionnal_unit; ++i)
       {
-        log_printf(INFO,Configuration,FUNCTION,_("FUNCTIONNAL_UNIT [%d]"),i);
+      //log_printf(INFO,Configuration,FUNCTION,_("FUNCTIONNAL_UNIT [%d]"),i);
 
         _param->_nb_inst_functionnal_unit [i] = fromString<uint32_t> (getParam("nb_inst_functionnal_unit","functionnal_unit",toString(i).c_str(),""));
@@ -243 +245 @@
     //-----------------------------------------------------
 
-    log_printf(INFO,Configuration,FUNCTION,_("ICACHE_PORT"));
+  //log_printf(INFO,Configuration,FUNCTION,_("ICACHE_PORT"));
 
     _param->_nb_icache_port               = fromString<uint32_t         >(getParam("nb_icache_port"            , ""));
@@ -252 +254 @@
     // dcache_port
     //-----------------------------------------------------
-    log_printf(INFO,Configuration,FUNCTION,_("DCACHE_PORT"));
+  //log_printf(INFO,Configuration,FUNCTION,_("DCACHE_PORT"));
 
     _param->_nb_dcache_port               = fromString<uint32_t         >(getParam("nb_dcache_port"            , ""));
@@ -282 +284 @@
     for (uint32_t i=0; i<_param->_nb_front_end; ++i)
       {
-        log_printf(INFO,Configuration,FUNCTION,_("FRONT_END [%d]"),i);
+      //log_printf(INFO,Configuration,FUNCTION,_("FRONT_END [%d]"),i);
 
         _param->_nb_context                    [i] = fromString<uint32_t    >(getParam("nb_context"                ,"front_end",toString(i).c_str(), ""));
@@ -306 +308 @@
         for (uint32_t j=0; j<3; ++j)
           {
-            log_printf(INFO,Configuration,FUNCTION,_("PREDICTOR [%d][%d]"),i,j);
+          //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(), ""));
@@ -343 +345 @@
     for (uint32_t i=0; i<_param->_nb_ooo_engine; ++i)
       {
-        log_printf(INFO,Configuration,FUNCTION,_("OOO_ENGINE [%d]"),i);
+      //log_printf(INFO,Configuration,FUNCTION,_("OOO_ENGINE [%d]"),i);
 
         _param->_nb_rename_unit          [i] = fromString<uint32_t         >(getParam("nb_rename_unit"          ,"ooo_engine",toString(i).c_str(), ""));
@@ -383 +385 @@
     for (uint32_t i=0; i<_param->_nb_execute_loop; ++i)
       {
-        log_printf(INFO,Configuration,FUNCTION,_("EXECUTE_LOOP [%d]"),i);
+      //log_printf(INFO,Configuration,FUNCTION,_("EXECUTE_LOOP [%d]"),i);
 
         _param->_nb_read_unit                         [i] = fromString<uint32_t   >(getParam("nb_read_unit"                         ,"execute_loop",toString(i).c_str(), ""));
@@ -402 +404 @@
     //-----------------------------------------------------
 
-    log_printf(INFO,Configuration,FUNCTION,_("LINK"));
+  //log_printf(INFO,Configuration,FUNCTION,_("LINK"));
 
     _param->_dispatch_priority       = fromString<Tpriority_t      >(getParam("dispatch_priority"      , ""));