/**
@Begin
@Commit_point_define_check: true
- @Label: Take_Read_Bottom
+ @Label: TakeReadBottom
@End
*/
Array *a = (Array *) atomic_load_explicit(&q->array, memory_order_relaxed);
- /**
- //@Begin
- @Commit_point_define_check: true
- @Label: Take_Read_Array
- @End
- */
atomic_store_explicit(&q->bottom, b, memory_order_relaxed);
- /**** detected correctness ****/
+ /**** SPEC (sequential) (testcase1.c) ****/
atomic_thread_fence(memory_order_seq_cst);
size_t t = atomic_load_explicit(&q->top, memory_order_relaxed);
- /**
- //@Begin
- @Commit_point_define_check: t != b
- @Label: Take_Read_Top
- @End
- */
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);
/**
- //@Begin
- @Commit_point_define_check: t != b
- @Label: Take_Read_Buffer
+ @Begin
+ @Commit_point_define_check: true
+ @Label: TakeReadBuffer
@End
*/
if (t == b) {
//FIXME: weaken the following seq_cst causes no spec problem
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
- @Label: Take_CAS_Top
- @End
- */
-
- /**
- @Begin
- @Additional_ordering_point_define_check: true
- @Label: Take_Additional_Point
- @End
- */
if (!succ) {
+ /**
+ @Begin
+ @Commit_point_clear: true
+ @Label: TakeClear2
+ @End
+ */
+
+ /**
+ @Begin
+ @Commit_point_define_check: true
+ @Label: TakeReadTop
+ @End
+ */
+
/* Failed race. */
x = EMPTY;
}
size_t bottom=atomic_load_explicit(&q->bottom, memory_order_relaxed);
atomic_store_explicit(&new_a->size, new_size, memory_order_relaxed);
size_t i;
+
+ // Initialize the whole new array to turn off the CDSChecker UL error
+ // Check if CDSSpec checker can catch this bug
+ /*
+ for(i=0; i < new_size; i++) {
+ atomic_store_explicit(&new_a->buffer[i % new_size], atomic_load_explicit(&a->buffer[i % size], memory_order_relaxed), memory_order_relaxed);
+ }
+ */
for(i=top; i < bottom; i++) {
atomic_store_explicit(&new_a->buffer[i % new_size], atomic_load_explicit(&a->buffer[i % size], memory_order_relaxed), memory_order_relaxed);
}
*/
void push(Deque *q, int x) {
size_t b = atomic_load_explicit(&q->bottom, memory_order_relaxed);
- /**** detected correctness ****/
+ /**** SPEC (sequential) ****/
size_t t = atomic_load_explicit(&q->top, memory_order_acquire);
Array *a = (Array *) atomic_load_explicit(&q->array, memory_order_relaxed);
if (b - t > atomic_load_explicit(&a->size, memory_order_relaxed) - 1) /* Full queue. */ {
resize(q);
+ // CDSSpec can actually detect the same bug if we avoid the UL error
//Bug in paper...should have next line...
a = (Array *) atomic_load_explicit(&q->array, memory_order_relaxed);
- /**
- //@Begin
- @Commit_point_define_check: true
- @Label: Push_Read_Array
- @End
- */
}
int size = atomic_load_explicit(&a->size, memory_order_relaxed);
atomic_store_explicit(&a->buffer[b % size], x, memory_order_relaxed);
/**
- //@Begin
+ @Begin
@Commit_point_define_check: true
- @Label: Push_Update_Buffer
+ @Label: PushUpdateBuffer
@End
*/
- /**** correctness error ****/
+ /**** 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);
- /**
- @Begin
- @Commit_point_define_check: true
- @Label: Push_Update_Bottom
- @End
- */
+
}
/**
@End
*/
int steal(Deque *q) {
- //FIXME: weaken the following acquire causes no spec problem
+ //Watch out: actually on need to be an acquire (don't count it)
+ // An old bug
size_t t = atomic_load_explicit(&q->top, memory_order_acquire);
/**
- //@Begin
- @Potential_commit_point_define: true
- @Label: Steal_Potential_Read_Tail
+ @Begin
+ @Commit_point_define_check: true
+ @Label: StealReadTop1
@End
*/
//FIXME: remove the fence causes no error and fewer executions..
atomic_thread_fence(memory_order_seq_cst);
- /**** detected UL ****/
+ /**** SPEC & UL ****/
size_t b = atomic_load_explicit(&q->bottom, memory_order_acquire);
- /**
- @Begin
- @Commit_point_define_check: true
- @Label: Steal_Read_Bottom
- @End
- */
-
- /**
- //@Begin
- @Commit_point_define: t >= b
- @Potential_commit_point_label: Steal_Potential_Read_Tail
- @Label: Steal_Read_Tail
- @End
- */
+
int x = EMPTY;
if (t < b) {
- /* Non-empty queue. */
- /**** detected UL ****/
- Array *a = (Array *) atomic_load_explicit(&q->array, memory_order_acquire);
/**
- //@Begin
- @Commit_point_define_check: true
- @Label: Steal_Read_Array
+ @Begin
+ @Commit_point_clear: true
+ @Label: StealClear1
@End
*/
+
+ /* Non-empty queue. */
+ /**** detected UL ****/
+ Array *a = (Array *) atomic_load_explicit(&q->array, memory_order_acquire);
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: Steal_Potential_Read_Buffer
+ @Begin
+ @Commit_point_define_check: true
+ @Label: StealReadBuffer
@End
*/
- /**** detected correctness failure ****/
+ /**** SPEC (sequential) ****/
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
- @Label: Steal_CAS_Top
- @End
- */
+ if (!succ) {
+ /**
+ @Begin
+ @Commit_point_clear: true
+ @Label: StealClear2
+ @End
+ */
- /**
- @Begin
- @Additional_ordering_point_define_check: true
- @Label: Steal_Additional_Point
- @End
- */
+ /**
+ @Begin
+ @Commit_point_define_check: true
+ @Label: StealReadTop2
+ @End
+ */
- /**
- //@Begin
- @Commit_point_define: succ
- @Potential_commit_point_label: Steal_Potential_Read_Buffer
- @Label: Steal_Read_Buffer
- @End
- */
- if (!succ) {
/* Failed race. */
return ABORT;
}
projects / cdsspec-compiler.git / blobdiff