Changeset 138 for trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Simulation_test_end.cpp

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) ...

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Simulation_test_end.cpp (modified) (1 diff)

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;
+            }
           }
       }