Skip to content

Commit da777a0

Browse files
kroeningtautschnig
authored andcommitted
increase verbosity level of various messages
CBMC generates too much console output. This commit increases the verbosity level required for various progress and performance statistics messages.
1 parent 8646bfa commit da777a0

File tree

11 files changed

+26
-25
lines changed

11 files changed

+26
-25
lines changed

regression/cbmc/export-symex-ready-goto/test-correct.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE
22
test.c
3-
--export-symex-ready-goto exported.symex.ready.goto
3+
--export-symex-ready-goto exported.symex.ready.goto --verbosity 10
44
^Parsing test.c$
55
^Converting$
66
^Type-checking test$

regression/cbmc/json1/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE
22
main.c
3-
--json-ui --stop-on-fail
3+
--json-ui --stop-on-fail --verbosity 10
44
activate-multi-line-match
55
^EXIT=10$
66
^SIGNAL=0$

regression/cbmc/sat-solver/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE broken-z3-smt-backend broken-cprover-smt-backend no-new-smt
22
test.c
3-
--sat-solver cadical
3+
--sat-solver cadical --verbosity 10
44
^EXIT=10$
55
^SIGNAL=0$
66
Solving with CaDiCaL|The specified solver, 'cadical', is not available. The default solver will be used instead.

src/cbmc/cbmc_parse_options.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ int cbmc_parse_optionst::get_goto_program(
838838
return CPROVER_EXIT_SUCCESS;
839839
}
840840

841-
log.status() << config.object_bits_info() << messaget::eom;
841+
log.statistics() << config.object_bits_info() << messaget::eom;
842842

843843
return -1; // no error, continue
844844
}

src/goto-checker/bmc_util.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,9 @@ void postprocess_equation(
350350
std::chrono::duration<double> postprocess_equation_runtime =
351351
std::chrono::duration<double>(
352352
postprocess_equation_stop - postprocess_equation_start);
353-
log.status() << "Runtime Postprocess Equation: "
354-
<< postprocess_equation_runtime.count() << "s" << messaget::eom;
353+
log.statistics() << "Runtime Postprocess Equation: "
354+
<< postprocess_equation_runtime.count() << "s"
355+
<< messaget::eom;
355356
}
356357

357358
std::chrono::duration<double> prepare_property_decider(

src/goto-checker/multi_path_symex_only_checker.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ void multi_path_symex_only_checkert::generate_equation()
8585
const auto symex_stop = std::chrono::steady_clock::now();
8686
std::chrono::duration<double> symex_runtime =
8787
std::chrono::duration<double>(symex_stop - symex_start);
88-
log.status() << "Runtime Symex: " << symex_runtime.count() << "s"
89-
<< messaget::eom;
88+
log.statistics() << "Runtime Symex: " << symex_runtime.count() << "s"
89+
<< messaget::eom;
9090

9191
postprocess_equation(symex, equation, options, ns, ui_message_handler);
9292
}

src/goto-checker/single_path_symex_checker.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ operator()(propertiest &properties)
8282
worklist->pop();
8383
}
8484

85-
log.status() << "Runtime Symex: " << symex_runtime.count() << "s"
86-
<< messaget::eom;
85+
log.statistics() << "Runtime Symex: " << symex_runtime.count() << "s"
86+
<< messaget::eom;
8787

8888
final_update_properties(properties, result.updated_properties);
8989

src/goto-checker/single_path_symex_only_checker.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ operator()(propertiest &properties)
5252
worklist->pop();
5353
}
5454

55-
log.status() << "Runtime Symex: " << symex_runtime.count() << "s"
56-
<< messaget::eom;
55+
log.statistics() << "Runtime Symex: " << symex_runtime.count() << "s"
56+
<< messaget::eom;
5757

5858
final_update_properties(properties, result.updated_properties);
5959

