Changes between Version 51 and Version 52 of Next-GenOpenMPTransformation

Timestamp:

11/06/19 15:42:53 (7 years ago)

Author:

wuwenhao

Comment:

--

Next-GenOpenMPTransformation

@@ -626 +626 @@
 
 {{{
+// global
+$_omp_helper_semaphore critical_ = $_omp_helper_semaphore_create(0); 
+$_omp_helper_semaphore critical_x = $_omp_helper_semaphore_create(0); 
 ...
-_Bool critical_ = $false;
-_Bool critical_x = $false;
-
-...
 
 // critical block with unspecified name
-$yield();
-$when (!critical_) critical_ = $true;
-$check_data_race(team);
+  $yield();
+  $check_data_race(team);
+  $_omp_helper_semaphore_p(critical_, 0);
+  $_omp_helper_semaphore_v(critical_, 1);
   translate(BLOCK_A)
-  critical_ = $false;
+  $_omp_helper_semaphore_v(critical_, 0);
 
 // critical block with specified name
-$yield();
-$when (!critical_x) critical_x = $true;
-$check_data_race(team);
+  $yield();
+  $check_data_race(team);
+  $_omp_helper_semaphore_p(critical_x, 0);
+  $_omp_helper_semaphore_v(critical_x, 1);
   translate(BLOCK_X);
-  critical_x = $false;
+  $_omp_helper_semaphore_v(critical_x, 0);
 }}}
 
@@ -681 +682 @@
 
 {{{
-int order_counter0 = INIT; //global
+// global helper lock
+$_omp_helper_semaphore ordered_0 = $_omp_helper_semaphore_create(INIT); 
   ..
 {
@@ -688 +690 @@
 
   $for (int i : loop_dist) {
-     ...
+    int i_next = i + I_INCR;
+    ...
     $yield();
-    $when (order_counter0 == i) {
-      translate(BLOCK);
-      order_counter0 += INCR;
-    }
-      ...
+    // wait until hs0->val is i
+    $_omp_helper_semaphore_p(ordered_0, i);
+    translate(BLOCK);
+    // set hs0->val as i_next
+    $_omp_helper_semaphore_v(ordered_0, i_next);
+    ...
   }
 }
@@ -702 +706 @@
 
 {{{
-#pragma omp parallel for collapse(2) ordered
+#pragma omp parallel for collapse(3) ordered
 for (i=I_INIT; i<I_COND; i+=I_INCR)
-  for (j=J_INIT; j<J_COND; j+=J_INCR) {
-    #pragma omp ordered
-      BLOCK
-  }
-}}}
-
-=>
-
-{{{
-int order_counter0 = I_INIT;
-int order_counter1 = J_INIT;
+  for (j=J_INIT; j<J_COND; j+=J_INCR)
+    for (k=K_INIT; k<K_COND; k+=K_INCR) {
+      #pragma omp ordered
+        BLOCK
+  }
+}}}
+
+=>
+
+{{{
+// global helper semaphore
+$_omp_helper_semaphore ordered_0 = $_omp_helper_semaphore_create(I_INIT); 
+$_omp_helper_semaphore ordered_1 = $_omp_helper_semaphore_create(J_INIT); 
+$_omp_helper_semaphore ordered_2 = $_omp_helper_semaphore_create(K_INIT); 
 
 { // worksharing-loop construct (begin)
   ..
-  $for (int i, j : loop_dist) {
+  $for (int i, j, k: loop_dist) {
+    int i_next = i + I_INCR;
+    int j_next = j + J_INCR;
+    int k_next = k + K_INCR;
+
     $yield();
-    $when((order_counter0 == i) && (order_counter1 == j)) {
-      translate(BLOCK);
-
-      order_counter1 += J_INCR;
-      if (order_counter1 >= J_COND) {
-        order_counter1 = J_INIT;
-        order_counter0 += I_INCR;
+    $_omp_helper_semaphore_p(ordered_0, i); 
+    $_omp_helper_semaphore_p(hs1, j); 
+    $_omp_helper_semaphore_p(hs2, k); 
+
+    translate(BLOCK);
+
+    if (k_next < K_COND) // hit bound
+      $_omp_helper_semaphore_v(ordered_2, k_next); // incr
+    else { 
+      $_omp_helper_semaphore_v(ordered_2, K_INIT); // reset
+
+      if (j_next < J_COND) // hit bound
+        $_omp_helper_semaphore_v(ordered_1, j_next); // incr
+      else {
+        $_omp_helper_semaphore_v(ordered_1, J_INIT); // reset
+
+        $_omp_helper_semaphore_v(ordered_0, i_next); // incr
       }
     }