add a new class 'ModelHistory'
[c11tester.git] / cmodelint.cc
index 17bd003bbed685859cd36e3839338068eade5678..5be511c86f0574b5a707a9ddabaa9e90156348eb 100644 (file)
@@ -1,6 +1,10 @@
 #include <stdio.h>
+#include <string>
+
 #include "model.h"
+#include "execution.h"
 #include "action.h"
+#include "history.h"
 #include "cmodelint.h"
 #include "threads-model.h"
 
@@ -39,7 +43,7 @@ uint64_t model_rmwr_action(void *obj, memory_order ord) {
  * of the RMW action w/o a write.
  */
 uint64_t model_rmwrcas_action(void *obj, memory_order ord, uint64_t oldval, int size) {
-       return model->switch_to_master(new ModelAction(ATOMIC_RMWRCAS, ord, obj, oldval, size));
+       return model->switch_to_master(new ModelAction(ATOMIC_RMWRCAS, ord, obj, oldval, size));
 }
 
 
@@ -59,266 +63,266 @@ void model_fence_action(memory_order ord) {
 }
 
 /* ---  helper functions --- */
-uint64_t model_rmwrcas_action_helper(void *obj, int atomic_index, const char *position) {
+uint64_t model_rmwrcas_action_helper(void *obj, int atomic_index, uint64_t oldval, int size, const char *position) {
        return model->switch_to_master(
-               new ModelAction(ATOMIC_RMWRCAS, position, orders[atomic_index], obj)
-       );
+               new ModelAction(ATOMIC_RMWRCAS, position, orders[atomic_index], obj, oldval, size)
+               );
 }
 
 uint64_t model_rmwr_action_helper(void *obj, int atomic_index, const char *position) {
        return model->switch_to_master(
                new ModelAction(ATOMIC_RMWR, position, orders[atomic_index], obj)
-       );
+               );
 }
 
 void model_rmw_action_helper(void *obj, uint64_t val, int atomic_index, const char * position) {
        model->switch_to_master(
                new ModelAction(ATOMIC_RMW, position, orders[atomic_index], obj, val)
-       );
+               );
 }
 
 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 atomic inits
 void cds_atomic_init8(void * obj, uint8_t val, const char * position) {
        model->switch_to_master(
                new ModelAction(ATOMIC_INIT, position, memory_order_relaxed, obj, (uint64_t) val)
-       );
+               );
 }
 void cds_atomic_init16(void * obj, uint16_t val, const char * position) {
        model->switch_to_master(
                new ModelAction(ATOMIC_INIT, position, memory_order_relaxed, obj, (uint64_t) val)
-       );
+               );
 }
 void cds_atomic_init32(void * obj, uint32_t val, const char * position) {
        model->switch_to_master(
                new ModelAction(ATOMIC_INIT, position, memory_order_relaxed, obj, (uint64_t) val)
-       );
+               );
 }
 void cds_atomic_init64(void * obj, uint64_t val, const char * position) {
        model->switch_to_master(
                new ModelAction(ATOMIC_INIT, position, memory_order_relaxed, obj, val)
-       );
+               );
 }
 
 
 // cds atomic loads
