#include "funcnode.h"
-#include <fcntl.h>
FuncNode::FuncNode() :
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_entry->add_predicate_expr(NOPREDICATE, NULL, true);
+}
/* 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);
-
- if (func_inst != NULL)
- return;
-
- func_inst = new FuncInst(act, this);
- inst->get_collisions()->push_back(func_inst);
- inst_list.push_back(func_inst); // delete?
- }
+ ASSERT(inst->get_type() == act->get_type());
+ if (inst->get_location() != act->get_location())
+ inst->not_single_location();
return;
}
/* 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()) {
+ if (func_inst->is_read())
read_act_list.push_back(act);
- act_inst_map.put(act, func_inst);
- }
}
+// model_print("function %s\n", func_name);
update_inst_tree(&inst_list);
- update_predicate_tree(&read_act_list, &act_inst_map);
+ update_predicate_tree(&read_act_list);
+// deep_update(predicate_tree_entry);
+
+ print_predicate_tree();
}
/**
uint64_t FuncNode::query_last_read(void * location, uint32_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 */
if ( !read_map->contains(location) )
- return 0xdeadbeef;
+ return VALUE_NONE;
uint64_t read_val = read_map->get(location);
return read_val;
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;
}
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);
+ SnapVector<Predicate *> * unset_predicates = new SnapVector<Predicate *>();
- bool branch_found = follow_branch(&curr_pred, curr_inst, &read_val_map, &loc_inst_map);
+ 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;
- continue;
- }
+ // no predicate expressions, follow the only branch
+ if (!branch_found && unset_predicates->size() != 0) {
+ ASSERT(unset_predicates->size() == 1);
+ Predicate * one_branch = (*unset_predicates)[0];
+ curr_pred = one_branch;
+ branch_found = true;
+ }
+
+ delete unset_predicates;
+
+ // 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);
-
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);
+ if ( loc_act_map.contains(next_act->get_location()) ) {
+ ModelAction * last_act = loc_act_map.get(next_act->get_location());
+ FuncInst * last_inst = get_inst(last_act);
+
+ Predicate * new_pred1 = new Predicate(next_inst);
+ new_pred1->add_predicate_expr(EQUALITY, last_inst, true);
- Predicate * new_pred2 = new Predicate(curr_inst);
- new_pred2->add_predicate(EQUALITY, curr_inst->get_location(), false);
+ Predicate * new_pred2 = new Predicate(next_inst);
+ new_pred2->add_predicate_expr(EQUALITY, last_inst, 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);
+ new_pred1->set_parent(curr_pred);
+ new_pred2->set_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) )
+ uint64_t last_read = last_act->get_reads_from_value();
+ uint64_t next_read = next_act->get_reads_from_value();
+
+ if ( last_read == next_read )
+ curr_pred = new_pred1;
+ else
+ curr_pred = new_pred2;
+ } else if (!next_inst->is_single_location()) {
+ Predicate * new_pred1 = new Predicate(next_inst);
+ new_pred1->add_predicate_expr(NULLITY, NULL, true);
+
+ Predicate * new_pred2 = new Predicate(next_inst);
+ new_pred2->add_predicate_expr(NULLITY, NULL, false);
+
+ curr_pred->add_child(new_pred1);
+ curr_pred->add_child(new_pred2);
+ new_pred1->set_parent(curr_pred);
+ new_pred2->set_parent(curr_pred);
+
+ uint64_t next_read = next_act->get_reads_from_value();
+ bool isnull = ((void*)next_read == NULL);
+ if (isnull)
curr_pred = new_pred1;
else
curr_pred = new_pred2;
} else {
- Predicate * new_pred = new Predicate(curr_inst);
+ 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;
}
}
- 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();
+void FuncNode::deep_update(Predicate * curr_pred)
+{
+ FuncInst * func_inst = curr_pred->get_func_inst();
+ if (func_inst != NULL && !func_inst->is_single_location()) {
+ bool has_null_pred = false;
+ PredExprSet * pred_expressions = curr_pred->get_pred_expressions();
+ PredExprSetIter * pred_expr_it = pred_expressions->iterator();
+ while (pred_expr_it->hasNext()) {
+ pred_expr * pred_expression = pred_expr_it->next();
+ if (pred_expression->token == NULLITY) {
+ has_null_pred = true;
+ break;
+ }
+ }
+
+ if (!has_null_pred) {
+// func_inst->print();
+ Predicate * another_branch = new Predicate(func_inst);
+ another_branch->copy_predicate_expr(curr_pred);
+ another_branch->add_predicate_expr(NULLITY, NULL, 1);
+ curr_pred->add_predicate_expr(NULLITY, NULL, 0);
+
+ Predicate * parent = curr_pred->get_parent();
+ parent->add_child(another_branch);
+ }
+ }
+
+ ModelVector<Predicate *> * branches = curr_pred->get_children();
+ for (uint i = 0; i < branches->size(); i++) {
+ Predicate * branch = (*branches)[i];
+ deep_update(branch);
+ }
}
-/* 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;
projects / c11tester.git / blobdiff