Changeset 62 for sources/src/gen_code.h

Timestamp:

Feb 16, 2017, 3:46:11 PM (7 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.h (modified) (4 diffs)

sources/src/gen_code.h

@@ -106 +106 @@
     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;
+#ifdef USE_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)
-    extern unsigned int expected_globaltime;
-    extern volatile unsigned int globaltime;
+#pragma omp threadprivate (expected_globaltime)
 #pragma omp shared (globaltime)
-#pragma omp threadprivate (expected_globaltime)
-
+#endif
     extern unsigned int num_omp_threads;
 
 
+#ifdef USE_OPENMP
 #pragma omp parallel 
+#endif
     {
-//        int cyclecount = number_of_cycles;
+        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
+#ifdef USE_OPENMP
+#pragma omp master
+#endif
         {
             globaltime = 0;
-#ifdef _OPENMP
+#ifdef USE_OPENMP
             num_omp_threads = omp_get_num_threads();
 #else
@@ -133 +138 @@
         }
 
+#ifdef USE_OPENMP
 #pragma omp barrier
-        // while (!((have_to_stop) | (cyclecount == 0))) {
-        while (!((have_to_stop) || (number_of_cycles == 0))) {
-#pragma omp master
+#endif
+        while (!(have_to_stop || cyclecount == 0)) {
+        //while (!(have_to_stop || number_of_cycles == 0)) {
+#ifdef USE_OPENMP
+#pragma omp master
+#endif
             {
                 trace_all(false);
             }
             internal_sc_cycle2();
-#pragma omp master
+#ifdef USE_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;
-        }
+            cyclecount = (number_of_cycles < 0) ? number_of_cycles : cyclecount - 1;
+            // number_of_cycles = (number_of_cycles < 0) ? number_of_cycles : number_of_cycles - 1;
+        }
+#ifdef USE_OPENMP
 #pragma omp barrier
+#endif
 #if 0
-#ifdef _OPENMP
+#ifdef USE_OPENMP
 #pragma omp critical
         {
@@ -191 +204 @@
     if (is_posted_write()) {
         // update posted value to external signals              
+#ifdef USE_OPENMP
 #pragma omp parallel
+#endif
         update();
         func_combinationals();
@@ -200 +215 @@
     // don't need to do func_combinationals since 'unstable' flag is now false
     if (is_posted_write()) {
+#ifdef USE_OPENMP
 #pragma omp parallel
+#endif
         update();
         func_combinationals();