Changeset 60 for sources/src/global_functions.cc

Timestamp:

Feb 14, 2017, 11:30:19 AM (8 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/global_functions.cc (modified) (3 diffs)

sources/src/global_functions.cc

@@ -246 +246 @@
     pending_write_vector_capacity = get_signal_table_size();
 
-    if (pending_write_vector_capacity == 0) {
-        pending_write_vector = NULL;
-    }
-    else {
-        pending_write_vector = (pending_write_vector_t) realloc(pending_write_vector, sizeof(pending_write_t) * pending_write_vector_capacity);
-    }
+    assert(pending_write_vector_capacity != 0);
+
+#ifdef _OPENMP
+#define LINE_SIZE 128L
+    int malloc_size = (sizeof (pending_write_t) * (pending_write_vector_capacity + 1) + (LINE_SIZE - 1)) & ~(LINE_SIZE - 1);
+    assert((sizeof(pending_write_t) * (pending_write_vector_capacity + 1)) <= malloc_size && "bad allocation size");
+
+#pragma omp parallel
+    {
+        posix_memalign((void **) &pending_write_vector, LINE_SIZE, malloc_size);
+        pending_write_vector_nb = (int32_t *) &pending_write_vector[0];
+        pending_write_vector = &pending_write_vector[1];
+        //printf("malloc 0x%x @%p, idx @0x%x\n", malloc_size, pending_write_vector, pending_write_vector_nb);
+        *pending_write_vector_nb = 0;
+    }
+#else
+    pending_write_vector = (pending_write_vector_t) malloc(sizeof(pending_write_t) * pending_write_vector_capacity);
+#endif
+
 
     // create the clock list
@@ -267 +280 @@
     }
     // Check if any constructor wrote into registers
-    if (pending_write_vector_nb != 0) {
+    if (*pending_write_vector_nb != 0) {
         cerr <<
             "Error : Register/Signal writing is not allowed before sc_initialize.\n"
@@ -285 +298 @@
     }
 
-    pending_write_vector_nb = 0;
+    *pending_write_vector_nb = 0;
 
     check_all_ports();