X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=funcnode.cc;h=8cb39da9697efbbe0f7a8da397c2988f314f2c57;hp=d328a4c5d24f6753fe0faf9338e153bc7284072a;hb=8eead7359632f3d3e8271df48750da89503a3ef6;hpb=70acabc306bc3014b3698e394908faf23a66a0b8 diff --git a/funcnode.cc b/funcnode.cc index d328a4c5..8cb39da9 100644 --- a/funcnode.cc +++ b/funcnode.cc @@ -1,8 +1,16 @@ +#include "action.h" +#include "history.h" #include "funcnode.h" +#include "funcinst.h" +#include "predicate.h" +#include "concretepredicate.h" + +#include "model.h" FuncNode::FuncNode(ModelHistory * history) : history(history), exit_count(0), + marker(1), func_inst_map(), inst_list(), entry_insts(), @@ -12,6 +20,7 @@ FuncNode::FuncNode(ModelHistory * history) : { predicate_tree_entry = new Predicate(NULL, true); predicate_tree_entry->add_predicate_expr(NOPREDICATE, NULL, true); + predicate_tree_exit = new Predicate(NULL, false, true); // Memories that are reclaimed after each execution action_list_buffer = new SnapList(); @@ -19,7 +28,6 @@ FuncNode::FuncNode(ModelHistory * history) : write_locations = new loc_set_t(); val_loc_map = new HashTable(); loc_may_equal_map = new HashTable(); - thrd_inst_act_map = new SnapVector(); //values_may_read_from = new value_set_t(); } @@ -27,17 +35,11 @@ FuncNode::FuncNode(ModelHistory * history) : /* Reallocate snapshotted memories when new executions start */ void FuncNode::set_new_exec_flag() { - for (mllnode * it = inst_list.begin(); it != NULL; it = it->getNext()) { - FuncInst * inst = it->getVal(); - inst->unset_location(); - } - action_list_buffer = new SnapList(); read_locations = new loc_set_t(); write_locations = new loc_set_t(); val_loc_map = new HashTable(); loc_may_equal_map = new HashTable(); - thrd_inst_act_map = new SnapVector(); //values_may_read_from = new value_set_t(); } @@ -63,10 +65,13 @@ void FuncNode::add_inst(ModelAction *act) FuncInst * inst = func_inst_map.get(position); ASSERT(inst->get_type() == act->get_type()); + int curr_execution_number = model->get_execution_number(); - // locations are set to NULL when new executions start - if (inst->get_location() == NULL) + /* Reset locations when new executions start */ + if (inst->get_execution_number() != curr_execution_number) { inst->set_location(act->get_location()); + inst->set_execution_number(curr_execution_number); + } if (inst->get_location() != act->get_location()) inst->not_single_location(); @@ -136,7 +141,7 @@ void FuncNode::update_tree(action_list_t * act_list) if (act_list == NULL || act_list->size() == 0) return; - HashTable * write_history = history->getWriteHistory(); + HashTable * write_history = history->getWriteHistory(); /* build inst_list from act_list for later processing */ func_inst_list_t inst_list; @@ -160,7 +165,6 @@ void FuncNode::update_tree(action_list_t * act_list) write_locations->add(loc); history->update_loc_wr_func_nodes_map(loc, this); } - } if (act->is_read()) { @@ -178,7 +182,7 @@ void FuncNode::update_tree(action_list_t * act_list) read_locations->add(loc); value_set_t * write_values = write_history->get(loc); add_to_val_loc_map(write_values, loc); - history->update_loc_func_nodes_map(loc, this); + history->update_loc_rd_func_nodes_map(loc, this); } } } @@ -230,6 +234,8 @@ void FuncNode::update_predicate_tree(action_list_t * act_list) if (act_list == NULL || act_list->size() == 0) return; + incr_marker(); + /* Map a FuncInst to the its predicate */ HashTable inst_pred_map(128); @@ -239,16 +245,16 @@ void FuncNode::update_predicate_tree(action_list_t * act_list) /* Only need to store the locations of read actions */ HashTable loc_act_map(128); - HashTable inst_act_map(128); sllnode *it = act_list->begin(); Predicate * curr_pred = predicate_tree_entry; while (it != NULL) { ModelAction * next_act = it->getVal(); FuncInst * next_inst = get_inst(next_act); + next_inst->set_associated_act(next_act, marker); SnapVector unset_predicates = SnapVector(); - bool branch_found = follow_branch(&curr_pred, next_inst, next_act, &inst_act_map, &unset_predicates); + bool branch_found = follow_branch(&curr_pred, next_inst, next_act, &unset_predicates); // A branch with unset predicate expression is detected if (!branch_found && unset_predicates.size() != 0) { @@ -276,7 +282,6 @@ void FuncNode::update_predicate_tree(action_list_t * act_list) curr_pred->add_backedge(back_pred); curr_pred = back_pred; - continue; } } @@ -296,24 +301,25 @@ void FuncNode::update_predicate_tree(action_list_t * act_list) loc_act_map.put(next_act->get_location(), next_act); } - inst_act_map.put(next_inst, next_act); inst_pred_map.put(next_inst, curr_pred); if (!inst_id_map.contains(next_inst)) inst_id_map.put(next_inst, inst_counter++); it = it->getNext(); + curr_pred->incr_expl_count(); } + + curr_pred->set_exit(predicate_tree_exit); } /* Given curr_pred and next_inst, find the branch following curr_pred that * contains next_inst and the correct predicate. * @return true if branch found, false otherwise. */ -bool FuncNode::follow_branch(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act, - HashTable * inst_act_map, - SnapVector * unset_predicates) +bool FuncNode::follow_branch(Predicate ** curr_pred, FuncInst * next_inst, + ModelAction * next_act, SnapVector * unset_predicates) { - /* check if a branch with func_inst and corresponding predicate exists */ + /* Check if a branch with func_inst and corresponding predicate exists */ bool branch_found = false; ModelVector * branches = (*curr_pred)->get_children(); for (uint i = 0; i < branches->size(); i++) { @@ -324,6 +330,7 @@ bool FuncNode::follow_branch(Predicate ** curr_pred, FuncInst * next_inst, Model /* Check against predicate expressions */ bool predicate_correct = true; PredExprSet * pred_expressions = branch->get_pred_expressions(); + PredExprSetIter * pred_expr_it = pred_expressions->iterator(); /* Only read and rmw actions my have unset predicate expressions */ if (pred_expressions->getSize() == 0) { @@ -331,26 +338,33 @@ bool FuncNode::follow_branch(Predicate ** curr_pred, FuncInst * next_inst, Model unset_predicates->push_back(branch); } - SnapVector concrete_exprs = branch->evaluate(inst_act_map); - for (uint i = 0; i < concrete_exprs.size(); i++) { - struct concrete_pred_expr concrete = concrete_exprs[i]; - uint64_t next_read; + while (pred_expr_it->hasNext()) { + pred_expr * pred_expression = pred_expr_it->next(); + uint64_t last_read, next_read; bool equality; - switch (concrete.token) { + switch(pred_expression->token) { case NOPREDICATE: predicate_correct = true; break; case EQUALITY: + FuncInst * to_be_compared; + ModelAction * last_act; + + to_be_compared = pred_expression->func_inst; + last_act = to_be_compared->get_associated_act(marker); + + last_read = last_act->get_reads_from_value(); next_read = next_act->get_reads_from_value(); - equality = (next_read == concrete.value); - if (equality != concrete.equality) + equality = (last_read == next_read); + if (equality != pred_expression->value) predicate_correct = false; + break; case NULLITY: next_read = next_act->get_reads_from_value(); equality = ((void*)next_read == NULL); - if (equality != concrete.equality) + if (equality != pred_expression->value) predicate_correct = false; break; default: @@ -579,6 +593,7 @@ Predicate * FuncNode::get_predicate_tree_position(thread_id_t tid) void FuncNode::init_inst_act_map(thread_id_t tid) { int thread_id = id_to_int(tid); + SnapVector * thrd_inst_act_map = history->getThrdInstActMap(func_id); uint old_size = thrd_inst_act_map->size(); if (thrd_inst_act_map->size() <= (uint) thread_id) { @@ -594,6 +609,8 @@ void FuncNode::init_inst_act_map(thread_id_t tid) void FuncNode::reset_inst_act_map(thread_id_t tid) { int thread_id = id_to_int(tid); + SnapVector * thrd_inst_act_map = history->getThrdInstActMap(func_id); + inst_act_map_t * map = (*thrd_inst_act_map)[thread_id]; map->reset(); } @@ -601,6 +618,8 @@ void FuncNode::reset_inst_act_map(thread_id_t tid) void FuncNode::update_inst_act_map(thread_id_t tid, ModelAction * read_act) { int thread_id = id_to_int(tid); + SnapVector * thrd_inst_act_map = history->getThrdInstActMap(func_id); + inst_act_map_t * map = (*thrd_inst_act_map)[thread_id]; FuncInst * read_inst = get_inst(read_act); map->put(read_inst, read_act); @@ -609,6 +628,8 @@ void FuncNode::update_inst_act_map(thread_id_t tid, ModelAction * read_act) inst_act_map_t * FuncNode::get_inst_act_map(thread_id_t tid) { int thread_id = id_to_int(tid); + SnapVector * thrd_inst_act_map = history->getThrdInstActMap(func_id); + return (*thrd_inst_act_map)[thread_id]; } @@ -628,10 +649,56 @@ void FuncNode::add_out_edge(FuncNode * other) } } +/* Compute the distance between this FuncNode and the target node. + * Return -1 if the target node is unreachable or the actual distance + * is greater than max_step. + */ +int FuncNode::compute_distance(FuncNode * target, int max_step) +{ + if (target == NULL) + return -1; + else if (target == this) + return 0; + + SnapList queue; + HashTable distances(128); + + queue.push_back(this); + distances.put(this, 0); + + while (!queue.empty()) { + FuncNode * curr = queue.front(); + queue.pop_front(); + int dist = distances.get(curr); + + if (max_step <= dist) + return -1; + + ModelList * outEdges = curr->get_out_edges(); + mllnode * it; + for (it = outEdges->begin(); it != NULL; it = it->getNext()) { + FuncNode * out_node = it->getVal(); + + /* This node has not been visited before */ + if ( !distances.contains(out_node) ) { + if (out_node == target) + return dist + 1; + + queue.push_back(out_node); + distances.put(out_node, dist + 1); + } + } + } + + /* Target node is unreachable */ + return -1; +} + void FuncNode::print_predicate_tree() { model_print("digraph function_%s {\n", func_name); predicate_tree_entry->print_pred_subtree(); + predicate_tree_exit->print_predicate(); model_print("}\n"); // end of graph }