From: weiyu Date: Thu, 5 Dec 2019 01:02:14 +0000 (-0800) Subject: Bug fix X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=17b49f10df170ee8e6aca7401e014e8658971cdb Bug fix --- diff --git a/execution.cc b/execution.cc index 377cd01c..3a73e353 100644 --- a/execution.cc +++ b/execution.cc @@ -322,7 +322,7 @@ bool ModelExecution::process_read(ModelAction *curr, SnapVector * } ASSERT(false); - /* Following code not needed anymore */ + /* TODO: Following code not needed anymore */ priorset->clear(); (*rf_set)[index] = rf_set->back(); rf_set->pop_back(); diff --git a/newfuzzer.cc b/newfuzzer.cc index 2b4ebfd4..c9d3f177 100644 --- a/newfuzzer.cc +++ b/newfuzzer.cc @@ -14,7 +14,7 @@ NewFuzzer::NewFuzzer() : thrd_last_read_act(), thrd_last_func_inst(), - tmp_branches_storage(), + available_branches_tmp_storage(), thrd_selected_child_branch(), thrd_pruned_writes(), paused_thread_list(), @@ -78,31 +78,6 @@ int NewFuzzer::selectWrite(ModelAction *read, SnapVector * rf_set thrd_last_read_act[thread_id] = read; thrd_last_func_inst[thread_id] = read_inst; - - ASSERT(rf_set->size() != 0); - } - - // No write satisfies the selected predicate, so pause this thread. - while ( rf_set->size() == 0 ) { - Predicate * selected_branch = get_selected_child_branch(tid); - - //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++) { - 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); - - 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); - - ASSERT(selected_branch); } ASSERT(rf_set->size() != 0); @@ -120,6 +95,8 @@ int NewFuzzer::selectWrite(ModelAction *read, SnapVector * rf_set bool NewFuzzer::check_store_visibility(Predicate * curr_pred, FuncInst * read_inst, inst_act_map_t * inst_act_map, SnapVector * rf_set) { + available_branches_tmp_storage.clear(); + ASSERT(!rf_set->empty()); if (curr_pred == NULL || read_inst == NULL) return false; @@ -137,8 +114,10 @@ inst_act_map_t * inst_act_map, SnapVector * rf_set) any_child_match = true; /* Do not check unset predicates */ - if (pred_expressions->isEmpty()) + if (pred_expressions->isEmpty()) { + available_branches_tmp_storage.push_back(branch); continue; + } branch->incr_total_checking_count(); @@ -152,6 +131,7 @@ inst_act_map_t * inst_act_map, SnapVector * rf_set) /* 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; } } @@ -161,7 +141,6 @@ inst_act_map_t * inst_act_map, SnapVector * rf_set) return any_child_match; } - /* Select a random branch from the children of curr_pred * @return The selected branch */ @@ -176,24 +155,14 @@ Predicate * NewFuzzer::selectBranch(thread_id_t tid, Predicate * curr_pred, Func return NULL; } - ModelVector * children = curr_pred->get_children(); - tmp_branches_storage.clear(); - - for (uint i = 0; i < children->size(); i++) { - Predicate * child = (*children)[i]; - if (child->get_func_inst() == read_inst && !failed_predicates.contains(child)) { - tmp_branches_storage.push_back(child); - } - } - // predicate children have not been generated - if (tmp_branches_storage.size() == 0) { + if (available_branches_tmp_storage.size() == 0) { thrd_selected_child_branch[thread_id] = NULL; return NULL; } - int index = choose_index(&tmp_branches_storage, 0); - Predicate * random_branch = tmp_branches_storage[ index ]; + int index = choose_index(&available_branches_tmp_storage); + Predicate * random_branch = available_branches_tmp_storage[ index ]; thrd_selected_child_branch[thread_id] = random_branch; return random_branch; @@ -202,7 +171,7 @@ Predicate * NewFuzzer::selectBranch(thread_id_t tid, Predicate * curr_pred, Func /** * @brief Select a branch from the given predicate branch */ -int NewFuzzer::choose_index(SnapVector * branches, uint32_t numerator) +int NewFuzzer::choose_index(SnapVector * branches) { return random() % branches->size(); } diff --git a/newfuzzer.h b/newfuzzer.h index 45d684d2..fedd047d 100644 --- a/newfuzzer.h +++ b/newfuzzer.h @@ -45,14 +45,14 @@ private: SnapVector thrd_last_read_act; SnapVector thrd_last_func_inst; - SnapVector tmp_branches_storage; + SnapVector available_branches_tmp_storage; SnapVector thrd_selected_child_branch; SnapVector< SnapVector *> thrd_pruned_writes; bool check_store_visibility(Predicate * curr_pred, FuncInst * read_inst, inst_act_map_t * inst_act_map, SnapVector * rf_set); Predicate * selectBranch(thread_id_t tid, Predicate * curr_pred, FuncInst * read_inst); bool prune_writes(thread_id_t tid, Predicate * pred, SnapVector * rf_set, inst_act_map_t * inst_act_map); - int choose_index(SnapVector * branches, uint32_t numerator); + int choose_index(SnapVector * branches); /* The set of Threads put to sleep by NewFuzzer because no writes in rf_set satisfies the selected predicate. Only used by selectWrite. */