Changeset 62 for sources/src/gen_code.cc

Timestamp:

Feb 16, 2017, 3:46:11 PM (8 years ago)

Author:

meunier

Message:

• Functional (or supposedly functional) OpenMP support configure must be run with --enable-use-omp and the topcell must define the USE_OPENMP flag before including the .h files of systemcass (if openmp enabled).

File:

• sources/src/gen_code.cc (modified) (9 diffs)

sources/src/gen_code.cc

@@ -241 +241 @@
 
 
-char * gen_scheduling_code_for_dynamic_link(method_process_list_t &
-        transition_func_list,
-        method_process_list_t &
-        moore_func_list,
-        strong_component_list_t *
-        strongcomponents) {
+char * gen_scheduling_code_for_dynamic_link(method_process_list_t & transition_func_list,
+        method_process_list_t & moore_func_list,
+        strong_component_list_t * strongcomponents) {
     if (dump_stage) {
         cerr << "Generating C code for scheduling...\n";
@@ -305 +302 @@
 
 
-char * gen_scheduling_code_for_dynamic_link(method_process_list_t &
-        transition_func_list,
-        method_process_list_t &
-        moore_func_list,
-        ProcessDependencyList &
-        mealy_func_list) {
+char * gen_scheduling_code_for_dynamic_link(method_process_list_t & transition_func_list,
+        method_process_list_t & moore_func_list,
+        ProcessDependencyList & mealy_func_list) {
     if (dump_stage) {
         cerr << "Generating C code for scheduling...\n";
@@ -509 +503 @@
 
 
-void gen_scheduling_code_for_static_func(method_process_list_t &
-        transition_func_list,
-        method_process_list_t &
-        moore_func_list,
-        ProcessDependencyList &
-        mealy_func_list) {
+void gen_scheduling_code_for_static_func(method_process_list_t & transition_func_list,
+        method_process_list_t & moore_func_list,
+        ProcessDependencyList & mealy_func_list) {
     if (dump_stage) {
         cerr << "Generating scheduling...\n";
@@ -546 +537 @@
     int n = fc.func_number;
     int i;
-#pragma omp parallel for
     for (i = 0; i < n; ++i) {
 #if 0
@@ -578 +568 @@
 unsigned int nb_func[2];
 static method_process_t **func_list[2];
-#pragma omp threadprivate (nb_func, func_list)
 static strong_component_list_t quasistatic_list;
 
 unsigned long long busy_wait_f0, busy_wait_f1, busy_wait_up, busy_wait_ml;
 unsigned long long last_wait_f0, last_wait_f1, last_wait_up, last_wait_ml;
+#ifdef USE_OPENMP
+#pragma omp threadprivate (nb_func, func_list)
 #pragma omp threadprivate (busy_wait_f0, busy_wait_f1, busy_wait_up,busy_wait_ml)
 #pragma omp threadprivate (last_wait_f0, last_wait_f1, last_wait_up,last_wait_ml)
+#endif
 
 static void Call(const method_process_t & m) {
@@ -621 +613 @@
 unsigned int expected_globaltime = 0;
 volatile unsigned int globaltime __attribute__ ((aligned (128))) = 0;
+#ifdef USE_OPENMP
+#pragma omp threadprivate (expected_globaltime)
 #pragma omp shared (globaltime)
-#pragma omp threadprivate (expected_globaltime)
+#endif
 
 unsigned int num_omp_threads;
@@ -644 +638 @@
         __asm volatile("lfence");
     }
-
 #else
-#pragma omp barrier
+    #ifdef USE_OPENMP
+    #pragma omp barrier
+    #endif
 #endif
 
@@ -664 +659 @@
     }
 #else
-#pragma omp barrier
+    #ifdef USE_OPENMP
+    #pragma omp barrier
+    #endif
 #endif
     if (!quasistatic_list.empty()) {
+#ifdef USE_OPENMP
 #pragma omp master
+#endif
         {
             quasistatic_mealy_generation();
@@ -682 +681 @@
         }
 #else
-#pragma omp barrier
-#endif
-    }
-
-}
-
-
-void gen_scheduling_code_for_quasistatic_func(method_process_list_t &
-        transition_func_list,
-        method_process_list_t &
-        moore_func_list,
-        strong_component_list_t *
-        mealy_func_list) {
+    #ifdef USE_OPENMP
+    #pragma omp barrier
+    #endif
+#endif
+    }
+}
+
+
+void gen_scheduling_code_for_quasistatic_func(method_process_list_t & transition_func_list,
+        method_process_list_t & moore_func_list,
+        strong_component_list_t * mealy_func_list) {
     if (dump_stage) {
         cerr << "Generating quasi static scheduling...\n";