X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.cc;h=d5425e335dad86614b4e09db71717e0b00dfe2d2;hb=853980671c72b78d59fe05245fc8f49bdf5b8b70;hp=69f0b5f513640f5861c6c3bf117c73fc440c7da6;hpb=bd893aac350f125dc990f0ccd32b8e3cf133e2fb;p=cdsspec-compiler.git diff --git a/nodestack.cc b/nodestack.cc index 69f0b5f..d5425e3 100644 --- a/nodestack.cc +++ b/nodestack.cc @@ -1,3 +1,5 @@ +#include + #include "nodestack.h" #include "action.h" #include "common.h" @@ -17,26 +19,56 @@ * @param nthreads The number of threads which exist at this point in the * execution trace. */ -Node::Node(ModelAction *act, Node *par, int nthreads, bool *enabled) +Node::Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness) : action(act), parent(par), num_threads(nthreads), explored_children(num_threads), backtrack(num_threads), + fairness(num_threads), numBacktracks(0), + enabled_array(NULL), may_read_from(), read_from_index(0), future_values(), future_index(-1) { - if (act) + if (act) { act->set_node(this); - enabled_array=(bool *)MYMALLOC(sizeof(bool)*num_threads); - if (enabled) - memcpy(enabled_array, enabled, sizeof(bool)*num_threads); - else - for(int i=0;iget_tid()); + int prevtid=(prevfairness != NULL)?id_to_int(prevfairness->action->get_tid()):0; + + if ( model->params.fairwindow != 0 ) { + for(int i=0;iget_num_threads())?&par->fairness[i]:NULL; + if (prevfi) { + *fi=*prevfi; + } + if (parent->enabled_array[i]) { + fi->enabled_count++; + } + if (i==currtid) { + fi->turns++; + fi->priority = false; + } + //Do window processing + if (prevfairness != NULL) { + if (prevfairness -> parent->enabled_array[i]) + fi->enabled_count--; + if (i==prevtid) { + fi->turns--; + } + //Need full window to start evaluating conditions + //If we meet the enabled count and have no turns, give us priority + if ((fi->enabled_count >= model->params.enabledcount) && + (fi->turns == 0)) + fi->priority = true; + } + } + } + } } /** @brief Node desctructor */ @@ -44,7 +76,8 @@ Node::~Node() { if (action) delete action; - MYFREE(enabled_array); + if (enabled_array) + model_free(enabled_array); } /** Prints debugging info for the ModelAction associated with this Node */ @@ -88,6 +121,8 @@ bool Node::get_promise(unsigned int i) { * @return true if we have a valid combination. */ bool Node::increment_promise() { + DBG(); + for (unsigned int i = 0; i < promises.size(); i++) { if (promises[i] == PROMISE_UNFULFILLED) { promises[i] = PROMISE_FULFILLED; @@ -123,7 +158,7 @@ bool Node::add_future_value(uint64_t value, modelclock_t expiration) { if (future_values[i].value == value) { if (future_values[i].expiration>=expiration) return false; - if (future_index < i) { + if (future_index < ((int) i)) { suitableindex=i; } } @@ -143,7 +178,7 @@ bool Node::add_future_value(uint64_t value, modelclock_t expiration) { * @return true if the future_values set is empty. */ bool Node::future_value_empty() { - return ((future_index + 1) >= future_values.size()); + return ((future_index + 1) >= ((int)future_values.size())); } /** @@ -180,8 +215,17 @@ bool Node::read_from_empty() { * Mark the appropriate backtracking information for exploring a thread choice. * @param act The ModelAction to explore */ -void Node::explore_child(ModelAction *act) +void Node::explore_child(ModelAction *act, bool * is_enabled) { + if ( ! enabled_array ) + enabled_array=(bool *)model_malloc(sizeof(bool)*num_threads); + if (is_enabled != NULL) + memcpy(enabled_array, is_enabled, sizeof(bool)*num_threads); + else { + for(int i=0;iget_tid()); } @@ -223,6 +267,12 @@ bool Node::is_enabled(Thread *t) return thread_id < num_threads && enabled_array[thread_id]; } +bool Node::is_enabled(thread_id_t tid) +{ + int thread_id=id_to_int(tid); + return thread_id < num_threads && enabled_array[thread_id]; +} + /** * Add an action to the may_read_from set. * @param act is the action to add @@ -238,12 +288,12 @@ void Node::add_read_from(const ModelAction *act) * @return The first element in future_values */ uint64_t Node::get_future_value() { - ASSERT(future_indexerase(start, end); -} - NodeStack::NodeStack() : total_nodes(0) { node_list.push_back(new Node()); total_nodes++; - iter = node_list.begin(); + iter = 0; } NodeStack::~NodeStack() { - clear_node_list(&node_list, node_list.begin(), node_list.end()); } void NodeStack::print() { - node_list_t::iterator it; printf("............................................\n"); printf("NodeStack printing node_list:\n"); - for (it = node_list.begin(); it != node_list.end(); it++) { + for (unsigned int it = 0; it < node_list.size(); it++) { if (it == this->iter) printf("vvv following action is the current iterator vvv\n"); - (*it)->print(); + node_list[it]->print(); } printf("............................................\n"); } -ModelAction * NodeStack::explore_action(ModelAction *act, bool * enabled) +/** Note: The is_enabled set contains what actions were enabled when + * act was chosen. */ + +ModelAction * NodeStack::explore_action(ModelAction *act, bool * is_enabled) { DBG(); ASSERT(!node_list.empty()); - node_list_t::iterator it=iter; - it++; - if (it != node_list.end()) { + if ((iter+1) < node_list.size()) { iter++; - return (*iter)->get_action(); + return node_list[iter]->get_action(); } /* Record action */ - get_head()->explore_child(act); - node_list.push_back(new Node(act, get_head(), model->get_num_threads(), enabled)); + get_head()->explore_child(act, is_enabled); + Node *prevfairness = NULL; + if ( model->params.fairwindow != 0 && iter > model->params.fairwindow ) { + prevfairness = node_list[iter-model->params.fairwindow]; + } + node_list.push_back(new Node(act, get_head(), model->get_num_threads(), prevfairness)); total_nodes++; iter++; return NULL; @@ -364,35 +417,34 @@ ModelAction * NodeStack::explore_action(ModelAction *act, bool * enabled) void NodeStack::pop_restofstack(int numAhead) { /* Diverging from previous execution; clear out remainder of list */ - node_list_t::iterator it = iter; - while (numAhead--) - it++; - clear_node_list(&node_list, it, node_list.end()); + unsigned int it=iter+numAhead; + for(unsigned int i=it;i