FuncNode::FuncNode(ModelHistory * history) :
history(history),
exit_count(0),
+ inst_counter(1),
marker(1),
+ thrd_marker(),
func_inst_map(),
inst_list(),
entry_insts(),
- inst_pred_map(128),
- inst_id_map(128),
- loc_act_map(128),
+ thrd_inst_pred_map(),
+ thrd_inst_id_map(),
+ thrd_loc_inst_map(),
predicate_tree_position(),
predicate_leaves(),
+ leaves_tmp_storage(),
+ weight_debug_vec(),
+ failed_predicates(),
edge_table(32),
out_edges()
{
predicate_tree_exit->set_depth(MAX_DEPTH);
/* Snapshot data structures below */
- 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, snapshot_malloc, snapshot_calloc, snapshot_free, int64_hash>();
/* Reallocate snapshotted memories when new executions start */
void FuncNode::set_new_exec_flag()
{
- 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, snapshot_malloc, snapshot_calloc, snapshot_free, int64_hash>();
}
}
-
void FuncNode::add_entry_inst(FuncInst * inst)
{
if (inst == NULL)
entry_insts.push_back(inst);
}
+void FuncNode::function_entry_handler(thread_id_t tid)
+{
+ set_marker(tid);
+ set_predicate_tree_position(tid, predicate_tree_entry);
+ init_inst_act_map(tid);
+ init_maps(tid);
+}
+
+void FuncNode::function_exit_handler(thread_id_t tid)
+{
+ exit_count++;
+
+ reset_inst_act_map(tid);
+ reset_maps(tid);
+
+ Predicate * exit_pred = get_predicate_tree_position(tid);
+ if (exit_pred->get_exit() == NULL) {
+ // Exit predicate is unset yet
+ exit_pred->set_exit(predicate_tree_exit);
+ }
+
+ set_predicate_tree_position(tid, NULL);
+}
+
/**
* @brief Convert ModelAdtion list to FuncInst list
* @param act_list A list of ModelActions
*/
-void FuncNode::update_tree(action_list_t * act_list)
+void FuncNode::update_tree(ModelAction * act)
{
- if (act_list == NULL || act_list->size() == 0)
- return;
-
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;
- action_list_t rw_act_list;
+// 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();
+ FuncInst * func_inst = get_inst(act);
+ void * loc = act->get_location();
- if (func_inst == NULL)
- continue;
+ if (func_inst == NULL)
+ return;
- inst_list.push_back(func_inst);
- bool act_added = false;
+// inst_list.push_back(func_inst);
- 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 (act->is_write()) {
+ if (!write_locations->contains(loc)) {
+ write_locations->add(loc);
+ history->update_loc_wr_func_nodes_map(loc, this);
}
- 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.
- */
- 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->update_loc_rd_func_nodes_map(loc, this);
- }
- }
+ // Do not process writes for now
+ return;
}
-// model_print("function %s\n", func_name);
-// print_val_loc_map();
+ if (act->is_read()) {
+
+ /* 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.
+ */
+ 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->update_loc_rd_func_nodes_map(loc, this);
+ }
+ }
- update_inst_tree(&inst_list);
- update_predicate_tree(&rw_act_list);
+// update_inst_tree(&inst_list); TODO
+ update_predicate_tree(act);
// print_predicate_tree();
}
}
}
-void FuncNode::update_predicate_tree(action_list_t * act_list)
+void FuncNode::update_predicate_tree(ModelAction * next_act)
{
- if (act_list == NULL || act_list->size() == 0)
- return;
+ thread_id_t tid = next_act->get_tid();
+ int thread_id = id_to_int(tid);
+ int this_marker = thrd_marker[thread_id];
- incr_marker();
- uint32_t inst_counter = 0;
+ loc_inst_map_t * loc_inst_map = thrd_loc_inst_map[thread_id];
+ inst_pred_map_t * inst_pred_map = thrd_inst_pred_map[thread_id];
+ inst_id_map_t * inst_id_map = thrd_inst_id_map[thread_id];
- // Clear hashtables
- loc_act_map.reset();
- inst_pred_map.reset();
- inst_id_map.reset();
+ // Clear the set of leaves encountered in this path
+ // leaves_tmp_storage.clear();
- sllnode<ModelAction *> *it = act_list->begin();
- Predicate * curr_pred = predicate_tree_entry;
- while (it != NULL) {
- ModelAction * next_act = it->getVal();
+ Predicate * curr_pred = get_predicate_tree_position(tid);
+ while (true) {
FuncInst * next_inst = get_inst(next_act);
- next_inst->set_associated_act(next_act, marker);
+ next_inst->set_associated_read(tid, next_act->get_reads_from_value(), this_marker);
Predicate * unset_predicate = NULL;
bool branch_found = follow_branch(&curr_pred, next_inst, next_act, &unset_predicate);
}
// Detect loops
- if (!branch_found && inst_id_map.contains(next_inst)) {
+ 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);
+ uint32_t curr_id = inst_id_map->get(curr_inst);
+ uint32_t next_id = inst_id_map->get(next_inst);
if (curr_id >= next_id) {
- Predicate * old_pred = inst_pred_map.get(next_inst);
+ Predicate * old_pred = inst_pred_map->get(next_inst);
Predicate * back_pred = old_pred->get_parent();
+ // For updating weights
+ leaves_tmp_storage.push_back(curr_pred);
+
+ // Add to the set of backedges
curr_pred->add_backedge(back_pred);
curr_pred = back_pred;
+
continue;
}
}
if (next_act->is_read()) {
/* Only need to store the locations of read actions */
- loc_act_map.put(next_act->get_location(), next_act);
+ loc_inst_map->put(next_inst->get_location(), next_inst);
}
- inst_pred_map.put(next_inst, curr_pred);
- if (!inst_id_map.contains(next_inst))
- inst_id_map.put(next_inst, inst_counter++);
+ inst_pred_map->put(next_inst, curr_pred);
+ set_predicate_tree_position(tid, curr_pred);
- it = it->getNext();
- curr_pred->incr_expl_count();
- }
+ if (!inst_id_map->contains(next_inst))
+ inst_id_map->put(next_inst, inst_counter++);
- if (curr_pred->get_exit() == NULL) {
- // Exit predicate is unset yet
- curr_pred->set_exit(predicate_tree_exit);
+ curr_pred->incr_expl_count();
+ break;
}
- update_predicate_tree_weight();
+// leaves_tmp_storage.push_back(curr_pred);
+// update_predicate_tree_weight();
}
/* Given curr_pred and next_inst, find the branch following curr_pred that
* @return true if branch found, false otherwise.
*/
bool FuncNode::follow_branch(Predicate ** curr_pred, FuncInst * next_inst,
-ModelAction * next_act, Predicate ** unset_predicate)
+ ModelAction * next_act, Predicate ** unset_predicate)
{
/* Check if a branch with func_inst and corresponding predicate exists */
bool branch_found = false;
+ thread_id_t tid = next_act->get_tid();
+ int this_marker = thrd_marker[id_to_int(tid)];
+
ModelVector<Predicate *> * branches = (*curr_pred)->get_children();
for (uint i = 0;i < branches->size();i++) {
Predicate * branch = (*branches)[i];
/* Only read and rmw actions my have unset predicate expressions */
if (pred_expressions->getSize() == 0) {
predicate_correct = false;
+
if (*unset_predicate == NULL)
*unset_predicate = branch;
else
bool equality;
switch(pred_expression->token) {
- case NOPREDICATE:
- predicate_correct = true;
- break;
- case EQUALITY:
- FuncInst * to_be_compared;
- ModelAction * last_act;
+ case NOPREDICATE:
+ predicate_correct = true;
+ break;
+ case EQUALITY:
+ FuncInst * to_be_compared;
+ to_be_compared = pred_expression->func_inst;
- to_be_compared = pred_expression->func_inst;
- last_act = to_be_compared->get_associated_act(marker);
+ last_read = to_be_compared->get_associated_read(tid, this_marker);
+ ASSERT(last_read != VALUE_NONE);
- 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;
+ next_read = next_act->get_reads_from_value();
+ equality = (last_read == next_read);
+ if (equality != pred_expression->value)
+ predicate_correct = false;
- break;
- case NULLITY:
- next_read = next_act->get_reads_from_value();
- // TODO: implement likely to be null
- equality = ( (void*) (next_read & 0xffffffff) == NULL);
- if (equality != pred_expression->value)
- predicate_correct = false;
- break;
- default:
+ break;
+ case NULLITY:
+ next_read = next_act->get_reads_from_value();
+ // TODO: implement likely to be null
+ equality = ( (void*) (next_read & 0xffffffff) == NULL);
+ if (equality != pred_expression->value)
predicate_correct = false;
- model_print("unkown predicate token\n");
- break;
+ break;
+ default:
+ predicate_correct = false;
+ model_print("unkown predicate token\n");
+ break;
}
}
+ delete pred_expr_it;
+
if (predicate_correct) {
*curr_pred = branch;
branch_found = true;
/* Infer predicate expressions, which are generated in FuncNode::generate_predicates */
void FuncNode::infer_predicates(FuncInst * next_inst, ModelAction * next_act,
-SnapVector<struct half_pred_expr *> * half_pred_expressions)
+ SnapVector<struct half_pred_expr *> * half_pred_expressions)
{
void * loc = next_act->get_location();
+ int thread_id = id_to_int(next_act->get_tid());
+ loc_inst_map_t * loc_inst_map = thrd_loc_inst_map[thread_id];
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);
+ if ( loc_inst_map->contains(loc) ) {
+ FuncInst * last_inst = loc_inst_map->get(loc);
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_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);
+ if (loc_inst_map->contains(neighbor)) {
+ FuncInst * last_inst = loc_inst_map->get(neighbor);
struct half_pred_expr * expression = new half_pred_expr(EQUALITY, last_inst);
half_pred_expressions->push_back(expression);
}
}
+
+ delete loc_it;
}
} else {
// next_inst is not single location
/* Able to generate complex predicates when there are multiple predciate expressions */
void FuncNode::generate_predicates(Predicate * curr_pred, FuncInst * next_inst,
-SnapVector<struct half_pred_expr *> * half_pred_expressions)
+ SnapVector<struct half_pred_expr *> * half_pred_expressions)
{
if (half_pred_expressions->size() == 0) {
Predicate * new_pred = new Predicate(next_inst);
bool FuncNode::amend_predicate_expr(Predicate * curr_pred, FuncInst * next_inst, ModelAction * next_act)
{
ModelVector<Predicate *> * children = curr_pred->get_children();
- ASSERT(children->size() == 1);
- // there should only be only child
- Predicate * unset_pred = (*children)[0];
+ Predicate * unset_pred = NULL;
+ for (uint i = 0;i < children->size();i++) {
+ Predicate * child = (*children)[i];
+ if (child->get_func_inst() == next_inst) {
+ unset_pred = child;
+ break;
+ }
+ }
+
uint64_t read_val = next_act->get_reads_from_value();
// only generate NULLITY predicate when it is actually NULL.
uint64_t val = it->next();
add_to_val_loc_map(val, loc);
}
+
+ delete it;
}
void FuncNode::update_loc_may_equal_map(void * new_loc, loc_set_t * old_locations)
}
_neighbors->add(new_loc);
}
+
+ delete loc_it;
}
-/* 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)
+void FuncNode::set_predicate_tree_position(thread_id_t tid, Predicate * pred)
{
int thread_id = id_to_int(tid);
if (predicate_tree_position.size() <= (uint) thread_id)
predicate_tree_position.resize(thread_id + 1);
- predicate_tree_position[thread_id] = predicate_tree_entry;
-}
-
-void FuncNode::set_predicate_tree_position(thread_id_t tid, Predicate * pred)
-{
- int thread_id = id_to_int(tid);
predicate_tree_position[thread_id] = pred;
}
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) {
+ if (old_size <= (uint) thread_id) {
uint new_size = thread_id + 1;
thrd_inst_act_map->resize(new_size);
return (*thrd_inst_act_map)[thread_id];
}
+void FuncNode::set_marker(thread_id_t tid)
+{
+ marker++;
+ uint thread_id = id_to_int(tid);
+ for (uint i = thrd_marker.size(); i < thread_id + 1; i++) {
+ thrd_marker.push_back(0);
+ }
+
+ thrd_marker[thread_id] = marker;
+}
+
+/* Make sure elements of maps are initialized properly when threads enter functions */
+void FuncNode::init_maps(thread_id_t tid)
+{
+ int thread_id = id_to_int(tid);
+ uint old_size = thrd_loc_inst_map.size();
+
+ if (old_size <= (uint) thread_id) {
+ uint new_size = thread_id + 1;
+ thrd_loc_inst_map.resize(new_size);
+ thrd_inst_id_map.resize(new_size);
+ thrd_inst_pred_map.resize(new_size);
+
+ for (uint i = old_size; i < new_size; i++) {
+ thrd_loc_inst_map[i] = new loc_inst_map_t(128);
+ thrd_inst_id_map[i] = new inst_id_map_t(128);
+ thrd_inst_pred_map[i] = new inst_pred_map_t(128);
+ }
+ }
+}
+
+/* Reset elements of maps when threads exit functions */
+void FuncNode::reset_maps(thread_id_t tid)
+{
+ int thread_id = id_to_int(tid);
+ thrd_loc_inst_map[thread_id]->reset();
+ thrd_inst_id_map[thread_id]->reset();
+ thrd_inst_pred_map[thread_id]->reset();
+}
+
/* Add FuncNodes that this node may follow */
void FuncNode::add_out_edge(FuncNode * other)
{
return -1;
}
+void FuncNode::add_failed_predicate(Predicate * pred)
+{
+ failed_predicates.add(pred);
+}
+
/* Implement quick sort to sort leaves before assigning base scores */
-static int partition(SnapVector<Predicate *> * arr, int low, int high)
+template<typename _Tp>
+static int partition(ModelVector<_Tp *> * arr, int low, int high)
{
- unsigned int pivot = (*arr)[high]->get_depth();
+ unsigned int pivot = (*arr)[high] -> get_depth();
int i = low - 1;
- for (int j = low; j <= high - 1; j++) {
- if ( (*arr)[j]->get_depth() < pivot ) {
- i++;
- Predicate *tmp = (*arr)[i];
+ for (int j = low;j <= high - 1;j ++) {
+ if ( (*arr)[j] -> get_depth() < pivot ) {
+ i ++;
+ _Tp * tmp = (*arr)[i];
(*arr)[i] = (*arr)[j];
(*arr)[j] = tmp;
}
}
- Predicate * tmp = (*arr)[i + 1];
+ _Tp * tmp = (*arr)[i + 1];
(*arr)[i + 1] = (*arr)[high];
(*arr)[high] = tmp;
}
/* Implement quick sort to sort leaves before assigning base scores */
-static void quickSort(SnapVector<Predicate *> * arr, int low, int high)
+template<typename _Tp>
+static void quickSort(ModelVector<_Tp *> * arr, int low, int high)
{
if (low < high) {
int pi = partition(arr, low, high);
void FuncNode::assign_initial_weight()
{
PredSetIter * it = predicate_leaves.iterator();
- SnapVector<Predicate *> leaves;
+ leaves_tmp_storage.clear();
+
while (it->hasNext()) {
Predicate * pred = it->next();
- double weight = 100.0 / sqrt(pred->get_expl_count() + 1);
+ double weight = 100.0 / sqrt(pred->get_expl_count() + pred->get_fail_count() + 1);
pred->set_weight(weight);
- leaves.push_back(pred);
+ leaves_tmp_storage.push_back(pred);
}
+ delete it;
- quickSort(&leaves, 0, leaves.size() - 1);
+ quickSort(&leaves_tmp_storage, 0, leaves_tmp_storage.size() - 1);
// assign scores for internal nodes;
- while ( !leaves.empty() ) {
- Predicate * leaf = leaves.back();
- leaves.pop_back();
+ while ( !leaves_tmp_storage.empty() ) {
+ Predicate * leaf = leaves_tmp_storage.back();
+ leaves_tmp_storage.pop_back();
Predicate * curr = leaf->get_parent();
while (curr != NULL) {
double weight_sum = 0;
bool has_unassigned_node = false;
- for (uint i = 0; i < children->size(); i++) {
+ for (uint i = 0;i < children->size();i++) {
Predicate * child = (*children)[i];
// If a child has unassigned weight
if (marker == 2) {
// Predicate tree is initially built
assign_initial_weight();
- } else {
+ return;
+ }
+
+ weight_debug_vec.clear();
+
+ PredSetIter * it = failed_predicates.iterator();
+ while (it->hasNext()) {
+ Predicate * pred = it->next();
+ leaves_tmp_storage.push_back(pred);
+ }
+ delete it;
+ failed_predicates.reset();
+
+ quickSort(&leaves_tmp_storage, 0, leaves_tmp_storage.size() - 1);
+ for (uint i = 0;i < leaves_tmp_storage.size();i++) {
+ Predicate * pred = leaves_tmp_storage[i];
+ double weight = 100.0 / sqrt(pred->get_expl_count() + pred->get_fail_count() + 1);
+ pred->set_weight(weight);
+ }
+
+ // Update weights in internal nodes
+ while ( !leaves_tmp_storage.empty() ) {
+ Predicate * leaf = leaves_tmp_storage.back();
+ leaves_tmp_storage.pop_back();
+
+ Predicate * curr = leaf->get_parent();
+ while (curr != NULL) {
+ ModelVector<Predicate *> * children = curr->get_children();
+ double weight_sum = 0;
+ bool has_unassigned_node = false;
+
+ for (uint i = 0;i < children->size();i++) {
+ Predicate * child = (*children)[i];
+
+ double weight = child->get_weight();
+ if (weight != 0)
+ weight_sum += weight;
+ else if ( predicate_leaves.contains(child) ) {
+ // If this child is a leaf
+ double weight = 100.0 / sqrt(child->get_expl_count() + 1);
+ child->set_weight(weight);
+ weight_sum += weight;
+ } else {
+ has_unassigned_node = true;
+ weight_debug_vec.push_back(child); // For debugging purpose
+ break;
+ }
+ }
+
+ if (!has_unassigned_node) {
+ double average_weight = (double) weight_sum / (double) children->size();
+ double weight = average_weight * pow(0.9, curr->get_depth());
+ curr->set_weight(weight);
+ } else
+ break;
+
+ curr = curr->get_parent();
+ }
+ }
+ for (uint i = 0;i < weight_debug_vec.size();i++) {
+ Predicate * tmp = weight_debug_vec[i];
+ ASSERT( tmp->get_weight() != 0 );
}
}
projects / c11tester.git / blobdiff