Changeset 65 for sources/src/gen_code.h

Timestamp:

Oct 23, 2019, 12:53:07 PM (5 years ago)

Author:

bouyer

Message:

Various performance improvements for the parallel systemcass: cache-aligned
data structures, write only when needed, disable some unneeded barriers.

Fix bug in the non-openmp case: a pointer was not initialized

various style updates

File:

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

sources/src/gen_code.h

@@ -42 +42 @@
 /* generate a scheduling code */
 extern void  gen_scheduling_code_for_quasistatic_func(
-      method_process_list_t   &transition_list,
-      method_process_list_t   &moore_list,
-      strong_component_list_t *mealy_list);
-
+                      method_process_list_t   &transition_list,
+                      method_process_list_t   &moore_list,
+                            strong_component_list_t *mealy_list);
 extern void  gen_scheduling_code_for_static_func(
-      method_process_list_t   &transition_list,
-      method_process_list_t   &moore_list,
-      ProcessDependencyList   &mealy_list);
+                      method_process_list_t   &transition_list,
+                      method_process_list_t   &moore_list,
+                            ProcessDependencyList   &mealy_list);
+extern char *gen_scheduling_code_for_dynamic_link(
+                      method_process_list_t   &transition_list,
+                      method_process_list_t   &moore_list,
+                            ProcessDependencyList   &mealy_list);
+extern char *gen_scheduling_code_for_dynamic_link(
+                      method_process_list_t   &transition_list,
+                      method_process_list_t   &moore_list,
+                            strong_component_list_t *strongcomponents);
 
 extern char * gen_scheduling_code_for_dynamic_link(
@@ -87 +94 @@
 #pragma omp master
     {
-        std::cerr << "begin of cycle #" << sc_simulation_time() << "\n";
-    }
-#endif
-
-        func_simulate_1_cycle();
+        std::cerr << "begin of cycle #" << sc_simulation_time () << "\n";
+    }
+#endif
+
+        func_simulate_1_cycle ();  
 
         ++nb_cycles;
@@ -97 +104 @@
 #pragma omp master
     {
-        std::cerr << "end of cycle\n";
+        std::cerr << "end of cycle\n";
     }
 #endif
 }
 
-inline void internal_sc_cycle1(int number_of_cycles) {  
-    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];
-    extern unsigned int expected_globaltime;
-    extern volatile unsigned int globaltime;
+inline void
+internal_sc_cycle1 (int number_of_cycles)
+{  
+
+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];
 #ifdef _OPENMP
 #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)
+#endif
+extern unsigned int expected_globaltime;
+extern volatile unsigned int globaltime;
+#ifdef _OPENMP
 #pragma omp threadprivate (expected_globaltime)
 #pragma omp shared (globaltime)
 #endif
-    extern unsigned int num_omp_threads;
+
+extern unsigned int num_omp_threads;
 
 
@@ -120 +133 @@
 #pragma omp parallel 
 #endif
-    {
-        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;
-#ifdef _OPENMP
-#pragma omp master
-#endif
-        {
-            globaltime = 0;
-#ifdef _OPENMP
-            num_omp_threads = omp_get_num_threads();
+  {
+        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;
+#ifdef _OPENMP
+#pragma omp master
+#endif
+    {
+        globaltime = 0;
+#ifdef _OPENMP
+  num_omp_threads = omp_get_num_threads();
 #else
-            num_omp_threads = 1;
-#endif
-        }
+  num_omp_threads = 1;
+#endif
+    }
 
 #ifdef _OPENMP
 #pragma omp barrier
 #endif
-        while (!(have_to_stop || cyclecount == 0)) {
-        //while (!(have_to_stop || number_of_cycles == 0)) {
-#ifdef _OPENMP
-#pragma omp master
-#endif
-            {
-                trace_all(false);
-            }
-            internal_sc_cycle2();
-#ifdef _OPENMP
-#pragma omp master
-#endif
-            {
-                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;
-        }
+        while (!((have_to_stop) | (cyclecount == 0))) {
+#ifdef _OPENMP
+#pragma omp master
+#endif
+            {
+                trace_all  (false);
+            }
+                internal_sc_cycle2 ();
+#ifdef _OPENMP
+#pragma omp master
+#endif
+            {
+                trace_all  (true);
+            }
+            cyclecount = (number_of_cycles<0)?number_of_cycles:cyclecount-1;
+        }
 #ifdef _OPENMP
 #pragma omp barrier
-#endif
-#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;
-        }
+    {
+        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;
-        }
+    {
+        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
-    }
+    {
+        std::cerr << "Thread " << omp_get_thread_num() << " nfuncs "
+          << nb_func[0] << " " << nb_func[1] << " total_assig " <<
+           total_assig << std::endl;
+    }
+#endif // _OPENMP
+  }
 }
 
@@ -206 +213 @@
 #ifdef _OPENMP
 #pragma omp parallel
-#endif
-        update();
-        func_combinationals();
-    }
-
-    internal_sc_cycle1((int) duration);
-
-    // don't need to do func_combinationals since 'unstable' flag is now false
-    if (is_posted_write()) {
+#endif // _OPENMP
+        update ();
+    func_combinationals ();
+  }
+        
+        internal_sc_cycle1 ((int)duration);
+
+  // don't need to do func_combinationals since 'unstable' flag is now false
+  if (is_posted_write ()) {
 #ifdef _OPENMP
 #pragma omp parallel
-#endif
-        update();
-        func_combinationals();
-    }
+#endif // _OPENMP
+      update ();
+    func_combinationals ();
+  }
 }