-uint8_t cds_atomic_load8(void * obj, int atomic_index, const char * position) {        
+uint8_t cds_atomic_load8(void * obj, int atomic_index, const char * position) {
        return (uint8_t) ( model->switch_to_master(
-               new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj))
-       );
+                                                                                        new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj))
+                                                                                );
 }
 uint16_t cds_atomic_load16(void * obj, int atomic_index, const char * position) {
        return (uint16_t) ( model->switch_to_master(
-               new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj))
-       );
+                                                                                               new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj))
+                                                                                       );
 }
 uint32_t cds_atomic_load32(void * obj, int atomic_index, const char * position) {
        return (uint32_t) ( model->switch_to_master(
-               new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj))
-       );
+                                                                                               new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj))
+                                                                                       );
 }
 uint64_t cds_atomic_load64(void * obj, int atomic_index, const char * position) {
        return model->switch_to_master(
                new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj)
-       );
+               );
 }
 
 // cds atomic stores
 void cds_atomic_store8(void * obj, uint8_t val, int atomic_index, const char * position) {
        model->switch_to_master(
                new ModelAction(ATOMIC_WRITE, position, orders[atomic_index], obj, (uint64_t) val)
-       );
+               );
 }
 void cds_atomic_store16(void * obj, uint16_t val, int atomic_index, const char * position) {
        model->switch_to_master(
                new ModelAction(ATOMIC_WRITE, position, orders[atomic_index], obj, (uint64_t) val)
-       );
+               );
 }
 void cds_atomic_store32(void * obj, uint32_t val, int atomic_index, const char * position) {
        model->switch_to_master(
                new ModelAction(ATOMIC_WRITE, position, orders[atomic_index], obj, (uint64_t) val)
-       );
+               );
 }
 void cds_atomic_store64(void * obj, uint64_t val, int atomic_index, const char * position) {
        model->switch_to_master(
                new ModelAction(ATOMIC_WRITE, position, orders[atomic_index], obj, val)
-       );
+               );
 }
 
 #define _ATOMIC_RMW_(__op__, size, addr, val, atomic_index, position)            \
