save

[cdsspec-compiler.git] / benchmark / chase-lev-deque-bugfix / deque.c

diff --git a/benchmark/chase-lev-deque-bugfix/deque.c b/benchmark/chase-lev-deque-bugfix/deque.c
index 2cfbb76a0607a9d743e8e3235fb624ad6fd975a7..7c326560746464e35eff2db47416c4ea066063f3 100644 (file)
--- a/benchmark/chase-lev-deque-bugfix/deque.c
+++ b/benchmark/chase-lev-deque-bugfix/deque.c
@@ -35,7 +35,8 @@ int take(Deque *q) {
        int x;
        if (t <= b) {
                /* Non-empty queue. */
-               x = atomic_load_explicit(&a->buffer[b % atomic_load_explicit(&a->size,memory_order_relaxed)], memory_order_relaxed);
+               int size = atomic_load_explicit(&a->size,memory_order_relaxed);
+               x = atomic_load_explicit(&a->buffer[b % size], memory_order_relaxed);
                /**
                        @Begin
                        @Commit_point_define_check: t != b
@@ -48,17 +49,10 @@ int take(Deque *q) {
                                1, memory_order_seq_cst, memory_order_relaxed);
                        /**
                                @Begin
-                               @Commit_point_define_check: succ == true
+                               @Commit_point_define_check: succ
                                @Label: Take_Point3
                                @End
                        */
-                       
-                       /**
-                               @Begin
-                               @Commit_point_define_check: succ == false
-                               @Label: Take_Point4
-                               @End
-                       */
                        if (!succ) {
                                /* Failed race. */
                                x = EMPTY;
@@ -102,15 +96,18 @@ void push(Deque *q, int x) {
                //Bug in paper...should have next line...
                a = (Array *) atomic_load_explicit(&q->array, memory_order_relaxed);
        }
-       atomic_store_explicit(&a->buffer[b % atomic_load_explicit(&a->size, memory_order_relaxed)], x, memory_order_relaxed);
-       atomic_thread_fence(memory_order_release);
+       int size = atomic_load_explicit(&a->size, memory_order_relaxed);
+       atomic_store_explicit(&a->buffer[b % size], x, memory_order_relaxed);
        /**
                @Begin
                @Commit_point_define_check: true
                @Label: Push_Point
                @End
        */
+       atomic_thread_fence(memory_order_release);
+       
        atomic_store_explicit(&q->bottom, b + 1, memory_order_relaxed);
+       
 }
 
 /**
@@ -132,19 +129,28 @@ int steal(Deque *q) {
        if (t < b) {
                /* Non-empty queue. */
                Array *a = (Array *) atomic_load_explicit(&q->array, memory_order_acquire);
-               x = atomic_load_explicit(&a->buffer[t % atomic_load_explicit(&a->size, memory_order_relaxed)], memory_order_relaxed);
+               int size = atomic_load_explicit(&a->size, memory_order_relaxed);
+               x = atomic_load_explicit(&a->buffer[t % size], memory_order_relaxed);
+               /**
+                       @Begin
+                       @Potential_commit_point_define: true
+                       @Label: Potential_Steal
+                       @End
+               */
+               
                bool succ = atomic_compare_exchange_strong_explicit(&q->top, &t, t + 1,
                        memory_order_seq_cst, memory_order_relaxed);
                /**
                        @Begin
-                       @Commit_point_define_check: succ == true
-                       @Label: Steal_Point2
+                       @Commit_point_define_check: !succ
+                       @Label: Steal_Point4
                        @End
                */
-               
+
                /**
                        @Begin
-                       @Commit_point_define_check: succ == false
+                       @Commit_point_define: succ
+                       @Potential_commit_point_label: Potential_Steal
                        @Label: Steal_Point3
                        @End
                */