X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.cc;h=14160052d24cac65f75161f5a152c6b1f3f4200d;hp=76f18dd07fdf06ae6ac509c5e62bf55585e57c02;hb=0229244d21ca78bf781e41684810e9fb6d5ca56c;hpb=f1ba5c8c393c310e2210cbfb74020bec67fa6934 diff --git a/action.cc b/action.cc index 76f18dd0..14160052 100644 --- a/action.cc +++ b/action.cc @@ -1,6 +1,7 @@ #include #define __STDC_FORMAT_MACROS #include +#include #include "model.h" #include "action.h" @@ -8,6 +9,7 @@ #include "common.h" #include "threads-model.h" #include "nodestack.h" +#include "wildcard.h" #define ACTION_INITIAL_CLOCK 0 @@ -33,6 +35,7 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value, Thread *thread) : type(type), order(order), + original_order(order), location(loc), value(value), reads_from(NULL), @@ -85,7 +88,7 @@ bool ModelAction::is_thread_start() const bool ModelAction::is_thread_join() const { - return type == THREAD_JOIN; + return type == THREAD_JOIN || type == PTHREAD_JOIN; } bool ModelAction::is_relseq_fixup() const @@ -191,6 +194,11 @@ bool ModelAction::is_initialization() const return type == ATOMIC_INIT; } +bool ModelAction::is_annotation() const +{ + return type == ATOMIC_ANNOTATION; +} + bool ModelAction::is_relaxed() const { return order == std::memory_order_relaxed; @@ -269,13 +277,18 @@ void ModelAction::copy_typeandorder(ModelAction * act) Thread * ModelAction::get_thread_operand() const { if (type == THREAD_CREATE) { - /* THREAD_CREATE stores its (Thread *) in a thrd_t::priv */ - thrd_t *thrd = (thrd_t *)get_location(); - return thrd->priv; - } else if (type == THREAD_JOIN) + /* thread_operand is set in execution.cc */ + return thread_operand; + } else if (type == PTHREAD_CREATE) { + return thread_operand; + } else if (type == THREAD_JOIN) { /* THREAD_JOIN uses (Thread *) for location */ return (Thread *)get_location(); - else + } else if (type == PTHREAD_JOIN) { + // return NULL; + // thread_operand is stored in execution::pthread_map; + return (Thread *)get_location(); + } else return NULL; } @@ -322,7 +335,7 @@ bool ModelAction::could_synchronize_with(const ModelAction *act) const return false; // Different locations commute - if (!same_var(act)) + if (!same_var(act) && !is_fence() && !act->is_fence()) return false; // Explore interleavings of seqcst writes/fences to guarantee total @@ -474,10 +487,23 @@ Node * ModelAction::get_node() const void ModelAction::set_read_from(const ModelAction *act) { ASSERT(act); + reads_from = act; reads_from_promise = NULL; - if (act->is_uninitialized()) - model->assert_bug("May read from uninitialized atomic\n"); + + if (act->is_uninitialized()) { // WL + uint64_t val = *((uint64_t *) location); + ModelAction * act_initialized = (ModelAction *)act; + act_initialized->set_value(val); + reads_from = (const ModelAction *)act_initialized; + +// disabled by WL, because LLVM IR is unable to detect atomic init +/* model->assert_bug("May read from uninitialized atomic:\n" + " action %d, thread %d, location %p (%s, %s)", + seq_number, id_to_int(tid), location, + get_type_str(), get_mo_str()); +*/ + } } /** @@ -501,7 +527,6 @@ bool ModelAction::synchronize_with(const ModelAction *act) { if (*this < *act) return false; - model->check_promises(act->get_tid(), cv, act->cv); cv->merge(act->cv); return true; } @@ -522,115 +547,74 @@ bool ModelAction::happens_before(const ModelAction *act) const return act->cv->synchronized_since(this); } -/** @brief Print nicely-formatted info about this ModelAction */ -void ModelAction::print() const +const char * ModelAction::get_type_str() const { - const char *type_str, *mo_str; switch (this->type) { - case MODEL_FIXUP_RELSEQ: - type_str = "relseq fixup"; - break; - case THREAD_CREATE: - type_str = "thread create"; - break; - case THREAD_START: - type_str = "thread start"; - break; - case THREAD_YIELD: - type_str = "thread yield"; - break; - case THREAD_JOIN: - type_str = "thread join"; - break; - case THREAD_FINISH: - type_str = "thread finish"; - break; - case ATOMIC_UNINIT: - type_str = "uninitialized"; - break; - case ATOMIC_READ: - type_str = "atomic read"; - break; - case ATOMIC_WRITE: - type_str = "atomic write"; - break; - case ATOMIC_RMW: - type_str = "atomic rmw"; - break; - case ATOMIC_FENCE: - type_str = "fence"; - break; - case ATOMIC_RMWR: - type_str = "atomic rmwr"; - break; - case ATOMIC_RMWC: - type_str = "atomic rmwc"; - break; - case ATOMIC_INIT: - type_str = "init atomic"; - break; - case ATOMIC_LOCK: - type_str = "lock"; - break; - case ATOMIC_UNLOCK: - type_str = "unlock"; - break; - case ATOMIC_TRYLOCK: - type_str = "trylock"; - break; - case ATOMIC_WAIT: - type_str = "wait"; - break; - case ATOMIC_NOTIFY_ONE: - type_str = "notify one"; - break; - case ATOMIC_NOTIFY_ALL: - type_str = "notify all"; - break; - default: - type_str = "unknown type"; - } - + case MODEL_FIXUP_RELSEQ: return "relseq fixup"; + case THREAD_CREATE: return "thread create"; + case THREAD_START: return "thread start"; + case THREAD_YIELD: return "thread yield"; + case THREAD_JOIN: return "thread join"; + case THREAD_FINISH: return "thread finish"; + + case PTHREAD_CREATE: return "pthread create"; + case PTHREAD_JOIN: return "pthread join"; + + case ATOMIC_UNINIT: return "uninitialized"; + case ATOMIC_READ: return "atomic read"; + case ATOMIC_WRITE: return "atomic write"; + case ATOMIC_RMW: return "atomic rmw"; + case ATOMIC_FENCE: return "fence"; + case ATOMIC_RMWR: return "atomic rmwr"; + case ATOMIC_RMWC: return "atomic rmwc"; + case ATOMIC_INIT: return "init atomic"; + case ATOMIC_LOCK: return "lock"; + case ATOMIC_UNLOCK: return "unlock"; + case ATOMIC_TRYLOCK: return "trylock"; + case ATOMIC_WAIT: return "wait"; + case ATOMIC_NOTIFY_ONE: return "notify one"; + case ATOMIC_NOTIFY_ALL: return "notify all"; + case ATOMIC_ANNOTATION: return "annotation"; + default: return "unknown type"; + }; +} + +const char * ModelAction::get_mo_str() const +{ switch (this->order) { - case std::memory_order_relaxed: - mo_str = "relaxed"; - break; - case std::memory_order_acquire: - mo_str = "acquire"; - break; - case std::memory_order_release: - mo_str = "release"; - break; - case std::memory_order_acq_rel: - mo_str = "acq_rel"; - break; - case std::memory_order_seq_cst: - mo_str = "seq_cst"; - break; - default: - mo_str = "unknown"; - break; + case std::memory_order_relaxed: return "relaxed"; + case std::memory_order_acquire: return "acquire"; + case std::memory_order_release: return "release"; + case std::memory_order_acq_rel: return "acq_rel"; + case std::memory_order_seq_cst: return "seq_cst"; + default: return "unknown"; } +} + +/** @brief Print nicely-formatted info about this ModelAction */ +void ModelAction::print() const +{ + const char *type_str = get_type_str(), *mo_str = get_mo_str(); - model_print("(%4d) Thread: %-2d Action: %-13s MO: %7s Loc: %14p Value: %-#18" PRIx64, + model_print("%-4d %-2d %-14s %7s %14p %-#18" PRIx64, seq_number, id_to_int(tid), type_str, mo_str, location, get_return_value()); if (is_read()) { if (reads_from) - model_print(" Rf: %-3d", reads_from->get_seq_number()); + model_print(" %-3d", reads_from->get_seq_number()); else if (reads_from_promise) { - int idx = model->get_promise_number(reads_from_promise); + int idx = reads_from_promise->get_index(); if (idx >= 0) - model_print(" Rf: P%-2d", idx); + model_print(" P%-2d", idx); else - model_print(" Rf: P? "); + model_print(" P? "); } else - model_print(" Rf: ? "); + model_print(" ? "); } if (cv) { if (is_read()) model_print(" "); else - model_print(" "); + model_print(" "); cv->print(); } else model_print("\n"); @@ -648,7 +632,7 @@ unsigned int ModelAction::hash() const if (reads_from) hash ^= reads_from->get_seq_number(); else if (reads_from_promise) - hash ^= model->get_promise_number(reads_from_promise); + hash ^= reads_from_promise->get_index(); hash ^= get_reads_from_value(); } return hash; @@ -684,12 +668,12 @@ bool ModelAction::may_read_from(const Promise *promise) const * Only valid for LOCK, TRY_LOCK, UNLOCK, and WAIT operations. * @return The mutex operated on by this action, if any; otherwise NULL */ -std::mutex * ModelAction::get_mutex() const +cdsc::mutex * ModelAction::get_mutex() const { if (is_trylock() || is_lock() || is_unlock()) - return (std::mutex *)get_location(); + return (cdsc::mutex *)get_location(); else if (is_wait()) - return (std::mutex *)get_value(); + return (cdsc::mutex *)get_value(); else return NULL; }