fixed commutativity rule

[cdsspec-compiler.git] / benchmark / ms-queue / my_queue.h

diff --git a/benchmark/ms-queue/my_queue.h b/benchmark/ms-queue/my_queue.h
index 883a13d4a38cabb0fd6e427bf47695c3d5643159..3d54e772d287f0da13ef3ff896cd3c62e8b9f8a3 100644 (file)
--- a/benchmark/ms-queue/my_queue.h
+++ b/benchmark/ms-queue/my_queue.h
@@ -3,6 +3,13 @@
 
 #include <stdatomic.h>
 
+#include <spec_lib.h>
+#include <stdlib.h>
+#include <cdsannotate.h>
+#include <specannotation.h>
+#include <model_memory.h>
+#include "common.h" 
+
 #define MAX_NODES                      0xf
 
 typedef unsigned long long pointer;
@@ -35,42 +42,19 @@ void init_queue(queue_t *q, int num_threads);
        @Options:
                LANG = C;
        @Global_define:
-               @DeclareStruct:
-               typedef struct tag_elem {
-                       call_id_t id;
-                       unsigned int data;
-               } tag_elem_t;
-               
                @DeclareVar:
-               spec_list *__queue;
-               id_tag_t *tag;
+                       IntegerList *__queue;
                @InitVar:
-                       __queue = new_spec_list();
-                       tag = new_id_tag(); // Beginning of available id
-               @DefineFunc:
-                       tag_elem_t* new_tag_elem(call_id_t id, unsigned int data) {
-                               tag_elem_t *e = (tag_elem_t*) CMODEL_MALLOC(sizeof(tag_elem_t));
-                               e->id = id;
-                               e->data = data;
-                               return e;
-                       }
-               @DefineFunc:
-                       void free_tag_elem(tag_elem_t *e) {
-                               free(e);
-                       }
-               @DefineFunc:
-                       call_id_t get_id(void *wrapper) {
-                               return ((tag_elem_t*) wrapper)->id;
-                       }
-               @DefineFunc:
-                       unsigned int get_data(void *wrapper) {
-                               return ((tag_elem_t*) wrapper)->data;
-                       }
-       @Happens_before:
-               # Only check the happens-before relationship according to the id of the
-               # commit_point_set. For commit_point_set that has same ID, A -> B means
-               # B happens after the previous A.
-               Enqueue -> Dequeue
+                       __queue = createIntegerList();
+               @Finalize:
+                       if (__queue)
+                               destroyIntegerList(__queue);
+                       return true;
+       @Happens_before: Enqueue -> Dequeue
+       @Commutativity: Enqueue <-> Dequeue: true
+       @Commutativity: Dequeue <-> Dequeue: !_Method1.__RET__ || !_Method2.__RET__
+       //@Commutativity: Enqueue <-> Enqueue: _Method1.q != _Method2.q
+       //@Commutativity: Dequeue <-> Dequeue: _Method1.q != _Method2.q
        @End
 */
 
@@ -79,13 +63,13 @@ void init_queue(queue_t *q, int num_threads);
 /**
        @Begin
        @Interface: Enqueue
-       @Commit_point_set: Enqueue_Success_Point
-       @ID: get_and_inc(tag);
+       @Commit_point_set: EnqueueUpdateNext
+       @ID: val
        @Action:
                # __ID__ is an internal macro that refers to the id of the current
                # interface call
-               tag_elem_t *elem = new_tag_elem(__ID__, val);
-               push_back(__queue, elem);
+               push_back(__queue, val);
+               //model_print("Enqueue: val=%d\n", val);
        @End
 */
 void enqueue(queue_t *q, unsigned int val);
@@ -93,16 +77,20 @@ void enqueue(queue_t *q, unsigned int val);
 /**
        @Begin
        @Interface: Dequeue
-       @Commit_point_set: Dequeue_Success_Point | Dequeue_Empty_Point
-       @ID: get_id(front(__queue))
+       @Commit_point_set: DequeueReadHead | DequeueUpdateHead | DequeueReadNextVerify
+       @ID: __RET__ ? *retVal : 0
        @Action:
-               unsigned int _Old_Val = get_data(front(__queue));
-               pop_front(__queue);
-       @Post_check:
-               _Old_Val == __RET__
+               int elem = 0;
+               if (__RET__) {
+                       elem = front(__queue);
+                       pop_front(__queue);
+               }
+               //model_print("Dequeue: __RET__=%d, retVal=%d, elem=%d, \n", __RET__, *retVal, elem);
+               //model_print("Result: %d\n", __RET__ ? *retVal == elem : true);
+       @Post_check: __RET__ ? *retVal == elem : true
        @End
 */
-unsigned int dequeue(queue_t *q);
+bool dequeue(queue_t *q, int *retVal);
 int get_thread_num();
 
 #endif