Changeset 62 for sources/src/sc_port.cc

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/sc_port.cc (modified) (3 diffs)

sources/src/sc_port.cc

@@ -53 +53 @@
     extern char unstable;
     char unstable = 0; // not in sc_core namespace because dynamic link support C linkage only
-    int32 * pending_write_vector_nb = 0;
+    int32_t * pending_write_vector_nb = 0;
     unsigned long long int total_assig = 0;
+#ifdef USE_OPENMP
 #pragma omp threadprivate (pending_write_vector_nb, total_assig)
+#endif
 }
 
@@ -65 +67 @@
 const char * const sc_signal_base::kind_string = "sc_signal";
 
-unsigned int pending_write_vector_capacity = 512;
+unsigned int pending_write_vector_capacity;
 pending_write_vector_t pending_write_vector = NULL;
+#ifdef USE_OPENMP
 #pragma omp threadprivate (pending_write_vector)
+#endif
 extern equi_list_t equi_list;
 
@@ -215 +219 @@
     void update() {
 #if defined(DUMP_STAGE)
-            cerr << "Updating... ";
-#endif
-            // stl vectors are too slow
-            // memcopy is not better
-            // signal table sorting doesn't give any better performance
+        cerr << "Updating... ";
+#endif
+        // stl vectors are too slow
+        // memcopy is not better
+        // signal table sorting doesn't give any better performance
 #if defined(DUMP_STAGE)
-            cerr << "(" << *pending_write_vector_nb 
-                << " internal pending writings) ";
-#endif
-            unsigned int i;
-            for (i = 0; i < *pending_write_vector_nb; ++i) {
+        cerr << "(" << *pending_write_vector_nb 
+            << " internal pending writings) ";
+#endif
+        unsigned int i;
+        for (i = 0; i < *pending_write_vector_nb; ++i) {
 #define iter (sc_core::pending_write_vector[i])
 #ifdef CONFIG_DEBUG
-                if (iter.pointer == NULL) {
-                    cerr << "Internal error : trying to apply a posted write from an unassigned signal/port\n";
-                    exit (8);
-                }
+            if (iter.pointer == NULL) {
+                cerr << "Internal error : trying to apply a posted write from an unassigned signal/port\n";
+                exit (8);
+            }
 #endif
 #ifdef DUMP_SIGNAL_STATS
-                if (*(iter.pointer) == iter.value) {
-                    unnecessary++;
-                }
-                counter[iter.pointer]++;
-#endif
-                *(iter.pointer) = iter.value;
+            if (*(iter.pointer) == iter.value) {
+                unnecessary++;
+            }
+            counter[iter.pointer]++;
+#endif
+            *(iter.pointer) = iter.value;
 #undef iter
-            }
+        }
 #ifdef DUMP_SIGNAL_STATS
-            total_assig += *pending_write_vector_nb;
-#endif
-            total_assig += *pending_write_vector_nb;
-            *pending_write_vector_nb = 0;
+        total_assig += *pending_write_vector_nb;
+#endif
+        total_assig += *pending_write_vector_nb;
+        *pending_write_vector_nb = 0;
 
 #if defined(DUMP_STAGE)
-            cerr << "done.\n";
-#endif
-        }
+        cerr << "done.\n";
+#endif
+    }
 
 } // end of extern "C"