#include "funcnode.h"
-#include <fcntl.h>
-FuncNode::FuncNode() :
+FuncNode::FuncNode(ModelHistory * history) :
+ history(history),
predicate_tree_initialized(false),
- predicate_tree_entry(new Predicate(NULL, true)),
+ exit_count(0),
func_inst_map(),
inst_list(),
entry_insts(),
- thrd_read_map(),
- predicate_tree_backedges()
-{}
+// thrd_read_map(),
+ action_list_buffer(),
+ predicate_tree_position()
+{
+ predicate_tree_entry = new Predicate(NULL, true);
+ predicate_tree_entry->add_predicate_expr(NOPREDICATE, NULL, true);
+
+ // memories that are reclaimed after each execution
+ read_locations = new loc_set_t();
+ val_loc_map = new HashTable<uint64_t, loc_set_t *, uint64_t, 0>();
+ loc_may_equal_map = new HashTable<void *, loc_set_t *, uintptr_t, 0>();
+ //values_may_read_from = new value_set_t();
+}
+
+/* Reallocate snapshotted memories when new executions start */
+void FuncNode::set_new_exec_flag()
+{
+// for (uint i = 0; i < thrd_read_map.size(); i++)
+// thrd_read_map[i] = new read_map_t();
+
+ for (mllnode<FuncInst *> * it = inst_list.begin(); it != NULL; it = it->getNext()) {
+ FuncInst * inst = it->getVal();
+ inst->unset_location();
+ }
+
+ read_locations = new loc_set_t();
+ val_loc_map = new HashTable<uint64_t, loc_set_t *, uint64_t, 0>();
+ loc_may_equal_map = new HashTable<void *, loc_set_t *, uintptr_t, 0>();
+ //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.
if ( func_inst_map.contains(position) ) {
FuncInst * inst = func_inst_map.get(position);
- if (inst->get_type() != act->get_type() ) {
- // model_print("action with a different type occurs at line number %s\n", position);
- FuncInst * func_inst = inst->search_in_collision(act);
+ ASSERT(inst->get_type() == act->get_type());
- if (func_inst != NULL)
- return;
+ // locations are set to NULL when new executions start
+ if (inst->get_location() == NULL)
+ inst->set_location(act->get_location());
- func_inst = new FuncInst(act, this);
- inst->get_collisions()->push_back(func_inst);
- inst_list.push_back(func_inst); // delete?
- }
+ if (inst->get_location() != act->get_location())
+ inst->not_single_location();
return;
}
*/
void FuncNode::update_tree(action_list_t * act_list)
{
- if (act_list == NULL)
- return;
- else if (act_list->size() == 0)
+ if (act_list == NULL || act_list->size() == 0)
return;
+ HashTable<void *, value_set_t *, uintptr_t, 4> * write_history = history->getWriteHistory();
+
/* build inst_list from act_list for later processing */
func_inst_list_t inst_list;
action_list_t read_act_list;
- HashTable<ModelAction *, FuncInst *, uintptr_t, 4> act_inst_map(128);
for (sllnode<ModelAction *> * it = act_list->begin(); it != NULL; it = it->getNext()) {
ModelAction * act = it->getVal();
inst_list.push_back(func_inst);
-// model_print("position: %s ", act->get_position());
-// act->print();
-
if (func_inst->is_read()) {
read_act_list.push_back(act);
- act_inst_map.put(act, func_inst);
+
+ /* 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)) {
+ 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);
+ }
}
}
+// model_print("function %s\n", func_name);
+// print_val_loc_map();
+
update_inst_tree(&inst_list);
- update_predicate_tree(&read_act_list, &act_inst_map);
+ update_predicate_tree(&read_act_list);
+
+// print_predicate_tree();
}
/**
/* @param tid thread id
* Store the values read by atomic read actions into thrd_read_map */
-void FuncNode::store_read(ModelAction * act, uint32_t tid)
+void FuncNode::store_read(ModelAction * act, thread_id_t tid)
{
+/*
ASSERT(act);
void * location = act->get_location();
uint64_t read_from_val = act->get_reads_from_value();
- /* resize and initialize */
+ // resize and initialize
uint32_t old_size = thrd_read_map.size();
if (old_size <= tid) {
thrd_read_map.resize(tid + 1);
read_map_t * read_map = thrd_read_map[tid];
read_map->put(location, read_from_val);
-
- /* Store the memory locations where atomic reads happen */
- // read_locations.add(location);
+*/
}
-uint64_t FuncNode::query_last_read(void * location, uint32_t tid)
+uint64_t FuncNode::query_last_read(void * location, thread_id_t tid)
{
+/*
if (thrd_read_map.size() <= tid)
- return 0xdeadbeef;
+ return VALUE_NONE;
read_map_t * read_map = thrd_read_map[tid];
- /* last read value not found */
+ // last read value not found
if ( !read_map->contains(location) )
- return 0xdeadbeef;
+ return VALUE_NONE;
uint64_t read_val = read_map->get(location);
return read_val;
+*/
}
/* @param tid thread id
* Reset read map for a thread. This function shall only be called
* when a thread exits a function
*/
-void FuncNode::clear_read_map(uint32_t tid)
+void FuncNode::clear_read_map(thread_id_t tid)
{
+/*
if (thrd_read_map.size() <= tid)
return;
thrd_read_map[tid]->reset();
+*/
}
-void FuncNode::update_predicate_tree(action_list_t * act_list, HashTable<ModelAction *, FuncInst *, uintptr_t, 4> * act_inst_map)
+void FuncNode::update_predicate_tree(action_list_t * act_list)
{
if (act_list == NULL || act_list->size() == 0)
return;
-/*
- if (predicate_tree_initialized) {
- return;
- }
- predicate_tree_initialized = true;
-*/
- /* map a FuncInst to the parent of its predicate */
+ /* map a FuncInst to the its predicate */
HashTable<FuncInst *, Predicate *, uintptr_t, 0> inst_pred_map(128);
- HashTable<FuncInst *, uint64_t, uintptr_t, 4> read_val_map(128);
- HashTable<void *, FuncInst *, uintptr_t, 4> loc_inst_map(128);
+
+ // number FuncInsts to detect loops
+ HashTable<FuncInst *, uint32_t, uintptr_t, 0> inst_id_map(128);
+ uint32_t inst_counter = 0;
+
+ HashTable<void *, ModelAction *, uintptr_t, 0> loc_act_map(128);
+ HashTable<FuncInst *, ModelAction *, uintptr_t, 0> inst_act_map(128);
sllnode<ModelAction *> *it = act_list->begin();
Predicate * curr_pred = predicate_tree_entry;
-
while (it != NULL) {
- ModelAction * curr_act = it->getVal();
- FuncInst * curr_inst = act_inst_map->get(curr_act);
- Predicate * old_pred = curr_pred;
- read_val_map.put(curr_inst, curr_act->get_reads_from_value());
+ ModelAction * next_act = it->getVal();
+ FuncInst * next_inst = get_inst(next_act);
- bool branch_found = follow_branch(&curr_pred, curr_inst, &read_val_map, &loc_inst_map);
+ SnapVector<Predicate *> unset_predicates = SnapVector<Predicate *>();
+ bool branch_found = follow_branch(&curr_pred, next_inst, next_act, &inst_act_map, &unset_predicates);
- // check back edges
- if (!branch_found) {
- Predicate * back_pred = curr_pred->get_backedge();
- if (back_pred != NULL) {
- curr_pred = back_pred;
+ // no predicate expressions
+ if (!branch_found && unset_predicates.size() != 0) {
+ ASSERT(unset_predicates.size() == 1);
+ Predicate * one_branch = unset_predicates[0];
+
+ bool amended = amend_predicate_expr(&curr_pred, next_inst, next_act);
+ if (amended)
continue;
+ else {
+ curr_pred = one_branch;
+ branch_found = true;
}
+ }
+
+ // 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);
+ uint32_t next_id = inst_id_map.get(next_inst);
- if (inst_pred_map.contains(curr_inst)) {
- back_pred = inst_pred_map.get(curr_inst);
- curr_pred->set_backedge(back_pred);
+ if (curr_id >= next_id) {
+ Predicate * old_pred = inst_pred_map.get(next_inst);
+ Predicate * back_pred = old_pred->get_parent();
+
+ curr_pred->add_backedge(back_pred);
curr_pred = back_pred;
+
continue;
}
}
- if (!inst_pred_map.contains(curr_inst))
- inst_pred_map.put(curr_inst, old_pred);
-
+ // generate new branches
if (!branch_found) {
- if ( loc_inst_map.contains(curr_inst->get_location()) ) {
- Predicate * new_pred1 = new Predicate(curr_inst);
- new_pred1->add_predicate(EQUALITY, curr_inst->get_location(), true);
-
- Predicate * new_pred2 = new Predicate(curr_inst);
- new_pred2->add_predicate(EQUALITY, curr_inst->get_location(), false);
-
- curr_pred->add_child(new_pred1);
- curr_pred->add_child(new_pred2);
- //new_pred1->add_parent(curr_pred);
- //new_pred2->add_parent(curr_pred);
-
- FuncInst * last_inst = loc_inst_map.get(curr_inst->get_location());
- uint64_t last_read = read_val_map.get(last_inst);
- if ( last_read == read_val_map.get(curr_inst) )
- curr_pred = new_pred1;
- else
- curr_pred = new_pred2;
+ SnapVector<struct half_pred_expr *> 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 {
- Predicate * new_pred = new Predicate(curr_inst);
+ // 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->add_parent(curr_pred);
+ new_pred->set_parent(curr_pred);
+
+ if (curr_pred->is_entry_predicate())
+ new_pred->add_predicate_expr(NOPREDICATE, NULL, 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);
}
}
- loc_inst_map.put(curr_inst->get_location(), curr_inst);
+ 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();
}
-
- model_print("function %s\n", func_name);
- print_predicate_tree();
}
-/* Given curr_pred and next_inst, find the branch following curr_pred that contains next_inst and the correct predicate
+/* 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,
- HashTable<FuncInst *, uint64_t, uintptr_t, 4> * read_val_map, HashTable<void *, FuncInst *, uintptr_t, 4> * loc_inst_map)
+bool FuncNode::follow_branch(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act,
+ HashTable<FuncInst *, ModelAction *, uintptr_t, 0> * inst_act_map,
+ SnapVector<Predicate *> * unset_predicates)
{
/* check if a branch with func_inst and corresponding predicate exists */
bool branch_found = false;
if (branch->get_func_inst() != next_inst)
continue;
+ /* check against predicate expressions */
+ bool predicate_correct = true;
PredExprSet * pred_expressions = branch->get_pred_expressions();
+ PredExprSetIter * pred_expr_it = pred_expressions->iterator();
- /* no predicate, follow the only branch */
if (pred_expressions->getSize() == 0) {
-// model_print("no predicate exists: "); next_inst->print();
- *curr_pred = branch;
- branch_found = true;
- break;
+ predicate_correct = false;
+ unset_predicates->push_back(branch);
}
- PredExprSetIter * pred_expr_it = pred_expressions->iterator();
while (pred_expr_it->hasNext()) {
pred_expr * pred_expression = pred_expr_it->next();
uint64_t last_read, next_read;
- FuncInst * last_inst;
bool equality;
switch(pred_expression->token) {
+ case NOPREDICATE:
+ predicate_correct = true;
+ break;
case EQUALITY:
- last_inst = loc_inst_map->get(next_inst->get_location());
- last_read = read_val_map->get(last_inst);
- next_read = read_val_map->get(next_inst);
+ 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)
+ predicate_correct = false;
- if (equality == pred_expression->value) {
- *curr_pred = branch;
-// model_print("predicate: token: %d, location: %p, value: %d - ", pred_expression->token, pred_expression->location, pred_expression->value); next_inst->print();
- branch_found = true;
- }
break;
case NULLITY:
+ next_read = next_act->get_reads_from_value();
+ equality = ((void*)next_read == NULL);
+ if (equality != pred_expression->value)
+ predicate_correct = false;
break;
default:
+ predicate_correct = false;
model_print("unkown predicate token\n");
break;
}
}
+ if (predicate_correct) {
+ *curr_pred = branch;
+ branch_found = true;
+ break;
+ }
}
return branch_found;
}
+/* Able to generate complex predicates when there are multiple predciate expressions */
+void FuncNode::generate_predicate(Predicate ** curr_pred, FuncInst * next_inst,
+ SnapVector<struct half_pred_expr *> * half_pred_expressions)
+{
+ ASSERT(half_pred_expressions->size() != 0);
+ SnapVector<Predicate *> predicates;
+
+ struct half_pred_expr * half_expr = (*half_pred_expressions)[0];
+ predicates.push_back(new Predicate(next_inst));
+ predicates.push_back(new Predicate(next_inst));
+
+ predicates[0]->add_predicate_expr(half_expr->token, half_expr->func_inst, true);
+ predicates[1]->add_predicate_expr(half_expr->token, half_expr->func_inst, false);
+
+ for (uint i = 1; i < half_pred_expressions->size(); i++) {
+ half_expr = (*half_pred_expressions)[i];
+
+ uint old_size = predicates.size();
+ for (uint j = 0; j < old_size; j++) {
+ Predicate * pred = predicates[j];
+ Predicate * new_pred = new Predicate(next_inst);
+ new_pred->copy_predicate_expr(pred);
+
+ pred->add_predicate_expr(half_expr->token, half_expr->func_inst, true);
+ new_pred->add_predicate_expr(half_expr->token, half_expr->func_inst, false);
+
+ predicates.push_back(new_pred);
+ }
+ }
+
+ for (uint i = 0; i < predicates.size(); i++) {
+ Predicate * pred= predicates[i];
+ (*curr_pred)->add_child(pred);
+ pred->set_parent(*curr_pred);
+ }
+}
+
+/* Amend predicates that contain no predicate expressions. Currenlty only amend with NULLITY predicates */
+bool FuncNode::amend_predicate_expr(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act)
+{
+ // there should only be only child
+ Predicate * unset_pred = (*curr_pred)->get_children()->back();
+ uint64_t read_val = next_act->get_reads_from_value();
+
+ // only generate NULLITY predicate when it is actually NULL.
+ if ( !next_inst->is_single_location() && (void*)read_val == NULL ) {
+ Predicate * new_pred = new Predicate(next_inst);
+
+ (*curr_pred)->add_child(new_pred);
+ new_pred->set_parent(*curr_pred);
+
+ unset_pred->add_predicate_expr(NULLITY, NULL, false);
+ new_pred->add_predicate_expr(NULLITY, NULL, true);
+
+ return true;
+ }
+
+ return false;
+}
+
+void FuncNode::add_to_val_loc_map(uint64_t val, void * loc)
+{
+ loc_set_t * locations = val_loc_map->get(val);
+
+ if (locations == NULL) {
+ locations = new loc_set_t();
+ val_loc_map->put(val, locations);
+ }
+
+ update_loc_may_equal_map(loc, locations);
+ locations->add(loc);
+ // values_may_read_from->add(val);
+}
+
+void FuncNode::add_to_val_loc_map(value_set_t * values, void * loc)
+{
+ value_set_iter * it = values->iterator();
+ while (it->hasNext()) {
+ uint64_t val = it->next();
+ add_to_val_loc_map(val, loc);
+ }
+}
+
+void FuncNode::update_loc_may_equal_map(void * new_loc, loc_set_t * old_locations)
+{
+ loc_set_t * neighbors = loc_may_equal_map->get(new_loc);
+
+ if (neighbors == NULL) {
+ neighbors = new loc_set_t();
+ loc_may_equal_map->put(new_loc, neighbors);
+ }
+
+ loc_set_iter * loc_it = old_locations->iterator();
+ while (loc_it->hasNext()) {
+ // new_loc: { old_locations, ... }
+ void * member = loc_it->next();
+ neighbors->add(member);
+
+ // for each i in old_locations, i : { new_loc, ... }
+ loc_set_t * _neighbors = loc_may_equal_map->get(member);
+ if (_neighbors == NULL) {
+ _neighbors = new loc_set_t();
+ loc_may_equal_map->put(member, _neighbors);
+ }
+ _neighbors->add(new_loc);
+ }
+}
+
+void FuncNode::init_predicate_tree_position(thread_id_t tid)
+{
+ uint thread_id = id_to_int(tid);
+ if (predicate_tree_position.size() <= thread_id)
+ predicate_tree_position.resize(thread_id + 1);
+
+ predicate_tree_position[thread_id] = predicate_tree_entry;
+}
+
+void FuncNode::unset_predicate_tree_position(thread_id_t tid)
+{
+ uint thread_id = id_to_int(tid);
+ predicate_tree_position[thread_id] = NULL;
+}
+
void FuncNode::print_predicate_tree()
{
model_print("digraph function_%s {\n", func_name);
model_print("}\n"); // end of graph
}
+void FuncNode::print_val_loc_map()
+{
+/*
+ value_set_iter * val_it = values_may_read_from->iterator();
+ while (val_it->hasNext()) {
+ uint64_t value = val_it->next();
+ model_print("val %llx: ", value);
+
+ loc_set_t * locations = val_loc_map->get(value);
+ loc_set_iter * loc_it = locations->iterator();
+ while (loc_it->hasNext()) {
+ void * location = loc_it->next();
+ model_print("%p ", location);
+ }
+ model_print("\n");
+ }
+*/
+}
+
/* @param tid thread id
* Print the values read by the last read actions for each memory location
*/
/*
-void FuncNode::print_last_read(uint32_t tid)
+void FuncNode::print_last_read(thread_id_t tid)
{
ASSERT(thrd_read_map.size() > tid);
read_map_t * read_map = thrd_read_map[tid];
projects / c11tester.git / blobdiff