thrd_pruned_writes(),
paused_thread_list(),
paused_thread_table(128),
- failed_predicates(32),
dist_info_vec()
{}
/**
* @brief Register the ModelHistory and ModelExecution engine
*/
-void NewFuzzer::register_engine(ModelHistory * history, ModelExecution *execution)
+void NewFuzzer::register_engine(ModelChecker *_model, ModelExecution *execution)
{
- this->history = history;
+ this->history = _model->get_history();
this->execution = execution;
}
int NewFuzzer::selectWrite(ModelAction *read, SnapVector<ModelAction *> * rf_set)
{
-// return random() % rf_set->size();
+ return random() % rf_set->size();
thread_id_t tid = read->get_tid();
int thread_id = id_to_int(tid);
FuncNode * func_node = history->get_curr_func_node(tid);
Predicate * curr_pred = func_node->get_predicate_tree_position(tid);
FuncInst * read_inst = func_node->get_inst(read);
- inst_act_map_t * inst_act_map = func_node->get_inst_act_map(tid);
if (curr_pred != NULL) {
Predicate * selected_branch = NULL;
- if (check_store_visibility(curr_pred, read_inst, inst_act_map, rf_set))
+ if (check_branch_inst(curr_pred, read_inst, rf_set))
selected_branch = selectBranch(tid, curr_pred, read_inst);
else {
// no child of curr_pred matches read_inst, check back edges
while (it->hasNext()) {
curr_pred = it->next();
- if (check_store_visibility(curr_pred, read_inst, inst_act_map, rf_set)) {
+ if (check_branch_inst(curr_pred, read_inst, rf_set)) {
selected_branch = selectBranch(tid, curr_pred, read_inst);
break;
}
}
+
+ delete it;
}
- prune_writes(tid, selected_branch, rf_set, inst_act_map);
+ thrd_selected_child_branch[thread_id] = selected_branch;
+ prune_writes(tid, selected_branch, rf_set);
}
- if (!failed_predicates.isEmpty())
- failed_predicates.reset();
-
thrd_last_read_act[thread_id] = read;
thrd_last_func_inst[thread_id] = read_inst;
}
- ASSERT(rf_set->size() != 0);
+ // The chosen branch fails, reselect new branches
+ while ( rf_set->size() == 0 ) {
+ Predicate * selected_branch = get_selected_child_branch(tid);
+ FuncNode * func_node = history->get_curr_func_node(tid);
+
+ // Increment failure count
+ selected_branch->incr_fail_count();
+ func_node->add_predicate_to_trace(tid, selected_branch); // For updating predicate weight
+
+ //model_print("the %d read action of thread %d at %p is unsuccessful\n", read->get_seq_number(), read_thread->get_id(), read->get_location());
+
+ SnapVector<ModelAction *> * pruned_writes = thrd_pruned_writes[thread_id];
+ for (uint i = 0;i < pruned_writes->size();i++) {
+ rf_set->push_back( (*pruned_writes)[i] );
+ }
+
+ // Reselect a predicate and prune writes
+ Predicate * curr_pred = selected_branch->get_parent();
+ FuncInst * read_inst = thrd_last_func_inst[thread_id];
+ selected_branch = selectBranch(tid, curr_pred, read_inst);
+ thrd_selected_child_branch[thread_id] = selected_branch;
+
+ prune_writes(tid, selected_branch, rf_set);
+
+ ASSERT(selected_branch);
+ }
+
int random_index = random() % rf_set->size();
return random_index;
}
-/* For children of curr_pred that matches read_inst.
- * If any store in rf_set satisfies the a child's predicate,
- * increment the store visibility count for it.
- *
+/* Check if children of curr_pred match read_inst.
* @return False if no child matches read_inst
*/
-bool NewFuzzer::check_store_visibility(Predicate * curr_pred, FuncInst * read_inst,
-inst_act_map_t * inst_act_map, SnapVector<ModelAction *> * rf_set)
+bool NewFuzzer::check_branch_inst(Predicate * curr_pred, FuncInst * read_inst,
+ SnapVector<ModelAction *> * rf_set)
{
available_branches_tmp_storage.clear();
/* The children predicates may have different FuncInsts */
if (branch->get_func_inst() == read_inst) {
- PredExprSet * pred_expressions = branch->get_pred_expressions();
any_child_match = true;
-
- /* Do not check unset predicates */
- if (pred_expressions->isEmpty()) {
- available_branches_tmp_storage.push_back(branch);
- continue;
- }
-
branch->incr_total_checking_count();
-
- /* Iterate over all write actions */
- for (uint j = 0;j < rf_set->size();j++) {
- ModelAction * write_act = (*rf_set)[j];
- uint64_t write_val = write_act->get_write_value();
- bool dummy = true;
- bool satisfy_predicate = check_predicate_expressions(pred_expressions, inst_act_map, write_val, &dummy);
-
- /* If one write value satisfies the predicate, go to check the next predicate */
- if (satisfy_predicate) {
- branch->incr_store_visible_count();
- available_branches_tmp_storage.push_back(branch);
- break;
- }
- }
+ available_branches_tmp_storage.push_back(branch);
}
}
return NULL;
}
- int index = choose_index(&available_branches_tmp_storage);
- Predicate * random_branch = available_branches_tmp_storage[ index ];
- thrd_selected_child_branch[thread_id] = random_branch;
+ int index = choose_branch_index(&available_branches_tmp_storage);
+ Predicate * selected_branch = available_branches_tmp_storage[ index ];
+
+ /* Remove the chosen branch from vec in case that this
+ * branch fails and need to choose another one */
+ available_branches_tmp_storage[index] = available_branches_tmp_storage.back();
+ available_branches_tmp_storage.pop_back();
- return random_branch;
+ return selected_branch;
}
/**
* @brief Select a branch from the given predicate branch
*/
-int NewFuzzer::choose_index(SnapVector<Predicate *> * branches)
+int NewFuzzer::choose_
branch_index(SnapVector<Predicate *> * branches)
{
- return random() % branches->size();
+ if (branches->size() == 1)
+ return 0;
+
+ double total_weight = 0;
+ SnapVector<double> weights;
+ for (uint i = 0;i < branches->size();i++) {
+ Predicate * branch = (*branches)[i];
+ double weight = branch->get_weight();
+ total_weight += weight;
+ weights.push_back(weight);
+ }
+
+ double prob = (double) random() / RAND_MAX;
+ double prob_sum = 0;
+ int index = 0;
+
+ for (uint i = 0;i < weights.size();i++) {
+ index = i;
+ prob_sum += (double) (weights[i] / total_weight);
+ if (prob_sum > prob) {
+ break;
+ }
+ }
+
+ return index;
+// return random() % branches->size();
}
Predicate * NewFuzzer::get_selected_child_branch(thread_id_t tid)
*
* @return true if rf_set is pruned
*/
-bool NewFuzzer::prune_writes(thread_id_t tid, Predicate * pred,
-SnapVector<ModelAction *> * rf_set, inst_act_map_t * inst_act_map)
+bool NewFuzzer::prune_writes(thread_id_t tid, Predicate * pred, SnapVector<ModelAction *> * rf_set)
{
if (pred == NULL)
return false;
pruned_writes->clear(); // clear the old pruned_writes set
bool pruned = false;
- uint index = 0;
+ uint rf_index = 0;
- while ( index < rf_set->size() ) {
- ModelAction * write_act = (*rf_set)[index];
+ while ( rf_index < rf_set->size() ) {
+ ModelAction * write_act = (*rf_set)[rf_index];
uint64_t write_val = write_act->get_write_value();
bool no_predicate = false;
- bool satisfy_predicate = check_predicate_expressions(pred_expressions, inst_act_map, write_val, &no_predicate);
+ bool satisfy_predicate = true;
+
+ // Check if the write value satisfies the predicates
+ PredExprSetIter * pred_expr_it = pred_expressions->iterator();
+ while (pred_expr_it->hasNext()) {
+ struct pred_expr * expression = pred_expr_it->next();
+ bool equality;
+
+ switch (expression->token) {
+ case NOPREDICATE:
+ no_predicate = true;
+ break;
+ case EQUALITY:
+ FuncInst * to_be_compared;
+ FuncNode * func_node;
+ uint64_t last_read;
+
+ to_be_compared = expression->func_inst;
+ func_node = history->get_curr_func_node(tid);
+ last_read = func_node->get_associated_read(tid, to_be_compared);
+ ASSERT(last_read != VALUE_NONE);
+
+ equality = (write_val == last_read);
+ if (equality != expression->value)
+ satisfy_predicate = false;
+ break;
+ case NULLITY:
+ // TODO: implement likely to be null
+ equality = ((void*) (write_val & 0xffffffff) == NULL);
+ if (equality != expression->value)
+ satisfy_predicate = false;
+ break;
+ default:
+ model_print("unknown predicate token\n");
+ break;
+ }
+
+ if (!satisfy_predicate)
+ break;
+ }
+ delete pred_expr_it;
if (no_predicate)
return false;
if (!satisfy_predicate) {
ASSERT(rf_set != NULL);
- (*rf_set)[index] = rf_set->back();
+ (*rf_set)[rf_index] = rf_set->back();
rf_set->pop_back();
pruned_writes->push_back(write_act);
pruned = true;
} else
- index++;
+ rf_index++;
}
return pruned;
*/
void NewFuzzer::conditional_sleep(Thread * thread)
{
- int index = paused_thread_list.size();
+/*
+ int index = paused_thread_list.size();
- model->getScheduler()->add_sleep(thread);
- paused_thread_list.push_back(thread);
- paused_thread_table.put(thread, index); // Update table
+ model->getScheduler()->add_sleep(thread);
+ paused_thread_list.push_back(thread);
+ paused_thread_table.put(thread, index); // Update table
- /* Add the waiting condition to ModelHistory */
- ModelAction * read = thread->get_pending();
- thread_id_t tid = thread->get_id();
- FuncNode * func_node = history->get_curr_func_node(tid);
- inst_act_map_t * inst_act_map = func_node->get_inst_act_map(tid);
+ // Add the waiting condition to ModelHistory
+ ModelAction * read = thread->get_pending();
+ thread_id_t tid = thread->get_id();
+ FuncNode * func_node = history->get_curr_func_node(tid);
+ // inst_act_map_t * inst_act_map = func_node->get_inst_act_map(tid);
+
+ Predicate * selected_branch = get_selected_child_branch(tid);
+ // ConcretePredicate * concrete = selected_branch->evaluate(inst_act_map, tid);
+ concrete->set_location(read->get_location());
- Predicate * selected_branch = get_selected_child_branch(tid);
- ConcretePredicate * concrete = selected_branch->evaluate(inst_act_map, tid);
- concrete->set_location(read->get_location());
+ ASSERT(false);
- history->add_waiting_write(concrete);
- /* history->add_waiting_thread is already called in find_threads */
+ // history->add_waiting_write(concrete);
+ // history->add_waiting_thread is already called in find_threads
+ */
}
bool NewFuzzer::has_paused_threads()
wake_up_paused_threads(threadlist, &numthreads);
//model_print("list size: %d, active t id: %d\n", numthreads, threadlist[0]);
}
-
int random_index = random() % numthreads;
int thread = threadlist[random_index];
thread_id_t curr_tid = int_to_id(thread);
return finds_waiting_for;
}
-bool NewFuzzer::check_predicate_expressions(PredExprSet * pred_expressions,
-inst_act_map_t * inst_act_map, uint64_t write_val, bool * no_predicate)
-{
- bool satisfy_predicate = true;
-
- PredExprSetIter * pred_expr_it = pred_expressions->iterator();
- while (pred_expr_it->hasNext()) {
- struct pred_expr * expression = pred_expr_it->next();
- bool equality;
-
- switch (expression->token) {
- case NOPREDICATE:
- *no_predicate = true;
- break;
- case EQUALITY:
- FuncInst * to_be_compared;
- ModelAction * last_act;
- uint64_t last_read;
-
- to_be_compared = expression->func_inst;
- last_act = inst_act_map->get(to_be_compared);
- last_read = last_act->get_reads_from_value();
-
- equality = (write_val == last_read);
- if (equality != expression->value)
- satisfy_predicate = false;
- break;
- case NULLITY:
- // TODO: implement likely to be null
- equality = ((void*) (write_val & 0xffffffff) == NULL);
- if (equality != expression->value)
- satisfy_predicate = false;
- break;
- default:
- model_print("unknown predicate token\n");
- break;
- }
-
- if (!satisfy_predicate)
- break;
- }
-
- return satisfy_predicate;
-}
-
bool NewFuzzer::shouldWait(const ModelAction * act)
{
- return random() & 1;
+ return true;
}
projects / c11tester.git / blobdiff