fixed commutativity rule

[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 4fc9ff3e248281b4ae0385fd71f15ad6fdd93b10..ff28527a1ec2569bdfcf78884af698ff6e682937 100644 (file)
--- a/benchmark/chase-lev-deque-bugfix/deque.c
+++ b/benchmark/chase-lev-deque-bugfix/deque.c
@@ -4,6 +4,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+inline bool fail(int ret) {
+       return ret == ABORT || ret == EMPTY;
+}
+
 Deque * create() {
        Deque * q = (Deque *) calloc(1, sizeof(Deque));
        Array * a = (Array *) calloc(1, sizeof(Array)+2*sizeof(atomic_int));
@@ -22,12 +26,6 @@ Deque * create() {
 */
 int take(Deque *q) {
        size_t b = atomic_load_explicit(&q->bottom, memory_order_relaxed) - 1;
-       /**
-               @Begin
-               @Commit_point_define_check: true
-               @Label: TakeReadBottom
-               @End
-       */
        Array *a = (Array *) atomic_load_explicit(&q->array, memory_order_relaxed);
        atomic_store_explicit(&q->bottom, b, memory_order_relaxed);
        /**** SPEC (sequential) (testcase1.c) ****/
@@ -35,13 +33,6 @@ int take(Deque *q) {
        size_t t = atomic_load_explicit(&q->top, memory_order_relaxed);
        int x;
        if (t <= b) {
-               /**
-                       @Begin
-                       @Commit_point_clear: true
-                       @Label: TakeClear1
-                       @End
-               */
-
                /* Non-empty queue. */
                int size = atomic_load_explicit(&a->size,memory_order_relaxed);
                x = atomic_load_explicit(&a->buffer[b % size], memory_order_relaxed);
@@ -57,20 +48,6 @@ int take(Deque *q) {
                        bool succ = atomic_compare_exchange_strong_explicit(&q->top, &t, t +
                                1, memory_order_seq_cst, memory_order_relaxed);
                        if (!succ) {
-                               /**
-                                       @Begin
-                                       @Commit_point_clear: true
-                                       @Label: TakeClear2
-                                       @End
-                               */
-
-                               /**
-                                       @Begin
-                                       @Commit_point_define_check: true
-                                       @Label: TakeReadTop
-                                       @End
-                               */
-
                                /* Failed race. */
                                x = EMPTY;
                        }
@@ -127,12 +104,8 @@ void push(Deque *q, int x) {
        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: PushUpdateBuffer
-               @End
-       */
+       /** @OPDefine: true */
+
        /**** UL & SPEC (Sync) (run with -u100 to avoid the uninitialized bug) ****/
        atomic_thread_fence(memory_order_release);
        atomic_store_explicit(&q->bottom, b + 1, memory_order_relaxed);
@@ -154,7 +127,7 @@ int steal(Deque *q) {
                @Label: StealReadTop1
                @End
        */
-       //FIXME: remove the fence causes no error and fewer executions..
+       /********** SPEC error (testcase3.c) **********/
        atomic_thread_fence(memory_order_seq_cst);
        /**** SPEC & UL ****/
        size_t b = atomic_load_explicit(&q->bottom, memory_order_acquire);