Version that finds the bug of iris

[c11tester.git] / cmodelint.cc

diff --git a/cmodelint.cc b/cmodelint.cc
index 5b37e867d635d4f457c2bbb3dd0212c1d1e58193..8774c5b3f6a0124cbc3079d7de5bfcee79b5505d 100644 (file)
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -10,9 +10,9 @@
 #include "threads-model.h"
 #include "datarace.h"
 
-memory_order orders[6] = {
+memory_order orders[7] = {
        memory_order_relaxed, memory_order_consume, memory_order_acquire,
-       memory_order_release, memory_order_acq_rel, memory_order_seq_cst
+       memory_order_release, memory_order_acq_rel, memory_order_seq_cst,
 };
 
 static void ensureModel() {
@@ -93,12 +93,41 @@ void model_rmwc_action_helper(void *obj, int atomic_index, const char *position)
        model->switch_to_master(new ModelAction(ATOMIC_RMWC, position, orders[atomic_index], obj));
 }
 
+// cds volatile loads
+#define VOLATILELOAD(size) \
+       uint ## size ## _t cds_volatile_load ## size(void * obj, const char * position) { \
+               ensureModel();                                                      \
+               return (uint ## size ## _t)model->switch_to_master(new ModelAction(ATOMIC_READ, position, memory_order_relaxed, obj)); \
+       }
+
+VOLATILELOAD(8)
+VOLATILELOAD(16)
+VOLATILELOAD(32)
+VOLATILELOAD(64)
+
+// cds volatile stores
+#define VOLATILESTORE(size) \
+       void cds_volatile_store ## size (void * obj, uint ## size ## _t val, const char * position) { \
+               ensureModel();                                                      \
+               model->switch_to_master(new ModelAction(ATOMIC_WRITE, position, memory_order_relaxed, obj, (uint64_t) val)); \
+               *((volatile uint ## size ## _t *)obj) = val;            \
+               thread_id_t tid = thread_current()->get_id();           \
+               for(int i=0;i < size / 8;i++) {                         \
+                       recordWrite(tid, (void *)(((char *)obj)+i));          \
+               }                                                       \
+       }
+
+VOLATILESTORE(8)
+VOLATILESTORE(16)
+VOLATILESTORE(32)
+VOLATILESTORE(64)
+
 // cds atomic inits
 #define CDSATOMICINT(size)                                              \
        void cds_atomic_init ## size (void * obj, uint ## size ## _t val, const char * position) { \
                ensureModel();                                                      \
                model->switch_to_master(new ModelAction(ATOMIC_INIT, position, memory_order_relaxed, obj, (uint64_t) val)); \
-               *((uint ## size ## _t *)obj) = val;                                 \
+               *((volatile uint ## size ## _t *)obj) = val;                                 \
                thread_id_t tid = thread_current()->get_id();           \
                for(int i=0;i < size / 8;i++) {                       \
                        recordWrite(tid, (void *)(((char *)obj)+i));          \
@@ -114,7 +143,7 @@ CDSATOMICINT(64)
 #define CDSATOMICLOAD(size)                                             \
        uint ## size ## _t cds_atomic_load ## size(void * obj, int atomic_index, const char * position) { \
                ensureModel();                                                      \
-               return (uint ## size ## _t) model->switch_to_master( \
+               return (uint ## size ## _t)model->switch_to_master( \
                        new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj)); \
        }
 
@@ -128,7 +157,7 @@ CDSATOMICLOAD(64)
        void cds_atomic_store ## size(void * obj, uint ## size ## _t val, int atomic_index, const char * position) { \
                ensureModel();                                                        \
                model->switch_to_master(new ModelAction(ATOMIC_WRITE, position, orders[atomic_index], obj, (uint64_t) val)); \
-               *((uint ## size ## _t *)obj) = val;                     \
+               *((volatile uint ## size ## _t *)obj) = val;                     \
                thread_id_t tid = thread_current()->get_id();           \
                for(int i=0;i < size / 8;i++) {                       \
                        recordWrite(tid, (void *)(((char *)obj)+i));          \
@@ -148,7 +177,7 @@ CDSATOMICSTORE(64)
                uint ## size ## _t _val = val;                                            \
                _copy __op__ _val;                                                    \
                model_rmw_action_helper(addr, (uint64_t) _copy, atomic_index, position);        \
-               *((uint ## size ## _t *)addr) = _copy;                  \
+               *((volatile uint ## size ## _t *)addr) = _copy;                  \
                thread_id_t tid = thread_current()->get_id();           \
                for(int i=0;i < size / 8;i++) {                       \
                        recordWrite(tid, (void *)(((char *)addr)+i));         \
@@ -233,7 +262,7 @@ CDSATOMICXOR(64)
                uint ## size ## _t _old = model_rmwrcas_action_helper(addr, atomic_index, _expected, sizeof(_expected), position); \
                if (_old == _expected) {                                                                    \
                        model_rmw_action_helper(addr, (uint64_t) _desired, atomic_index, position); \
-                       *((uint ## size ## _t *)addr) = desired;                        \
+                       *((volatile uint ## size ## _t *)addr) = desired;                        \
                        thread_id_t tid = thread_current()->get_id();           \
                        for(int i=0;i < size / 8;i++) {                       \
                                recordWrite(tid, (void *)(((char *)addr)+i));         \
@@ -305,8 +334,8 @@ void cds_atomic_thread_fence(int atomic_index, const char * position) {
  */
 
 void cds_func_entry(const char * funcName) {
-       if (!model) return;
-
+       ensureModel();
+       /*
        Thread * th = thread_current();
        uint32_t func_id;
 
@@ -327,23 +356,25 @@ void cds_func_entry(const char * funcName) {
        }
 
        history->enter_function(func_id, th->get_id());
+*/
 }
 
 void cds_func_exit(const char * funcName) {
-       if (!model) return;
+       ensureModel();
 
-       Thread * th = thread_current();
+/*     Thread * th = thread_current();
        uint32_t func_id;
 
        ModelHistory *history = model->get_history();
        func_id = history->getFuncMap()->get(funcName);
 
-       /* func_id not found; this could happen in the case where a function calls cds_func_entry
+        * func_id not found; this could happen in the case where a function calls cds_func_entry
         * when the model has been defined yet, but then an atomic inside the function initializes
         * the model. And then cds_func_exit is called upon the function exiting.
-        */
+        *
        if (func_id == 0)
                return;
 
        history->exit_function(func_id, th->get_id());
+*/
 }