mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-06-19 04:13:39 +00:00
Code Activity

bugpoint.cc: Rename to -err_grep

Browse source
This commit is contained in:
Krystine Sherwin 2025-05-14 10:19:06 +12:00
parent aa03da56cb
commit 65a5227c14
No known key found for this signature in database
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
passes/cmds/bugpoint.cc
View file

@ -77,7 +77,7 @@ struct BugpointPass : public Pass {
log(" -runner \"<prefix>\"\n"); log(" -runner \"<prefix>\"\n");
log(" child process wrapping command, e.g., \"timeout 30\", or valgrind.\n"); log(" child process wrapping command, e.g., \"timeout 30\", or valgrind.\n");
log("\n"); log("\n");
log(" -greperr \"<string>\"\n"); log(" -err_grep \"<string>\"\n");
log(" only consider crashes that print this string on stderr. useful for\n"); log(" only consider crashes that print this string on stderr. useful for\n");
log(" errors outside of yosys.\n"); log(" errors outside of yosys.\n");
log("\n"); log("\n");
@ -162,9 +162,9 @@ struct BugpointPass : public Pass {
return false; return false;
} }
bool check_logfiles(string grep, string greperr) bool check_logfiles(string grep, string err_grep)
{ {
return check_logfile(grep) && check_logfile(greperr, true); return check_logfile(grep) && check_logfile(err_grep, true);
} }
RTLIL::Design *clean_design(RTLIL::Design *design, bool do_clean = true, bool do_delete = false) RTLIL::Design *clean_design(RTLIL::Design *design, bool do_clean = true, bool do_delete = false)
@ -441,7 +441,7 @@ struct BugpointPass : public Pass {
void execute(std::vector<std::string> args, RTLIL::Design *design) override void execute(std::vector<std::string> args, RTLIL::Design *design) override
{ {
string yosys_cmd = "yosys", yosys_arg, grep, greperr, runner; string yosys_cmd = "yosys", yosys_arg, grep, err_grep, runner;
bool flag_expect_return = false, has_check = false, check_err = false; bool flag_expect_return = false, has_check = false, check_err = false;
int expect_return_value = 0; int expect_return_value = 0;
bool fast = false, clean = false; bool fast = false, clean = false;
@ -474,10 +474,10 @@ struct BugpointPass : public Pass {
grep = args[++argidx]; grep = args[++argidx];
continue; continue;
} }
if (args[argidx] == "-greperr" && argidx + 1 < args.size()) { if (args[argidx] == "-err_grep" && argidx + 1 < args.size()) {
has_check = true; has_check = true;
check_err = true; check_err = true;
greperr = args[++argidx]; err_grep = args[++argidx];
continue; continue;
} }
if (args[argidx] == "-expect-return") { if (args[argidx] == "-expect-return") {
@ -578,7 +578,7 @@ struct BugpointPass : public Pass {
log_cmd_error("The provided script file or command and Yosys binary do not crash on this design!\n"); log_cmd_error("The provided script file or command and Yosys binary do not crash on this design!\n");
if (!check_logfile(grep)) if (!check_logfile(grep))
log_cmd_error("The provided grep string is not found in the log file!\n"); log_cmd_error("The provided grep string is not found in the log file!\n");
if (!check_logfile(greperr, true)) if (!check_logfile(err_grep, true))
log_cmd_error("The provided grep string is not found in stderr log!\n"); log_cmd_error("The provided grep string is not found in stderr log!\n");
int seed = 0; int seed = 0;
@ -601,21 +601,21 @@ struct BugpointPass : public Pass {
} }
bool crashes = false; bool crashes = false;
if (flag_expect_return && retval == expect_return_value && check_logfiles(grep, greperr)) if (flag_expect_return && retval == expect_return_value && check_logfiles(grep, err_grep))
{ {
log("Testcase matches expected crash.\n"); log("Testcase matches expected crash.\n");
crashes = true; crashes = true;
} }
else if (!flag_expect_return && retval == 0) else if (!flag_expect_return && retval == 0)
log("Testcase does not crash.\n"); log("Testcase does not crash.\n");
else if (!flag_expect_return && check_logfiles(grep, greperr)) else if (!flag_expect_return && check_logfiles(grep, err_grep))
{ {
log("Testcase crashes.\n"); log("Testcase crashes.\n");
crashes = true; crashes = true;
} }
else else
// flag_expect_return && !(retval == expect_return_value && check_logfiles(grep, greperr)) // flag_expect_return && !(retval == expect_return_value && check_logfiles(grep, err_grep))
// !flag_expect_return && !(retval == 0 && check_logfiles(grep, greperr)) // !flag_expect_return && !(retval == 0 && check_logfiles(grep, err_grep))
log("Testcase does not match expected crash.\n"); log("Testcase does not match expected crash.\n");
if (crashes) if (crashes)

2
tests/bugpoint/err.ys
View file

@ -38,6 +38,6 @@ select -assert-mod-count 1 zzy
# raise_error -stderr prints to stderr and exits with 1 # raise_error -stderr prints to stderr and exits with 1
design -load read design -load read
rename top abc rename top abc
bugpoint -yosys ../../yosys -command "raise_error -stderr" -greperr "help me" -expect-return 1 bugpoint -yosys ../../yosys -command "raise_error -stderr" -err_grep "help me" -expect-return 1
select -assert-mod-count 1 =* select -assert-mod-count 1 =*
select -assert-mod-count 1 other select -assert-mod-count 1 other