src/goto-programs/initialize_goto_model.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ void initialize_from_source_files(
9393
languaget &language = *lf.language;
9494
language.set_language_options(options, message_handler);
9595

96-
msg.status() << "Parsing " << filename << messaget::eom;
96+
msg.progress() << "Parsing " << filename << messaget::eom;
9797

9898
if(language.parse(infile, filename, message_handler))
9999
{
@@ -103,7 +103,7 @@ void initialize_from_source_files(
103103
lf.get_modules();
104104
}
105105

106-
msg.status() << "Converting" << messaget::eom;
106+
msg.progress() << "Converting" << messaget::eom;
107107

108108
if(language_files.typecheck(symbol_table, message_handler))
109109
{

src/solvers/prop/prop_conv_solver.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -447,18 +447,18 @@ prop_conv_solvert::dec_solve(const exprt &assumption)
447447
{
448448
const auto post_process_start = std::chrono::steady_clock::now();
449449

450-
log.statistics() << "Post-processing" << messaget::eom;
450+
log.progress() << "Post-processing" << messaget::eom;
451451
finish_eager_conversion();
452452
post_processing_done = true;
453453

454454
const auto post_process_stop = std::chrono::steady_clock::now();
455455
std::chrono::duration<double> post_process_runtime =
456456
std::chrono::duration<double>(post_process_stop - post_process_start);
457-
log.status() << "Runtime Post-process: " << post_process_runtime.count()
458-
<< "s" << messaget::eom;
457+
log.statistics() << "Runtime Post-process: " << post_process_runtime.count()
458+
<< "s" << messaget::eom;
459459
}
460460

461-
log.statistics() << "Solving with " << prop.solver_text() << messaget::eom;
461+
log.progress() << "Solving with " << prop.solver_text() << messaget::eom;
462462

463463
if(assumption.is_nil())
464464
push();

src/solvers/refinement/bv_refinement_loop.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ bv_refinementt::bv_refinementt(const infot &info)
2424
decision_proceduret::resultt bv_refinementt::dec_solve(const exprt &assumption)
2525
{
2626
// do the usual post-processing
27-
log.status() << "BV-Refinement: post-processing" << messaget::eom;
27+
log.progress() << "BV-Refinement: post-processing" << messaget::eom;
2828
finish_eager_conversion();
2929

3030
log.debug() << "Solving with " << prop.solver_text() << messaget::eom;
@@ -36,7 +36,7 @@ decision_proceduret::resultt bv_refinementt::dec_solve(const exprt &assumption)
3636
{
3737
iteration++;
3838

39-
log.status() << "BV-Refinement: iteration " << iteration << messaget::eom;
39+
log.progress() << "BV-Refinement: iteration " << iteration << messaget::eom;
4040

4141
// output the very same information in a structured fashion
4242
if(config_.output_xml)
@@ -54,12 +54,12 @@ decision_proceduret::resultt bv_refinementt::dec_solve(const exprt &assumption)
5454
{
5555
log.status() << "BV-Refinement: got SAT, and it simulates => SAT"
5656
<< messaget::eom;
57-
log.status() << "Total iterations: " << iteration << messaget::eom;
57+
log.statistics() << "Total iterations: " << iteration << messaget::eom;
5858
return resultt::D_SATISFIABLE;
5959
}
6060
else
61-
log.status() << "BV-Refinement: got SAT, and it is spurious, refining"
62-
<< messaget::eom;
61+
log.progress() << "BV-Refinement: got SAT, and it is spurious, refining"
62+
<< messaget::eom;
6363
break;
6464

6565
case resultt::D_UNSATISFIABLE:
@@ -69,11 +69,11 @@ decision_proceduret::resultt bv_refinementt::dec_solve(const exprt &assumption)
6969
log.status()
7070
<< "BV-Refinement: got UNSAT, and the proof passes => UNSAT"
7171
<< messaget::eom;
72-
log.status() << "Total iterations: " << iteration << messaget::eom;
72+
log.statistics() << "Total iterations: " << iteration << messaget::eom;
7373
return resultt::D_UNSATISFIABLE;
7474
}
7575
else
76-
log.status()
76+
log.progress()
7777
<< "BV-Refinement: got UNSAT, and the proof fails, refining"
7878
<< messaget::eom;
7979
break;

0 commit comments

Comments
 (0)