X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=funcnode.cc;h=d328a4c5d24f6753fe0faf9338e153bc7284072a;hp=879011602807af25a40864039aa5fff6136d5ad1;hb=70acabc306bc3014b3698e394908faf23a66a0b8;hpb=e9468a45f910f5f2b72847aab656892a97ff41bd diff --git a/funcnode.cc b/funcnode.cc index 87901160..d328a4c5 100644 --- a/funcnode.cc +++ b/funcnode.cc @@ -2,19 +2,21 @@ FuncNode::FuncNode(ModelHistory * history) : history(history), - predicate_tree_initialized(false), exit_count(0), 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); - // memories that are reclaimed after each execution + // Memories that are reclaimed after each execution + 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(); @@ -30,7 +32,9 @@ void FuncNode::set_new_exec_flag() 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(); @@ -136,32 +140,45 @@ void FuncNode::update_tree(action_list_t * act_list) /* build inst_list from act_list for later processing */ func_inst_list_t inst_list; - action_list_t read_act_list; + action_list_t rw_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; + + 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); + } + + } - if (func_inst->is_read()) { - read_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, import all the values that have - * been written to this location from ModelHistory and notify ModelHistory that this - * FuncNode may read from this location. + * The first time an action reads from some location, + * import all the values that have been written to this + * 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_func_nodes_map(loc, this); } } } @@ -170,7 +187,7 @@ void FuncNode::update_tree(action_list_t * act_list) // print_val_loc_map(); update_inst_tree(&inst_list); - update_predicate_tree(&read_act_list); + update_predicate_tree(&rw_act_list); // print_predicate_tree(); } @@ -213,13 +230,14 @@ 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 */ + /* 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); @@ -232,7 +250,7 @@ void FuncNode::update_predicate_tree(action_list_t * act_list) SnapVector unset_predicates = SnapVector(); bool branch_found = follow_branch(&curr_pred, next_inst, next_act, &inst_act_map, &unset_predicates); - // no predicate expressions + // A branch with unset predicate expression is detected if (!branch_found && unset_predicates.size() != 0) { ASSERT(unset_predicates.size() == 1); Predicate * one_branch = unset_predicates[0]; @@ -246,7 +264,7 @@ void FuncNode::update_predicate_tree(action_list_t * act_list) } } - // detect loops + // Detect loops if (!branch_found && inst_id_map.contains(next_inst)) { FuncInst * curr_inst = curr_pred->get_func_inst(); uint32_t curr_id = inst_id_map.get(curr_inst); @@ -263,66 +281,26 @@ void FuncNode::update_predicate_tree(action_list_t * act_list) } } - // generate new branches + // Generate new branches if (!branch_found) { SnapVector half_pred_expressions; - void * loc = next_act->get_location(); - - if ( loc_act_map.contains(loc) ) { - ModelAction * last_act = loc_act_map.get(loc); - FuncInst * last_inst = get_inst(last_act); - struct half_pred_expr * expression = new half_pred_expr(EQUALITY, last_inst); - half_pred_expressions.push_back(expression); - } else if ( next_inst->is_single_location() ){ - loc_set_t * loc_may_equal = loc_may_equal_map->get(loc); - - if (loc_may_equal != NULL) { - loc_set_iter * loc_it = loc_may_equal->iterator(); - while (loc_it->hasNext()) { - void * neighbor = loc_it->next(); - if (loc_act_map.contains(neighbor)) { - ModelAction * last_act = loc_act_map.get(neighbor); - FuncInst * last_inst = get_inst(last_act); - - struct half_pred_expr * expression = new half_pred_expr(EQUALITY, last_inst); - half_pred_expressions.push_back(expression); - } - } - } - } else { - // next_inst is not single location - uint64_t read_val = next_act->get_reads_from_value(); - - // only generate NULLITY predicate when it is actually NULL. - if ( (void*)read_val == NULL) { - struct half_pred_expr * expression = new half_pred_expr(NULLITY, NULL); - half_pred_expressions.push_back(expression); - } - } - - if (half_pred_expressions.size() == 0) { - // no predicate needs to be generated - Predicate * new_pred = new Predicate(next_inst); - curr_pred->add_child(new_pred); - new_pred->set_parent(curr_pred); + infer_predicates(next_inst, next_act, &loc_act_map, &half_pred_expressions); + generate_predicates(&curr_pred, next_inst, &half_pred_expressions); + continue; + } - if (curr_pred->is_entry_predicate()) - new_pred->add_predicate_expr(NOPREDICATE, NULL, true); + if (next_act->is_write()) + curr_pred->set_write(true); - curr_pred = new_pred; - } else { - generate_predicate(&curr_pred, next_inst, &half_pred_expressions); - bool branch_found = follow_branch(&curr_pred, next_inst, next_act, &inst_act_map, NULL); - ASSERT(branch_found); - } + if (next_act->is_read()) { + 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++); - loc_act_map.put(next_act->get_location(), next_act); - inst_act_map.put(next_inst, next_act); it = it->getNext(); } } @@ -343,43 +321,36 @@ 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(); + /* Only read and rmw actions my have unset predicate expressions */ if (pred_expressions->getSize() == 0) { predicate_correct = false; unset_predicates->push_back(branch); } - while (pred_expr_it->hasNext()) { - pred_expr * pred_expression = pred_expr_it->next(); - uint64_t last_read, next_read; + 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; bool equality; - switch(pred_expression->token) { + switch (concrete.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 = inst_act_map->get(to_be_compared); - - last_read = last_act->get_reads_from_value(); next_read = next_act->get_reads_from_value(); - equality = (last_read == next_read); - if (equality != pred_expression->value) + equality = (next_read == concrete.value); + if (equality != concrete.equality) predicate_correct = false; - break; case NULLITY: next_read = next_act->get_reads_from_value(); equality = ((void*)next_read == NULL); - if (equality != pred_expression->value) + if (equality != concrete.equality) predicate_correct = false; break; default: @@ -399,11 +370,73 @@ bool FuncNode::follow_branch(Predicate ** curr_pred, FuncInst * next_inst, Model return branch_found; } +/* Infer predicate expressions, which are generated in FuncNode::generate_predicates */ +void FuncNode::infer_predicates(FuncInst * next_inst, ModelAction * next_act, + HashTable * loc_act_map, + SnapVector * half_pred_expressions) +{ + void * loc = next_act->get_location(); + + if (next_inst->is_read()) { + /* read + rmw */ + if ( loc_act_map->contains(loc) ) { + ModelAction * last_act = loc_act_map->get(loc); + FuncInst * last_inst = get_inst(last_act); + struct half_pred_expr * expression = new half_pred_expr(EQUALITY, last_inst); + half_pred_expressions->push_back(expression); + } else if ( next_inst->is_single_location() ){ + loc_set_t * loc_may_equal = loc_may_equal_map->get(loc); + + if (loc_may_equal != NULL) { + loc_set_iter * loc_it = loc_may_equal->iterator(); + while (loc_it->hasNext()) { + void * neighbor = loc_it->next(); + if (loc_act_map->contains(neighbor)) { + ModelAction * last_act = loc_act_map->get(neighbor); + FuncInst * last_inst = get_inst(last_act); + + struct half_pred_expr * expression = new half_pred_expr(EQUALITY, last_inst); + half_pred_expressions->push_back(expression); + } + } + } + } else { + // next_inst is not single location + uint64_t read_val = next_act->get_reads_from_value(); + + // only infer NULLITY predicate when it is actually NULL. + if ( (void*)read_val == NULL) { + struct half_pred_expr * expression = new half_pred_expr(NULLITY, NULL); + half_pred_expressions->push_back(expression); + } + } + } else { + /* Pure writes */ + // TODO: do anything here? + } +} + /* Able to generate complex predicates when there are multiple predciate expressions */ -void FuncNode::generate_predicate(Predicate ** curr_pred, FuncInst * next_inst, +void FuncNode::generate_predicates(Predicate ** curr_pred, FuncInst * next_inst, SnapVector * half_pred_expressions) { - ASSERT(half_pred_expressions->size() != 0); + if (half_pred_expressions->size() == 0) { + Predicate * new_pred = new Predicate(next_inst); + (*curr_pred)->add_child(new_pred); + new_pred->set_parent(*curr_pred); + + /* entry predicates and predicates containing pure write actions + * have no predicate expressions */ + if ( (*curr_pred)->is_entry_predicate() ) + new_pred->add_predicate_expr(NOPREDICATE, NULL, true); + else if (next_inst->is_write()) { + /* next_inst->is_write() <==> pure writes */ + new_pred->add_predicate_expr(NOPREDICATE, NULL, true); + } + + return; + } + SnapVector predicates; struct half_pred_expr * half_expr = (*half_pred_expressions)[0]; @@ -434,6 +467,12 @@ void FuncNode::generate_predicate(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 */ @@ -513,6 +552,7 @@ void FuncNode::update_loc_may_equal_map(void * new_loc, loc_set_t * old_location } } +/* Every time a thread enters a function, set its position to the predicate tree entry */ void FuncNode::init_predicate_tree_position(thread_id_t tid) { int thread_id = id_to_int(tid); @@ -528,12 +568,14 @@ void FuncNode::set_predicate_tree_position(thread_id_t tid, Predicate * pred) predicate_tree_position[thread_id] = pred; } +/* @return The position of a thread in a predicate tree */ Predicate * FuncNode::get_predicate_tree_position(thread_id_t tid) { int thread_id = id_to_int(tid); return predicate_tree_position[thread_id]; } +/* Make sure elements of thrd_inst_act_map are initialized properly when threads enter functions */ void FuncNode::init_inst_act_map(thread_id_t tid) { int thread_id = id_to_int(tid); @@ -548,6 +590,7 @@ void FuncNode::init_inst_act_map(thread_id_t tid) } } +/* Reset elements of thrd_inst_act_map when threads exit functions */ void FuncNode::reset_inst_act_map(thread_id_t tid) { int thread_id = id_to_int(tid); @@ -569,6 +612,22 @@ inst_act_map_t * FuncNode::get_inst_act_map(thread_id_t tid) 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); + } +} + void FuncNode::print_predicate_tree() { model_print("digraph function_%s {\n", func_name);