X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=newfuzzer.cc;h=ad279770e1588267a1bdc22f3d18c3be2dceaabf;hb=7719c6dc7e1a6dade8dfa022f3c9e19853f3e89f;hp=6d90f5fd62c460e0946c5e0c9c6034aa0636a62f;hpb=5d3037f7280786b48caa804d92aa360a6dea846d;p=c11tester.git diff --git a/newfuzzer.cc b/newfuzzer.cc index 6d90f5fd..ad279770 100644 --- a/newfuzzer.cc +++ b/newfuzzer.cc @@ -19,16 +19,15 @@ NewFuzzer::NewFuzzer() : 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; } @@ -49,12 +48,11 @@ int NewFuzzer::selectWrite(ModelAction *read, SnapVector * rf_set 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 @@ -63,7 +61,7 @@ int NewFuzzer::selectWrite(ModelAction *read, SnapVector * rf_set 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; } @@ -72,12 +70,10 @@ int NewFuzzer::selectWrite(ModelAction *read, SnapVector * rf_set 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; } @@ -85,12 +81,16 @@ int NewFuzzer::selectWrite(ModelAction *read, SnapVector * rf_set // The chosen branch fails, reselect new branches while ( rf_set->size() == 0 ) { Predicate * selected_branch = get_selected_child_branch(tid); - failed_predicates.put(selected_branch, true); + 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 * pruned_writes = thrd_pruned_writes[thread_id]; - for (uint i = 0; i < pruned_writes->size(); i++) { + for (uint i = 0;i < pruned_writes->size();i++) { rf_set->push_back( (*pruned_writes)[i] ); } @@ -98,10 +98,9 @@ int NewFuzzer::selectWrite(ModelAction *read, SnapVector * rf_set 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; - FuncNode * func_node = history->get_curr_func_node(tid); - inst_act_map_t * inst_act_map = func_node->get_inst_act_map(tid); - prune_writes(tid, selected_branch, rf_set, inst_act_map); + prune_writes(tid, selected_branch, rf_set); ASSERT(selected_branch); } @@ -111,14 +110,11 @@ int NewFuzzer::selectWrite(ModelAction *read, SnapVector * rf_set 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 * rf_set) +bool NewFuzzer::check_branch_inst(Predicate * curr_pred, FuncInst * read_inst, + SnapVector * rf_set) { available_branches_tmp_storage.clear(); @@ -136,6 +132,7 @@ inst_act_map_t * inst_act_map, SnapVector * rf_set) /* The children predicates may have different FuncInsts */ if (branch->get_func_inst() == read_inst) { any_child_match = true; + branch->incr_total_checking_count(); available_branches_tmp_storage.push_back(branch); } } @@ -164,15 +161,14 @@ Predicate * NewFuzzer::selectBranch(thread_id_t tid, Predicate * curr_pred, Func } int index = choose_branch_index(&available_branches_tmp_storage); - Predicate * random_branch = available_branches_tmp_storage[ index ]; - thrd_selected_child_branch[thread_id] = random_branch; + 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; } /** @@ -185,7 +181,7 @@ int NewFuzzer::choose_branch_index(SnapVector * branches) double total_weight = 0; SnapVector weights; - for (uint i = 0; i < branches->size(); i++) { + for (uint i = 0;i < branches->size();i++) { Predicate * branch = (*branches)[i]; double weight = branch->get_weight(); total_weight += weight; @@ -196,7 +192,7 @@ int NewFuzzer::choose_branch_index(SnapVector * branches) double prob_sum = 0; int index = 0; - for (uint i = 0; i < weights.size(); i++) { + for (uint i = 0;i < weights.size();i++) { index = i; prob_sum += (double) (weights[i] / total_weight); if (prob_sum > prob) { @@ -222,8 +218,7 @@ 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 * rf_set, inst_act_map_t * inst_act_map) +bool NewFuzzer::prune_writes(thread_id_t tid, Predicate * pred, SnapVector * rf_set) { if (pred == NULL) return false; @@ -244,25 +239,65 @@ SnapVector * rf_set, inst_act_map_t * inst_act_map) 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; @@ -274,24 +309,28 @@ SnapVector * rf_set, inst_act_map_t * inst_act_map) */ void NewFuzzer::conditional_sleep(Thread * thread) { +/* 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 - /* Add the waiting condition to ModelHistory */ + // 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); +// 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); +// ConcretePredicate * concrete = selected_branch->evaluate(inst_act_map, tid); concrete->set_location(read->get_location()); - history->add_waiting_write(concrete); - /* history->add_waiting_thread is already called in find_threads */ + ASSERT(false); + +// history->add_waiting_write(concrete); + // history->add_waiting_thread is already called in find_threads +*/ } bool NewFuzzer::has_paused_threads() @@ -407,52 +446,6 @@ bool NewFuzzer::find_threads(ModelAction * pending_read) 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; - } - - delete pred_expr_it; - return satisfy_predicate; -} - bool NewFuzzer::shouldWait(const ModelAction * act) { return random() & 1;