+#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),
entry_insts(),
predicate_tree_position(),
edge_table(32),
- out_edges(),
- in_edges()
+ 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<action_list_t *>();
read_locations = new loc_set_t();
+ write_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>();
- thrd_inst_act_map = new SnapVector<inst_act_map_t *>();
//values_may_read_from = new value_set_t();
}
/* Reallocate snapshotted memories when new executions start */
void FuncNode::set_new_exec_flag()
{
- for (mllnode<FuncInst *> * it = inst_list.begin(); it != NULL; it = it->getNext()) {
- FuncInst * inst = it->getVal();
- inst->unset_location();
- }
-
action_list_buffer = new SnapList<action_list_t *>();
read_locations = new loc_set_t();
+ write_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>();
- thrd_inst_act_map = new SnapVector<inst_act_map_t *>();
//values_may_read_from = new value_set_t();
}
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();
if (act_list == NULL || act_list->size() == 0)
return;
- HashTable<void *, value_set_t *, uintptr_t, 4> * write_history = history->getWriteHistory();
+ HashTable<void *, value_set_t *, uintptr_t, 0> * write_history = history->getWriteHistory();
/* build inst_list from act_list for later processing */
func_inst_list_t inst_list;
for (sllnode<ModelAction *> * 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,
* 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);
}
}
}
if (act_list == NULL || act_list->size() == 0)
return;
- /* map a FuncInst to the its predicate */
+ /* Map a FuncInst to the its predicate */
HashTable<FuncInst *, Predicate *, uintptr_t, 0> inst_pred_map(128);
- // number FuncInsts to detect loops
+ // Number FuncInsts to detect loops
HashTable<FuncInst *, uint32_t, uintptr_t, 0> inst_id_map(128);
uint32_t inst_counter = 0;
+ /* Only need to store the locations of read actions */
HashTable<void *, ModelAction *, uintptr_t, 0> loc_act_map(128);
HashTable<FuncInst *, ModelAction *, uintptr_t, 0> inst_act_map(128);
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_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();
}
}
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) {
unset_predicates->push_back(branch);
}
- while (pred_expr_it->hasNext()) {
- pred_expr * pred_expression = pred_expr_it->next();
- uint64_t last_read, next_read;
+ ConcretePredicate * concrete_pred = branch->evaluate(inst_act_map, next_act->get_tid());
+ SnapVector<struct concrete_pred_expr> * concrete_exprs = concrete_pred->getExpressions();
+ 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:
break;
}
}
+ delete concrete_pred;
if (predicate_correct) {
*curr_pred = branch;
(*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 */
void FuncNode::init_inst_act_map(thread_id_t tid)
{
int thread_id = id_to_int(tid);
+ SnapVector<inst_act_map_t *> * 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) {
void FuncNode::reset_inst_act_map(thread_id_t tid)
{
int thread_id = id_to_int(tid);
+ SnapVector<inst_act_map_t *> * thrd_inst_act_map = history->getThrdInstActMap(func_id);
+
inst_act_map_t * map = (*thrd_inst_act_map)[thread_id];
map->reset();
}
void FuncNode::update_inst_act_map(thread_id_t tid, ModelAction * read_act)
{
int thread_id = id_to_int(tid);
+ SnapVector<inst_act_map_t *> * 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);
inst_act_map_t * FuncNode::get_inst_act_map(thread_id_t tid)
{
int thread_id = id_to_int(tid);
+ SnapVector<inst_act_map_t *> * thrd_inst_act_map = history->getThrdInstActMap(func_id);
+
return (*thrd_inst_act_map)[thread_id];
}
}
}
-/* Add FuncNodes that come before this node */
-void FuncNode::add_in_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 ( !edge_table.contains(other) ) {
- edge_table.put(other, IN_EDGE);
- in_edges.push_back(other);
- return;
- }
+ if (target == NULL)
+ return -1;
+ else if (target == this)
+ return 0;
- edge_type_t edge = edge_table.get(other);
- if (edge == OUT_EDGE) {
- edge_table.put(other, BI_EDGE);
- in_edges.push_back(other);
+ SnapList<FuncNode *> queue;
+ HashTable<FuncNode *, int, uintptr_t, 0> 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<FuncNode *> * outEdges = curr->get_out_edges();
+ mllnode<FuncNode *> * 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()
{
projects / c11tester.git / blobdiff