Changeset 60 for sources/src/gen_code.h

Timestamp:

Feb 14, 2017, 11:30:19 AM (7 years ago)

Author:

meunier

Message:

• Intégration des modifications de Clément, qui a intégré la version parallélisée de systemcass faite par Manuel.

File:

• sources/src/gen_code.h (modified) (6 diffs)

sources/src/gen_code.h

@@ -21 +21 @@
 #include "process_dependency.h"
 
+#ifdef _OPENMP
+#include <omp.h>
+#endif
+
 //-------------------------------------------------------------------
 #ifdef __GNUC__
@@ -40 +44 @@
       method_process_list_t   &transition_list,
       method_process_list_t   &moore_list,
-      strong_component_list_t &mealy_list);
+      strong_component_list_t *mealy_list);
 
 extern void  gen_scheduling_code_for_static_func(
@@ -55 +59 @@
       method_process_list_t   &transition_list,
       method_process_list_t   &moore_list,
-      strong_component_list_t &strongcomponents);
+      strong_component_list_t *strongcomponents);
 
 /* function when any dynamic link is impossible */
@@ -81 +85 @@
 inline void internal_sc_cycle2() {
 #ifdef DUMP_STAGE
-    std::cerr << "begin of cycle #" << sc_simulation_time () << "\n";
-#endif
-    func_simulate_1_cycle();  
-    ++nb_cycles;
+#pragma omp master
+    {
+        std::cerr << "begin of cycle #" << sc_simulation_time() << "\n";
+    }
+#endif
+
+        func_simulate_1_cycle();
+
+        ++nb_cycles;
 #ifdef DUMP_STAGE
-    std::cerr << "end of cycle\n";
+#pragma omp master
+    {
+        std::cerr << "end of cycle\n";
+    }
 #endif
 }
 
-
 inline void internal_sc_cycle1(int number_of_cycles) {  
-    //while ((! have_to_stop) && (number_of_cycles != 0)) {
-    while (!((have_to_stop) || (number_of_cycles == 0))) {
-        trace_all(false);
-        internal_sc_cycle2();
-        trace_all(true);
-        number_of_cycles = (number_of_cycles < 0) ? number_of_cycles : number_of_cycles - 1;
+    extern unsigned long long busy_wait_f0, busy_wait_f1, busy_wait_up, busy_wait_ml;
+    extern unsigned long long last_wait_f0, last_wait_f1, last_wait_up, last_wait_ml;
+    extern unsigned int nb_func[2];
+#pragma omp threadprivate (busy_wait_f0, busy_wait_f1, busy_wait_up, busy_wait_ml, nb_func)
+#pragma omp threadprivate (last_wait_f0, last_wait_f1, last_wait_up, last_wait_ml)
+    extern unsigned int expected_globaltime;
+    extern volatile unsigned int globaltime;
+#pragma omp shared (globaltime)
+#pragma omp threadprivate (expected_globaltime)
+
+    extern unsigned int num_omp_threads;
+
+
+#pragma omp parallel 
+    {
+//        int cyclecount = number_of_cycles;
+        busy_wait_f0 = busy_wait_f1 = busy_wait_up = busy_wait_ml = total_assig = 0;
+        last_wait_f0 = last_wait_f1 = last_wait_up = last_wait_ml = 0;
+
+        expected_globaltime = 0;
+#pragma omp master
+        {
+            globaltime = 0;
+#ifdef _OPENMP
+            num_omp_threads = omp_get_num_threads();
+#else
+            num_omp_threads = 1;
+#endif
+        }
+
+#pragma omp barrier
+        // while (!((have_to_stop) | (cyclecount == 0))) {
+        while (!((have_to_stop) || (number_of_cycles == 0))) {
+#pragma omp master
+            {
+                trace_all(false);
+            }
+            internal_sc_cycle2();
+#pragma omp master
+            {
+                trace_all(true);
+            }
+            // cyclecount = (number_of_cycles < 0) ? number_of_cycles : cyclecount - 1;
+            number_of_cycles = (number_of_cycles < 0) ? number_of_cycles : number_of_cycles - 1;
+        }
+#pragma omp barrier
+#if 0
+#ifdef _OPENMP
+#pragma omp critical
+        {
+            std::cerr << "Thread " << omp_get_thread_num() << " busy_wait " <<
+                busy_wait_f0 << " " << busy_wait_up << " " <<
+                busy_wait_f1 << " " << busy_wait_ml << std::endl;
+        }
+#pragma omp critical
+        {
+            std::cerr << "Thread " << omp_get_thread_num() << " last_wait " <<
+                last_wait_f0 << " " << last_wait_up << " " <<
+                last_wait_f1 << " " << last_wait_ml << std::endl;
+        }
+#pragma omp critical
+        {
+            std::cerr << "Thread " << omp_get_thread_num() << " nfuncs "
+                << nb_func[0] << " " << nb_func[1] << " total_assig " <<
+                total_assig << std::endl;
+        }
+#endif
+#endif
     }
 }
@@ -117 +190 @@
 
     if (is_posted_write()) {
-        // update posted value to external signals
+        // update posted value to external signals              
+#pragma omp parallel
         update();
         func_combinationals();
@@ -126 +200 @@
     // don't need to do func_combinationals since 'unstable' flag is now false
     if (is_posted_write()) {
+#pragma omp parallel
         update();
         func_combinationals();