X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=funcnode.cc;h=909d4a8d1e891a72d4c9ae4ea0dc6f6fbd295a40;hb=cb94be05c3b0f333821bf9fdd840dea82cba4ed8;hp=64972b4d4d1555a441bc30b7a3306314da9c9fce;hpb=3cc10cd7ba94e6a8eeedd0904c75ee613700a8ff;p=c11tester.git diff --git a/funcnode.cc b/funcnode.cc index 64972b4d..909d4a8d 100644 --- a/funcnode.cc +++ b/funcnode.cc @@ -1,23 +1,33 @@ +#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), - predicate_tree_initialized(false), exit_count(0), + marker(1), func_inst_map(), inst_list(), entry_insts(), - action_list_buffer(), - predicate_tree_position() + predicate_tree_position(), + edge_table(32), + out_edges() { 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 + /* Snapshot data structures below */ + action_list_buffer = new SnapList(); read_locations = new loc_set_t(); - val_loc_map = new HashTable(); + 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(); } @@ -25,24 +35,17 @@ 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(); - val_loc_map = new HashTable(); + 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(); } /* Check whether FuncInst with the same type, position, and location * as act has been added to func_inst_map or not. If not, add it. - * - * Note: currently, actions with the same position are filtered out by process_action, - * so the collision list of FuncInst is not used. May remove it later. */ void FuncNode::add_inst(ModelAction *act) { @@ -55,27 +58,54 @@ void FuncNode::add_inst(ModelAction *act) if (position == NULL) return; - if ( func_inst_map.contains(position) ) { - FuncInst * inst = func_inst_map.get(position); + FuncInst * func_inst = func_inst_map.get(position); + + /* This position has not been inserted into hashtable before */ + if (func_inst == NULL) { + func_inst = create_new_inst(act); + func_inst_map.put(position, func_inst); + return; + } - ASSERT(inst->get_type() == act->get_type()); + /* Volatile variables that use ++ or -- syntax may result in read and write actions with the same position */ + if (func_inst->get_type() != act->get_type()) { + FuncInst * collision_inst = func_inst->search_in_collision(act); - // locations are set to NULL when new executions start - if (inst->get_location() == NULL) - inst->set_location(act->get_location()); + if (collision_inst == NULL) { + collision_inst = create_new_inst(act); + func_inst->add_to_collision(collision_inst); + return; + } else { + func_inst = collision_inst; + } + } - if (inst->get_location() != act->get_location()) - inst->not_single_location(); + ASSERT(func_inst->get_type() == act->get_type()); + int curr_execution_number = model->get_execution_number(); - return; + /* Reset locations when new executions start */ + if (func_inst->get_execution_number() != curr_execution_number) { + func_inst->set_location(act->get_location()); + func_inst->set_execution_number(curr_execution_number); } + /* Mark the memory location of such inst as not unique */ + if (func_inst->get_location() != act->get_location()) + func_inst->not_single_location(); +} + +FuncInst * FuncNode::create_new_inst(ModelAction * act) +{ FuncInst * func_inst = new FuncInst(act, this); + int exec_num = model->get_execution_number(); + func_inst->set_execution_number(exec_num); - func_inst_map.put(position, func_inst); inst_list.push_back(func_inst); + + return func_inst; } + /* Get the FuncInst with the same type, position, and location * as act * @@ -98,14 +128,18 @@ FuncInst * FuncNode::get_inst(ModelAction *act) action_type inst_type = inst->get_type(); action_type act_type = act->get_type(); - // else if branch: an RMWRCAS action is converted to a RMW or READ action - if (inst_type == act_type) + if (inst_type == act_type) { return inst; + } + /* RMWRCAS actions are converted to RMW or READ actions */ else if (inst_type == ATOMIC_RMWRCAS && - (act_type == ATOMIC_RMW || act_type == ATOMIC_READ)) + (act_type == ATOMIC_RMW || act_type == ATOMIC_READ)) { return inst; - - return NULL; + } + /* Return the FuncInst in the collision list */ + else { + return inst->search_in_collision(act); + } } @@ -132,7 +166,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; @@ -141,23 +175,27 @@ void FuncNode::update_tree(action_list_t * act_list) for (sllnode * it = act_list->begin(); it != NULL; it = it->getNext()) { ModelAction * act = it->getVal(); FuncInst * func_inst = get_inst(act); + void * loc = act->get_location(); if (func_inst == NULL) continue; inst_list.push_back(func_inst); + bool act_added = false; - /* NOTE: for rmw actions, func_inst and act may have different - * action types because of action type conversion in ModelExecution - * func_inst->is_write() <==> pure writes (excluding rmw) */ - if (func_inst->is_write()) { - // model_print("write detected\n"); + if (act->is_write()) { rw_act_list.push_back(act); + act_added = true; + if (!write_locations->contains(loc)) { + write_locations->add(loc); + history->update_loc_wr_func_nodes_map(loc, this); + } } - /* func_inst->is_read() <==> read + rmw */ - if (func_inst->is_read()) { - rw_act_list.push_back(act); + if (act->is_read()) { + if (!act_added) + rw_act_list.push_back(act); + /* If func_inst may only read_from a single location, then: * * The first time an action reads from some location, @@ -165,12 +203,11 @@ void FuncNode::update_tree(action_list_t * act_list) * location from ModelHistory and notify ModelHistory * that this FuncNode may read from this location. */ - void * loc = act->get_location(); if (!read_locations->contains(loc) && func_inst->is_single_location()) { read_locations->add(loc); value_set_t * write_values = write_history->get(loc); add_to_val_loc_map(write_values, loc); - history->add_to_loc_func_nodes_map(loc, this); + history->update_loc_rd_func_nodes_map(loc, this); } } } @@ -222,24 +259,27 @@ void FuncNode::update_predicate_tree(action_list_t * act_list) if (act_list == NULL || act_list->size() == 0) return; - /* map a FuncInst to the its predicate */ + incr_marker(); + + /* Map a FuncInst to the its predicate */ HashTable inst_pred_map(128); - // number FuncInsts to detect loops + // Number FuncInsts to detect loops HashTable inst_id_map(128); uint32_t inst_counter = 0; + /* 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) { @@ -267,7 +307,6 @@ void FuncNode::update_predicate_tree(action_list_t * act_list) curr_pred->add_backedge(back_pred); curr_pred = back_pred; - continue; } } @@ -283,25 +322,29 @@ void FuncNode::update_predicate_tree(action_list_t * act_list) if (next_act->is_write()) curr_pred->set_write(true); + if (next_act->is_read()) { + loc_act_map.put(next_act->get_location(), 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++); - loc_act_map.put(next_act->get_location(), next_act); - inst_act_map.put(next_inst, next_act); 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++) { @@ -309,7 +352,7 @@ bool FuncNode::follow_branch(Predicate ** curr_pred, FuncInst * next_inst, Model if (branch->get_func_inst() != next_inst) continue; - /* check against predicate expressions */ + /* Check against predicate expressions */ bool predicate_correct = true; PredExprSet * pred_expressions = branch->get_pred_expressions(); PredExprSetIter * pred_expr_it = pred_expressions->iterator(); @@ -334,7 +377,7 @@ bool FuncNode::follow_branch(Predicate ** curr_pred, FuncInst * next_inst, Model ModelAction * last_act; to_be_compared = pred_expression->func_inst; - last_act = inst_act_map->get(to_be_compared); + 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(); @@ -463,6 +506,12 @@ void FuncNode::generate_predicates(Predicate ** curr_pred, FuncInst * next_inst, (*curr_pred)->add_child(pred); pred->set_parent(*curr_pred); } + + /* Free memories allocated by infer_predicate */ + for (uint i = 0; i < half_pred_expressions->size(); i++) { + struct half_pred_expr * tmp = (*half_pred_expressions)[i]; + snapshot_free(tmp); + } } /* Amend predicates that contain no predicate expressions. Currenlty only amend with NULLITY predicates */ @@ -569,6 +618,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) { @@ -584,6 +634,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(); } @@ -591,6 +643,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); @@ -599,13 +653,77 @@ 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]; } +/* Add FuncNodes that this node may follow */ +void FuncNode::add_out_edge(FuncNode * other) +{ + if ( !edge_table.contains(other) ) { + edge_table.put(other, OUT_EDGE); + out_edges.push_back(other); + return; + } + + edge_type_t edge = edge_table.get(other); + if (edge == IN_EDGE) { + edge_table.put(other, BI_EDGE); + out_edges.push_back(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 }