Avoid using a HashTable to associate FuncInsts with ModelActions; a slight improvemen...

[c11tester.git] / cmodelint.cc

diff --git a/cmodelint.cc b/cmodelint.cc
index 67364d5abf7a9a3a51178a8dc4f5f37fea0f7283..3c59fa01a68277cdbb74fc0a6af55698530b1b9a 100644 (file)
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -10,10 +10,9 @@
 #include "threads-model.h"
 #include "datarace.h"
 
-memory_order orders[8] = {
+memory_order orders[7] = {
        memory_order_relaxed, memory_order_consume, memory_order_acquire,
        memory_order_release, memory_order_acq_rel, memory_order_seq_cst,
-       volatile_order
 };
 
 static void ensureModel() {
@@ -95,52 +94,40 @@ void model_rmwc_action_helper(void *obj, int atomic_index, const char *position)
 }
 
 // cds volatile loads
-uint8_t cds_volatile_load8(void * obj, int atomic_index, const char * position) {
-       ensureModel();
-       return (uint8_t) model->switch_to_master(
-               new ModelAction(VOLATILE_READ, position, orders[atomic_index], obj));
-}
-uint16_t cds_volatile_load16(void * obj, int atomic_index, const char * position) {
-       ensureModel();
-       return (uint16_t) model->switch_to_master(
-               new ModelAction(VOLATILE_READ, position, orders[atomic_index], obj));
-}
-uint32_t cds_volatile_load32(void * obj, int atomic_index, const char * position) {
-       ensureModel();
-       return (uint32_t) model->switch_to_master(
-               new ModelAction(VOLATILE_READ, position, orders[atomic_index], obj)
-               );
-}
-uint64_t cds_volatile_load64(void * obj, int atomic_index, const char * position) {
-       ensureModel();
-       return model->switch_to_master(
-               new ModelAction(VOLATILE_READ, position, orders[atomic_index], obj));
-}
+#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
-void cds_volatile_store8(void * obj, uint8_t val, int atomic_index, const char * position) {
-       ensureModel();
-       model->switch_to_master(new ModelAction(VOLATILE_WRITE, position, orders[atomic_index], obj, (uint64_t) val));
-}
-void cds_volatile_store16(void * obj, uint16_t val, int atomic_index, const char * position) {
-       ensureModel();
-       model->switch_to_master(new ModelAction(VOLATILE_WRITE, position, orders[atomic_index], obj, (uint64_t) val));
-}
-void cds_volatile_store32(void * obj, uint32_t val, int atomic_index, const char * position) {
-       ensureModel();
-       model->switch_to_master(new ModelAction(VOLATILE_WRITE, position, orders[atomic_index], obj, (uint64_t) val));
-}
-void cds_volatile_store64(void * obj, uint64_t val, int atomic_index, const char * position) {
-       ensureModel();
-       model->switch_to_master(new ModelAction(VOLATILE_WRITE, position, orders[atomic_index], obj, (uint64_t) val));
-}
+#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));          \
@@ -170,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));          \
@@ -190,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));         \
@@ -275,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));         \
@@ -347,8 +334,7 @@ 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;
 
@@ -372,8 +358,7 @@ void cds_func_entry(const char * funcName) {
 }
 
 void cds_func_exit(const char * funcName) {
-       if (!model) return;
-
+       ensureModel();
        Thread * th = thread_current();
        uint32_t func_id;