Changeset 124 for trunk/IPs/systemC/processor/Morpheo/Behavioural/src

Timestamp:

Jun 17, 2009, 2:11:25 PM (15 years ago)

Author:

rosiere

Message:

1) Add test and configuration
2) Fix Bug
3) Add log file in load store unit
4) Fix Bug in environment

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/src

Files:

• Component_generate_file.cpp (modified) (1 diff)
• Simulation.cpp (modified) (2 diffs)
• Simulation_test_end.cpp (modified) (2 diffs)
• Stat.cpp (modified) (2 diffs)
• Stat_end_cycle.cpp (modified) (1 diff)
• Stat_generate_file.cpp (modified) (1 diff)
• Stat_reset.cpp (added)
• Stat_test_and_save.cpp (modified) (1 diff)
• XML.cpp (modified) (1 diff)
• XML_generate_file.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Component_generate_file.cpp

@@ -25 +25 @@
         XML xml = toXML();
 
-        xml.filename_extension (".pos");
+        xml.filename_extension ("pos");
         
         xml.generate_file(MORPHEO_POSITION,"ISO-8859-1");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Simulation.cpp

@@ -14 +14 @@
 
   static bool          simulation_initialized;
+  bool                _simulation_stop_exception;
   double              _simulation_nb_cycle;
   double              _simulation_nb_instruction;
   std::vector<double> _simulation_nb_instruction_commited;
+  bool                _simulation_file_with_date;
+  bool                _simulation_file_with_pid ;
+
   Model               _model;
 
   void simulation_init (double nb_cycle,
-                        double nb_instruction)
+                        double debug_nb_cycle,
+                        double nb_instruction,
+                        bool   file_with_date,
+                        bool   file_with_pid )
   {
     if (not simulation_initialized)
       {
-        _simulation_nb_cycle                = nb_cycle;
+        if (debug_nb_cycle == 0)
+          {
+            _simulation_nb_cycle                = nb_cycle;
+            _simulation_stop_exception          = false;
+          }
+        else
+          {
+            _simulation_nb_cycle                = (debug_nb_cycle<nb_cycle)?debug_nb_cycle:nb_cycle;
+            _simulation_stop_exception          = (debug_nb_cycle<nb_cycle);
+          }
+
         _simulation_nb_instruction          = nb_instruction;
 //      _simulation_nb_instruction_commited = new std::vector<double>;
+        _simulation_file_with_date          = file_with_date;
+        _simulation_file_with_pid           = file_with_pid ;
 
         simulation_initialized = true;
@@ -34 +53 @@
         msg_printf(WARNING,_("Multi instance of Morpheo : stop condition, take the highest."));
 
-        if (_simulation_nb_cycle < nb_cycle)
-          _simulation_nb_cycle = nb_cycle;
+        if (//(_simulation_nb_cycle == 0) or
+            (_simulation_nb_cycle < debug_nb_cycle))
+          {
+            _simulation_nb_cycle       = debug_nb_cycle;
+            _simulation_stop_exception = true;
+          }
 
-        if (_simulation_nb_instruction < nb_instruction)
+        if (//(_simulation_nb_cycle == 0) or
+            (_simulation_nb_cycle < nb_cycle))
+          {
+            _simulation_nb_cycle       = nb_cycle;
+            _simulation_stop_exception = false;
+          }
+        
+        if (//(_simulation_nb_instruction == 0) or
+            (_simulation_nb_instruction < nb_instruction))
           _simulation_nb_instruction = nb_instruction;
+
+        _simulation_file_with_date          |= file_with_date;
+        _simulation_file_with_pid           |= file_with_pid ;
       }
   }

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Simulation_test_end.cpp

@@ -9 +9 @@
 #include "Behavioural/include/Simulation.h"
 #include "Common/include/Systemc.h"
+#include "Common/include/ErrorMorpheo.h"
 
 namespace morpheo              {
@@ -47 +48 @@
       end_inst = true;
     
-    return end_cycle and end_inst;
+    if (end_cycle and _simulation_stop_exception)
+      {
+        throw ErrorMorpheo(_("Maximal cycles Reached"));
+        return false;
+      }
+    else
+      return end_cycle and end_inst;
   }
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat.cpp

@@ -19 +19 @@
 
     _cycle         = create_variable("cycle");
+//  _cycle         = create_counter("cycle","","");
     *_cycle        = 0; // for the first period
 
@@ -39 +40 @@
 
     _cycle         = create_variable("cycle");
+//  _cycle         = create_counter("cycle","","");
     *_cycle        = 0; // for the first period
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_end_cycle.cpp

@@ -17 +17 @@
         test_and_save(false);
       }
+    else
+      if ((_cycle_sum+1) == _nb_cycle_before_begin)
+        {
+          // Init counter
+          reset (false);
+        }
   }
 };  

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_generate_file.cpp

@@ -30 +30 @@
     xml->balise_close();
 
-    xml->filename_extension (".stat");
+    xml->filename_extension ("stat");
     xml->generate_file(MORPHEO_STATISTICS);
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_test_and_save.cpp

@@ -9 +9 @@
       {
         eval_exprs(false); // evalue les expression non periodique au cycle
-        
-        for (std::map<std::string, var_t>::iterator i=_list_operand->begin();
-             i!= _list_operand->end();
-             ++i)
-          {
-            // save and reset !
-            i->second.save_counter.push_back(*(i->second.counter));
-            *(i->second.counter) = 0;
-          }
+
+        reset (true);
       }
   }

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/XML.cpp

@@ -17 +17 @@
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    _filename_extension=".xml";
+    _filename_extension="xml";
     log_printf(FUNC,Behavioural,FUNCTION,"End");
   };

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/XML_generate_file.cpp

@@ -8 +8 @@
 #include "Behavioural/include/XML.h"
 #include "Common/include/ErrorMorpheo.h"
+#include "Common/include/Filename.h"
 #include <fstream>
 
@@ -21 +22 @@
     header (encoding);
 
-    std::string filename = dirname + "/" + _name + _filename_extension;
+    std::string filename = morpheo::filename(dirname,
+                                             _name,
+                                             "",
+                                             _filename_extension,
+                                             _simulation_file_with_date,
+                                             _simulation_file_with_pid ,
+                                             true);
 
     msg_printf(INFORMATION,_("Generate file \"%s\"."),filename.c_str());