diff --git a/docs/gen/ex_DIDNOTCONVERGE_msg.rst b/docs/gen/ex_DIDNOTCONVERGE_msg.rst index 4c2167bc6..c792ab810 100644 --- a/docs/gen/ex_DIDNOTCONVERGE_msg.rst +++ b/docs/gen/ex_DIDNOTCONVERGE_msg.rst @@ -2,4 +2,4 @@ .. code-block:: -V{t#,#} 'stl' region trigger index 0 is active: @([hybrid] a) - %Error-DIDNOTCONVERGE: t/t_lint_didnotconverge_bad.v:7: Settle region did not converge after 100 tries + %Error-DIDNOTCONVERGE: t/t_lint_didnotconverge_bad.v:7: Settle region did not converge after '--converge-limit' of 100 tries diff --git a/docs/gen/ex_DIDNOTCONVERGE_nodbg_msg.rst b/docs/gen/ex_DIDNOTCONVERGE_nodbg_msg.rst index 3ac0e9b0e..4f3a63c82 100644 --- a/docs/gen/ex_DIDNOTCONVERGE_nodbg_msg.rst +++ b/docs/gen/ex_DIDNOTCONVERGE_nodbg_msg.rst @@ -1,4 +1,4 @@ .. comment: generated by t_lint_didnotconverge_nodbg_bad .. code-block:: - %Error-DIDNOTCONVERGE: t/t_lint_didnotconverge_bad.v:7: Settle region did not converge after 100 tries + %Error-DIDNOTCONVERGE: t/t_lint_didnotconverge_bad.v:7: Settle region did not converge after '--converge-limit' of 100 tries diff --git a/src/V3SchedUtil.cpp b/src/V3SchedUtil.cpp index dafe556be..16e08be75 100644 --- a/src/V3SchedUtil.cpp +++ b/src/V3SchedUtil.cpp @@ -96,8 +96,9 @@ AstNodeStmt* checkIterationLimit(AstNetlist* netlistp, const string& name, AstVa const std::string& file = VIdProtect::protect(locp->filename()); const std::string& line = std::to_string(locp->lineno()); stmtp->add("VL_FATAL_MT(\"" + V3OutFormatter::quoteNameControls(file) + "\", " + line - + ", \"\", \"DIDNOTCONVERGE: " + name + " region did not converge after " - + std::to_string(limit) + " tries\");"); + + ", \"\", \"DIDNOTCONVERGE: " + name + + " region did not converge after '--converge-limit' of " + std::to_string(limit) + + " tries\");"); return ifp; } diff --git a/test_regress/t/t_json_only_debugcheck.out b/test_regress/t/t_json_only_debugcheck.out index b1ce755d9..f5a754213 100644 --- a/test_regress/t/t_json_only_debugcheck.out +++ b/test_regress/t/t_json_only_debugcheck.out @@ -2709,7 +2709,7 @@ ]}, {"type":"CSTMT","name":"","addr":"(QNB)","loc":"a,0:0,0:0", "nodesp": [ - {"type":"TEXT","name":"","addr":"(RNB)","loc":"a,0:0,0:0","text":"VL_FATAL_MT(\"t/t_enum_type_methods.v\", 11, \"\", \"DIDNOTCONVERGE: NBA region did not converge after 100 tries\");"} + {"type":"TEXT","name":"","addr":"(RNB)","loc":"a,0:0,0:0","text":"VL_FATAL_MT(\"t/t_enum_type_methods.v\", 11, \"\", \"DIDNOTCONVERGE: NBA region did not converge after '--converge-limit' of 100 tries\");"} ]} ],"elsesp": []}, {"type":"ASSIGN","name":"","addr":"(SNB)","loc":"d,11:8,11:9","dtypep":"(U)", @@ -2763,7 +2763,7 @@ ]}, {"type":"CSTMT","name":"","addr":"(NOB)","loc":"a,0:0,0:0", "nodesp": [ - {"type":"TEXT","name":"","addr":"(OOB)","loc":"a,0:0,0:0","text":"VL_FATAL_MT(\"t/t_enum_type_methods.v\", 11, \"\", \"DIDNOTCONVERGE: Active region did not converge after 100 tries\");"} + {"type":"TEXT","name":"","addr":"(OOB)","loc":"a,0:0,0:0","text":"VL_FATAL_MT(\"t/t_enum_type_methods.v\", 11, \"\", \"DIDNOTCONVERGE: Active region did not converge after '--converge-limit' of 100 tries\");"} ]} ],"elsesp": []}, {"type":"ASSIGN","name":"","addr":"(POB)","loc":"d,11:8,11:9","dtypep":"(U)", diff --git a/test_regress/t/t_lint_didnotconverge_bad.out b/test_regress/t/t_lint_didnotconverge_bad.out index eced481cb..9f57e12a5 100644 --- a/test_regress/t/t_lint_didnotconverge_bad.out +++ b/test_regress/t/t_lint_didnotconverge_bad.out @@ -1,3 +1,3 @@ -V{t#,#} 'stl' region trigger index 0 is active: @([hybrid] a) -%Error-DIDNOTCONVERGE: t/t_lint_didnotconverge_bad.v:7: Settle region did not converge after 100 tries +%Error-DIDNOTCONVERGE: t/t_lint_didnotconverge_bad.v:7: Settle region did not converge after '--converge-limit' of 100 tries Aborting... diff --git a/test_regress/t/t_lint_didnotconverge_nodbg_bad.out b/test_regress/t/t_lint_didnotconverge_nodbg_bad.out index 2567a6d55..24eded329 100644 --- a/test_regress/t/t_lint_didnotconverge_nodbg_bad.out +++ b/test_regress/t/t_lint_didnotconverge_nodbg_bad.out @@ -1,2 +1,2 @@ -%Error-DIDNOTCONVERGE: t/t_lint_didnotconverge_bad.v:7: Settle region did not converge after 100 tries +%Error-DIDNOTCONVERGE: t/t_lint_didnotconverge_bad.v:7: Settle region did not converge after '--converge-limit' of 100 tries Aborting... diff --git a/test_regress/t/t_unopt_converge_initial_run_bad.out b/test_regress/t/t_unopt_converge_initial_run_bad.out index ee51093f6..aa074a750 100644 --- a/test_regress/t/t_unopt_converge_initial_run_bad.out +++ b/test_regress/t/t_unopt_converge_initial_run_bad.out @@ -1,3 +1,3 @@ -V{t#,#} 'stl' region trigger index 0 is active: @([hybrid] x) -%Error-DIDNOTCONVERGE: t/t_unopt_converge_initial.v:7: Settle region did not converge after 100 tries +%Error-DIDNOTCONVERGE: t/t_unopt_converge_initial.v:7: Settle region did not converge after '--converge-limit' of 100 tries Aborting... diff --git a/test_regress/t/t_unopt_converge_ndbg_bad.out b/test_regress/t/t_unopt_converge_ndbg_bad.out index bb60c4397..53f00719b 100644 --- a/test_regress/t/t_unopt_converge_ndbg_bad.out +++ b/test_regress/t/t_unopt_converge_ndbg_bad.out @@ -1,2 +1,2 @@ -%Error-DIDNOTCONVERGE: t/t_unopt_converge.v:7: Settle region did not converge after 100 tries +%Error-DIDNOTCONVERGE: t/t_unopt_converge.v:7: Settle region did not converge after '--converge-limit' of 100 tries Aborting... diff --git a/test_regress/t/t_unopt_converge_print_bad.out b/test_regress/t/t_unopt_converge_print_bad.out index cb163e048..555b85b4a 100644 --- a/test_regress/t/t_unopt_converge_print_bad.out +++ b/test_regress/t/t_unopt_converge_print_bad.out @@ -1,3 +1,3 @@ -V{t#,#} 'stl' region trigger index 0 is active: @([hybrid] x) -%Error-DIDNOTCONVERGE: t/t_unopt_converge.v:7: Settle region did not converge after 100 tries +%Error-DIDNOTCONVERGE: t/t_unopt_converge.v:7: Settle region did not converge after '--converge-limit' of 100 tries Aborting... diff --git a/test_regress/t/t_unopt_converge_run_bad.out b/test_regress/t/t_unopt_converge_run_bad.out index 1dfd9880f..7d2e6d461 100644 --- a/test_regress/t/t_unopt_converge_run_bad.out +++ b/test_regress/t/t_unopt_converge_run_bad.out @@ -1,3 +1,3 @@ -V{t#,#} 'stl' region trigger index 0 is active: @([hybrid] x) -%Error-DIDNOTCONVERGE: t/t_unopt_converge.v:7: Settle region did not converge after 5 tries +%Error-DIDNOTCONVERGE: t/t_unopt_converge.v:7: Settle region did not converge after '--converge-limit' of 5 tries Aborting...