-({                                                                      \
-  uint##size##_t _old = model_rmwr_action_helper(addr, atomic_index, position);   \
-  uint##size##_t _copy = _old;                                          \
-  uint##size##_t _val = val;                                            \
-  _copy __op__ _val;                                                    \
-  model_rmw_action_helper(addr, (uint64_t) _copy, atomic_index, position);        \
-  return _old;                                                          \
-})
+       ({                                                                      \
+               uint ## size ## _t _old = model_rmwr_action_helper(addr, atomic_index, position);   \
+               uint ## size ## _t _copy = _old;                                          \
+               uint ## size ## _t _val = val;                                            \
+               _copy __op__ _val;                                                    \
+               model_rmw_action_helper(addr, (uint64_t) _copy, atomic_index, position);        \
+               return _old;                                                          \
+       })
 
 // cds atomic exchange
 uint8_t cds_atomic_exchange8(void* addr, uint8_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( = , 8, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( =, 8, addr, val, atomic_index, position);
 }
 uint16_t cds_atomic_exchange16(void* addr, uint16_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( = , 16, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( =, 16, addr, val, atomic_index, position);
 }
 uint32_t cds_atomic_exchange32(void* addr, uint32_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( = , 32, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( =, 32, addr, val, atomic_index, position);
 }
 uint64_t cds_atomic_exchange64(void* addr, uint64_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( = , 64, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( =, 64, addr, val, atomic_index, position);
 }
 
 // cds atomic fetch add
 uint8_t cds_atomic_fetch_add8(void* addr, uint8_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( += , 8, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( +=, 8, addr, val, atomic_index, position);
 }
 uint16_t cds_atomic_fetch_add16(void* addr, uint16_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( += , 16, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( +=, 16, addr, val, atomic_index, position);
 }
 uint32_t cds_atomic_fetch_add32(void* addr, uint32_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( += , 32, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( +=, 32, addr, val, atomic_index, position);
 }
 uint64_t cds_atomic_fetch_add64(void* addr, uint64_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( += , 64, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( +=, 64, addr, val, atomic_index, position);
 }
 
 // cds atomic fetch sub
 uint8_t cds_atomic_fetch_sub8(void* addr, uint8_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( -= , 8, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( -=, 8, addr, val, atomic_index, position);
 }
 uint16_t cds_atomic_fetch_sub16(void* addr, uint16_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( -= , 16, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( -=, 16, addr, val, atomic_index, position);
 }
 uint32_t cds_atomic_fetch_sub32(void* addr, uint32_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( -= , 32, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( -=, 32, addr, val, atomic_index, position);
 }
 uint64_t cds_atomic_fetch_sub64(void* addr, uint64_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( -= , 64, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( -=, 64, addr, val, atomic_index, position);
 }
 
 // cds atomic fetch and
 uint8_t cds_atomic_fetch_and8(void* addr, uint8_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( &= , 8, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( &=, 8, addr, val, atomic_index, position);
 }
 uint16_t cds_atomic_fetch_and16(void* addr, uint16_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( &= , 16, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( &=, 16, addr, val, atomic_index, position);
 }
 uint32_t cds_atomic_fetch_and32(void* addr, uint32_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( &= , 32, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( &=, 32, addr, val, atomic_index, position);
 }
 uint64_t cds_atomic_fetch_and64(void* addr, uint64_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( &= , 64, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( &=, 64, addr, val, atomic_index, position);
 }
 
 // cds atomic fetch or
 uint8_t cds_atomic_fetch_or8(void* addr, uint8_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( |= , 8, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( |=, 8, addr, val, atomic_index, position);
 }
 uint16_t cds_atomic_fetch_or16(void* addr, uint16_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( |= , 16, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( |=, 16, addr, val, atomic_index, position);
 }
 uint32_t cds_atomic_fetch_or32(void* addr, uint32_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( |= , 32, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( |=, 32, addr, val, atomic_index, position);
 }
 uint64_t cds_atomic_fetch_or64(void* addr, uint64_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( |= , 64, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( |=, 64, addr, val, atomic_index, position);
 }
 
 // cds atomic fetch xor
 uint8_t cds_atomic_fetch_xor8(void* addr, uint8_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( ^= , 8, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( ^=, 8, addr, val, atomic_index, position);
 }
 uint16_t cds_atomic_fetch_xor16(void* addr, uint16_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( ^= , 16, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( ^=, 16, addr, val, atomic_index, position);
 }
 uint32_t cds_atomic_fetch_xor32(void* addr, uint32_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( ^= , 32, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( ^=, 32, addr, val, atomic_index, position);
 }
 uint64_t cds_atomic_fetch_xor64(void* addr, uint64_t val, int atomic_index, const char * position) {
-       _ATOMIC_RMW_( ^= , 64, addr, val, atomic_index, position);
+       _ATOMIC_RMW_( ^=, 64, addr, val, atomic_index, position);
 }
 
 // cds atomic compare and exchange
-// In order to accomodate the LLVM PASS, the return values are not true or false. 
+// In order to accomodate the LLVM PASS, the return values are not true or false.
 
 #define _ATOMIC_CMPSWP_WEAK_ _ATOMIC_CMPSWP_
 #define _ATOMIC_CMPSWP_(size, addr, expected, desired, atomic_index, position)                            \
-({                                                                                              \
-  uint##size##_t _desired = desired;                                                            \
-  uint##size##_t _expected = expected;                                                          \
-  uint##size##_t _old = model_rmwrcas_action_helper(addr, atomic_index, position);                           \
-  if (_old == _expected) {                                                                    \
-    model_rmw_action_helper(addr, (uint64_t) _desired, atomic_index, position); return _expected; }      \
-  else {                                                                                        \
-    model_rmwc_action_helper(addr, atomic_index, position); _expected = _old; return _old; }              \
-})
+       ({                                                                                              \
+               uint ## size ## _t _desired = desired;                                                            \
+               uint ## size ## _t _expected = expected;                                                          \
+               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); return _expected; }      \
+               else {                                                                                        \
+                       model_rmwc_action_helper(addr, atomic_index, position); _expected = _old; return _old; }              \
+       })
 
 // atomic_compare_exchange version 1: the CmpOperand (corresponds to expected)
-// extracted from LLVM IR is an integer type. 
+// extracted from LLVM IR is an integer type.
 
-uint8_t cds_atomic_compare_exchange8_v1(void* addr, uint8_t expected, uint8_t desired, 
-                       int atomic_index_succ, int atomic_index_fail, const char *position )
+uint8_t cds_atomic_compare_exchange8_v1(void* addr, uint8_t expected, uint8_t desired,
+                                                                                                                                                               int atomic_index_succ, int atomic_index_fail, const char *position )
 {
-       _ATOMIC_CMPSWP_(8, addr, expected, desired, 
-                               atomic_index_succ, position);
+       _ATOMIC_CMPSWP_(8, addr, expected, desired,
+                                                                       atomic_index_succ, position);
 }
-uint16_t cds_atomic_compare_exchange16_v1(void* addr, uint16_t expected, uint16_t desired, 
-                       int atomic_index_succ, int atomic_index_fail, const char *position)
+uint16_t cds_atomic_compare_exchange16_v1(void* addr, uint16_t expected, uint16_t desired,
+                                                                                                                                                                       int atomic_index_succ, int atomic_index_fail, const char *position)
 {
-       _ATOMIC_CMPSWP_(16, addr, expected, desired, 
-                               atomic_index_succ, position);
+       _ATOMIC_CMPSWP_(16, addr, expected, desired,
+                                                                       atomic_index_succ, position);
 }
-uint32_t cds_atomic_compare_exchange32_v1(void* addr, uint32_t expected, uint32_t desired, 
-                       int atomic_index_succ, int atomic_index_fail, const char *position)
+uint32_t cds_atomic_compare_exchange32_v1(void* addr, uint32_t expected, uint32_t desired,
+                                                                                                                                                                       int atomic_index_succ, int atomic_index_fail, const char *position)
 {
-       _ATOMIC_CMPSWP_(32, addr, expected, desired, 
-                               atomic_index_succ, position);
+       _ATOMIC_CMPSWP_(32, addr, expected, desired,
+                                                                       atomic_index_succ, position);
 }
-uint64_t cds_atomic_compare_exchange64_v1(void* addr, uint64_t expected, uint64_t desired, 
-                       int atomic_index_succ, int atomic_index_fail, const char *position)
+uint64_t cds_atomic_compare_exchange64_v1(void* addr, uint64_t expected, uint64_t desired,
+                                                                                                                                                                       int atomic_index_succ, int atomic_index_fail, const char *position)
 {
-       _ATOMIC_CMPSWP_(64, addr, expected, desired, 
-                               atomic_index_succ, position);
+       _ATOMIC_CMPSWP_(64, addr, expected, desired,
+                                                                       atomic_index_succ, position);
 }
 
 // atomic_compare_exchange version 2
-bool cds_atomic_compare_exchange8_v2(void* addr, uint8_t* expected, uint8_t desired, 
-               int atomic_index_succ, int atomic_index_fail, const char *position )
+bool cds_atomic_compare_exchange8_v2(void* addr, uint8_t* expected, uint8_t desired,
+                                                                                                                                                int atomic_index_succ, int atomic_index_fail, const char *position )
 {
        uint8_t ret = cds_atomic_compare_exchange8_v1(addr, *expected,
-                       desired, atomic_index_succ, atomic_index_fail, position);
+                                                                                                                                                                                               desired, atomic_index_succ, atomic_index_fail, position);
        if (ret == *expected) return true;
-       else return false; 
+       else return false;
 }
-bool cds_atomic_compare_exchange16_v2(void* addr, uint16_t* expected, uint16_t desired, 
-               int atomic_index_succ, int atomic_index_fail, const char *position)
+bool cds_atomic_compare_exchange16_v2(void* addr, uint16_t* expected, uint16_t desired,
+                                                                                                                                                       int atomic_index_succ, int atomic_index_fail, const char *position)
 {
        uint16_t ret = cds_atomic_compare_exchange16_v1(addr, *expected,
-                       desired, atomic_index_succ, atomic_index_fail, position);
+                                                                                                                                                                                                       desired, atomic_index_succ, atomic_index_fail, position);
        if (ret == *expected) return true;
-       else return false; 
+       else return false;
 }
-bool cds_atomic_compare_exchange32_v2(void* addr, uint32_t* expected, uint32_t desired, 
-               int atomic_index_succ, int atomic_index_fail, const char *position)
+bool cds_atomic_compare_exchange32_v2(void* addr, uint32_t* expected, uint32_t desired,
+                                                                                                                                                       int atomic_index_succ, int atomic_index_fail, const char *position)
 {
        uint32_t ret = cds_atomic_compare_exchange32_v1(addr, *expected,
-                       desired, atomic_index_succ, atomic_index_fail, position);
+                                                                                                                                                                                                       desired, atomic_index_succ, atomic_index_fail, position);
        if (ret == *expected) return true;
-       else return false; 
+       else return false;
 }
-bool cds_atomic_compare_exchange64_v2(void* addr, uint64_t* expected, uint64_t desired, 
-               int atomic_index_succ, int atomic_index_fail, const char *position)
+bool cds_atomic_compare_exchange64_v2(void* addr, uint64_t* expected, uint64_t desired,
+                                                                                                                                                       int atomic_index_succ, int atomic_index_fail, const char *position)
 {
        uint64_t ret = cds_atomic_compare_exchange64_v1(addr, *expected,
-                       desired, atomic_index_succ, atomic_index_fail, position);
+                                                                                                                                                                                                       desired, atomic_index_succ, atomic_index_fail, position);
        if (ret == *expected) return true;
-       else return false; 
+       else return false;
 }
 
 
@@ -327,11 +331,11 @@ bool cds_atomic_compare_exchange64_v2(void* addr, uint64_t* expected, uint64_t d
 void cds_atomic_thread_fence(int atomic_index, const char * position) {
        model->switch_to_master(
                new ModelAction(ATOMIC_FENCE, position, orders[atomic_index], FENCE_LOCATION)
-       );
+               );
 }
 
 /*
-#define _ATOMIC_CMPSWP_( __a__, __e__, __m__, __x__ )                         \
+ #define _ATOMIC_CMPSWP_( __a__, __e__, __m__, __x__ )                         \
         ({ volatile __typeof__((__a__)->__f__)* __p__ = & ((__a__)->__f__);   \
                 __typeof__(__e__) __q__ = (__e__);                            \
                 __typeof__(__m__) __v__ = (__m__);                            \
@@ -342,13 +346,13 @@ void cds_atomic_thread_fence(int atomic_index, const char * position) {
                 else {  model_rmwc_action((void *)__p__, __x__); *__q__ = __t__;  __r__ = false;} \
                 __r__; })
 
-#define _ATOMIC_FENCE_( __x__ ) \
+ #define _ATOMIC_FENCE_( __x__ ) \
         ({ model_fence_action(__x__);})
-*/
+ */
 
 /*
 
-#define _ATOMIC_MODIFY_( __a__, __o__, __m__, __x__ )                         \
+ #define _ATOMIC_MODIFY_( __a__, __o__, __m__, __x__ )                         \
         ({ volatile __typeof__((__a__)->__f__)* __p__ = & ((__a__)->__f__);   \
         __typeof__((__a__)->__f__) __old__=(__typeof__((__a__)->__f__)) model_rmwr_action((void *)__p__, __x__); \
         __typeof__(__m__) __v__ = (__m__);                                    \
@@ -356,5 +360,36 @@ void cds_atomic_thread_fence(int atomic_index, const char * position) {
         __copy__ __o__ __v__;                                                 \
         model_rmw_action((void *)__p__, __x__, (uint64_t) __copy__);          \
         __old__ = __old__;  Silence clang (-Wunused-value)                    \
-         })                           
-*/
+         })
+ */
+
+void cds_func_entry(const char * funcName) {
+       if (!model) return;
+
+        Thread * th = thread_current();
+       uint32_t func_id;
+
+       ModelHistory *history = model->get_history();
+       if ( !history->getFuncMap()->contains(funcName) ) {
+               func_id = history->get_func_counter();
+               history->incr_func_counter();
+
+               history->getFuncMap()->put(funcName, func_id);
+       } else {
+               func_id = history->getFuncMap()->get(funcName);
+       }
+
+       history->enter_function(func_id, th->get_id());
+}
+
+void cds_func_exit(const char * funcName) {
+       if (!model) return;
+
+        Thread * th = thread_current();
+       uint32_t func_id;
+
+       ModelHistory *history = model->get_history();
+       func_id = history->getFuncMap()->get(funcName);
+
+       history->exit_function(func_id, th->get_id());
+}