Changeset 134 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table

Timestamp:

Jul 15, 2009, 10:41:01 AM (15 years ago)

Author:

rosiere

Message:

1) valgrind fix
2) debug file on/off

Location:

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

Files:

• Update_Prediction_Table_allocation.cpp (modified) (1 diff)
• Update_Prediction_Table_deallocation.cpp (modified) (1 diff)
• Update_Prediction_Table_transition.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_allocation.cpp

@@ -248 +248 @@
 
 #if defined(DEBUG) and defined(DEBUG_Update_Prediction_Table) and (DEBUG_Update_Prediction_Table == true)
-    directory_init ();
-
-    branchement_log_file = new std::ofstream [_param->_nb_thread];
-    for (uint32_t i=0; i<_param->_nb_thread; ++i)
-      if (_param->_have_thread [i])
-        {
-          std::string filename = morpheo::filename(MORPHEO_LOG,
-                                                   "Branchement_prediction-thread_"+toString(i),
-                                                   "",
-                                                   "log",
-                                                   _simulation_file_with_date,
-                                                   _simulation_file_with_pid,
-                                                   true);
-          
-          branchement_log_file [i] .open(filename.c_str() ,std::ios::out | std::ios::trunc);
-        }
+    if (log_file_generate)
+      {
+        directory_init ();
+        
+        branchement_log_file = new std::ofstream [_param->_nb_thread];
+        for (uint32_t i=0; i<_param->_nb_thread; ++i)
+          if (_param->_have_thread [i])
+            {
+              std::string filename = morpheo::filename(MORPHEO_LOG,
+                                                       "Branchement_prediction-thread_"+toString(i),
+                                                       "",
+                                                       "log",
+                                                       _simulation_file_with_date,
+                                                       _simulation_file_with_pid,
+                                                       true);
+              
+              branchement_log_file [i] .open(filename.c_str() ,std::ios::out | std::ios::trunc);
+            }
+      }
 #endif
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_deallocation.cpp

@@ -172 +172 @@
 
 #if defined(DEBUG) and defined(DEBUG_Update_Prediction_Table) and (DEBUG_Update_Prediction_Table == true)
-    {
-      for (uint32_t i=0; i<_param->_nb_thread; ++i)
-        if (_param->_have_thread [i])
-          {
-            branchement_log_file [i].close();
-          }
-      delete [] branchement_log_file;
-    }
+    if (log_file_generate)
+      {
+        for (uint32_t i=0; i<_param->_nb_thread; ++i)
+          if (_param->_have_thread [i])
+            {
+              branchement_log_file [i].close();
+            }
+        delete [] branchement_log_file;
+      }
 #endif
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_transition.cpp

@@ -149 +149 @@
                     {
 #if defined(DEBUG) and defined(DEBUG_Update_Prediction_Table) and (DEBUG_Update_Prediction_Table == true)
-                      if (reg_UPDATE_PREDICTION_TABLE [i][bottom]._retire_ok)
-                        {
-                          uint32_t num_thread = _param->_translate_num_context_to_num_thread [i];
-                          branchement_log_file [num_thread] 
-                            << std::hex
-                            << "0x" << std::setfill('0') << std::setw(_param->_size_general_data/4) << reg_UPDATE_PREDICTION_TABLE [i][bottom]._address_src  << " "
-                            << "0x" << std::setfill('0') << std::setw(_param->_size_general_data/4) << reg_UPDATE_PREDICTION_TABLE [i][bottom]._address_dest << " "
-                            << std::dec
-                            <<         reg_UPDATE_PREDICTION_TABLE [i][bottom]._good_take         << " - "
-                            << "["  << simulation_cycle() << "] " << " "
-                            <<         reg_UPDATE_PREDICTION_TABLE [i][bottom]._miss_prediction   << " "
-                            <<         reg_UPDATE_PREDICTION_TABLE [i][bottom]._ifetch_prediction << " "
-                            << "("  << toString(reg_UPDATE_PREDICTION_TABLE [i][bottom]._condition) << ")"
-                            << std::endl;
-                        }
+                      if (log_file_generate)
+                        if (reg_UPDATE_PREDICTION_TABLE [i][bottom]._retire_ok)
+                          {
+                            uint32_t num_thread = _param->_translate_num_context_to_num_thread [i];
+                            branchement_log_file [num_thread] 
+                              << std::hex
+                              << "0x" << std::setfill('0') << std::setw(_param->_size_general_data/4) << reg_UPDATE_PREDICTION_TABLE [i][bottom]._address_src  << " "
+                              << "0x" << std::setfill('0') << std::setw(_param->_size_general_data/4) << reg_UPDATE_PREDICTION_TABLE [i][bottom]._address_dest << " "
+                              << std::dec
+                              <<         reg_UPDATE_PREDICTION_TABLE [i][bottom]._good_take         << " - "
+                              << "["  << simulation_cycle() << "] " << " "
+                              <<         reg_UPDATE_PREDICTION_TABLE [i][bottom]._miss_prediction   << " "
+                              <<         reg_UPDATE_PREDICTION_TABLE [i][bottom]._ifetch_prediction << " "
+                              << "("  << toString(reg_UPDATE_PREDICTION_TABLE [i][bottom]._condition) << ")"
+                              << std::endl;
+                          }
 #endif