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

Timestamp:

May 12, 2010, 7:34:01 PM (14 years ago)

Author:

rosiere

Message:

1) add counters_t type for interface
2) fix in check load in load_store_unit
3) add parameters (but not yet implemented)
4) change environment and add script (distcc_env.sh ...)
5) add warning if an unser change rename flag with l.mtspr instruction
6) ...

Location:

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

Files:

• Debug_signal.cpp (modified) (1 diff)
• Interface.cpp (modified) (1 diff)
• Simulation.cpp (modified) (3 diffs)
• Simulation_test_end.cpp (modified) (1 diff)
• Stat.cpp (modified) (3 diffs)
• Stat_create_counters.cpp (added)

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

@@ -38 +38 @@
   void debug_signal::print (void)
   {
-    msg("List of access signal\n");
+    msgInformation("List of access signal\n");
     for (std::list<std::string>::iterator it = _signal_access.begin();
          it != _signal_access.end();
          ++ it)
       {
-        msg(" * %s\n",(*it).c_str());
+        msgInformation(" * %s\n",(*it).c_str());
       }
   }

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

@@ -77 +77 @@
         if ((_usage & USE_SYSTEMC) and 
             ((*it)->get_direction() == INTERNAL))
-          delete (*it)->get_sc_signal();
+          (*it)->dealloc();
         delete (*it);
       }

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

@@ -18 +18 @@
   double              _simulation_nb_instruction;
   std::vector<double> _simulation_nb_instruction_commited;
+  stop_type_t         _simulation_stop_type;
   bool                _simulation_file_with_date;
   bool                _simulation_file_with_pid ;
@@ -23 +24 @@
   Model               _model;
 
-  void simulation_init (double nb_cycle,
-                        double debug_nb_cycle,
-                        double nb_instruction,
-                        bool   file_with_date,
-                        bool   file_with_pid )
+  void simulation_init (double      nb_cycle,
+                        double      debug_nb_cycle,
+                        double      nb_instruction,
+                        stop_type_t stop_type,
+                        bool        file_with_date,
+                        bool        file_with_pid )
   {
     if (not simulation_initialized)
@@ -44 +46 @@
         _simulation_nb_instruction          = nb_instruction;
 //      _simulation_nb_instruction_commited = new std::vector<double>;
+        _simulation_stop_type               = stop_type;
         _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

@@ -35 +35 @@
       {
         end_inst = true;
+        std::vector<double>::iterator it=_simulation_nb_instruction_commited.begin();
 
-        std::vector<double>::iterator it=_simulation_nb_instruction_commited.begin();
-        
-        // Scan all context and test if all can finish
-        while (end_inst and it!=_simulation_nb_instruction_commited.end())
+        switch (_simulation_stop_type)
           {
-            end_inst &= (_simulation_nb_instruction <= *it);
-            it ++;
+          case ALL_THREAD :
+            {
+              double sum_inst = 0;
+
+              // Scan all context and test if all can finish
+              while (it!=_simulation_nb_instruction_commited.end())
+                {
+                  sum_inst += *it;
+                  it ++;
+                }
+              
+              // Stop if sum of all instruction is higher of "simulation_nb_instruction"
+              end_inst &= (_simulation_nb_instruction <= sum_inst);
+
+              break;
+            }
+          case EACH_THREAD_AND_CONTINUE :
+          case EACH_THREAD_AND_STOP :
+            {
+              // Scan all context and test if all can finish
+              while (end_inst and it!=_simulation_nb_instruction_commited.end())
+                {
+
+                  // Stop if all thread have executed more that "simulation_nb_instruction" instructions.
+                  end_inst &= (_simulation_nb_instruction <= *it);
+                  it ++;
+                }
+              break;
+            }
           }
       }

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

@@ -14 +14 @@
     _save_periodic         (_period>0)
   {
+    _generate_file = true;
+
     _list_operand  = new std::map<std::string, var_t>;
     _list_expr     = new std::list<expr_t>;
     _list_stat     = new std::list<Stat *>;
+    _list_counters = new std::list<counters_t *>;
 
     _cycle         = create_variable("cycle");
 //  _cycle         = create_counter("cycle","","");
     *_cycle        = 0; // for the first period
-
-    _generate_file = true;
   }
 
@@ -35 +36 @@
     _save_periodic         (period>0)
   {
+    _generate_file = true;
+
     _list_operand  = new std::map<std::string, var_t>;
     _list_expr     = new std::list<expr_t>;
     _list_stat     = new std::list<Stat *>;
+    _list_counters = new std::list<counters_t *>;
 
     _cycle         = create_variable("cycle");
 //  _cycle         = create_counter("cycle","","");
     *_cycle        = 0; // for the first period
-
-    _generate_file = true;
   }
 
@@ -68 +70 @@
       }
     delete _list_expr;
+
+    // parcourir la liste et desallouer les arbres
+    for (std::list<counters_t*>::iterator i=_list_counters->begin();
+         i!= _list_counters->end();
+         ++i)
+      {
+        delete *i;
+      }
+    delete _list_counters;
+
     delete _list_stat;
   }