riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/hackfin/yosys

This commit is contained in:
Martin 2020-05-19 11:14:51 +02:00
parent 43c34a7828 07eecff9cc
commit ae887c49f9
1 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
passes/cmds/logger.cc
View File

@ -58,7 +58,8 @@ struct LoggerPass : public Pass {
log(" do not print warnings for the specified experimental feature\n"); log(" do not print warnings for the specified experimental feature\n");
log("\n"); log("\n");
log(" -expect <type> <regex> <expected_count>\n"); log(" -expect <type> <regex> <expected_count>\n");
log(" expect log,warning or error to appear. In case of error return code is 0.\n"); log(" expect log, warning or error to appear. matched errors will terminate\n");
log(" with exit code 0.\n");
log("\n"); log("\n");
log(" -expect-no-warnings\n"); log(" -expect-no-warnings\n");
log(" gives error in case there is at least one warning that is not expected.\n"); log(" gives error in case there is at least one warning that is not expected.\n");
@ -158,12 +159,40 @@ struct LoggerPass : public Pass {
log_cmd_error("Expected error message occurrences must be 1 !\n"); log_cmd_error("Expected error message occurrences must be 1 !\n");
log("Added regex '%s' for warnings to expected %s list.\n", pattern.c_str(), type.c_str()); log("Added regex '%s' for warnings to expected %s list.\n", pattern.c_str(), type.c_str());
try { try {
if (type=="error") if (type=="error") {
log_expect_error.push_back(std::make_pair(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count))); auto it = log_expect_error.begin();
else if (type=="warning") auto ie = log_expect_error.end();
log_expect_warning.push_back(std::make_pair(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count))); for (; it != ie; it++)
else if (it->second.pattern == pattern) {
log_expect_log.push_back(std::make_pair(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count))); it->second.expected_count = count;
break;
}
if (it == ie)
log_expect_error.emplace_back(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count));
}
else if (type=="warning") {
auto it = log_expect_warning.begin();
auto ie = log_expect_warning.end();
for (; it != ie; it++)
if (it->second.pattern == pattern) {
it->second.expected_count = count;
break;
}
if (it == ie)
log_expect_warning.emplace_back(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count));
}
else if (type=="log") {
auto it = log_expect_log.begin();
auto ie = log_expect_log.end();
for (; it != ie; it++)
if (it->second.pattern == pattern) {
it->second.expected_count = count;
break;
}
if (it == ie)
log_expect_log.emplace_back(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count));
}
else log_abort();
} }
catch (const YS_REGEX_NS::regex_error& e) { catch (const YS_REGEX_NS::regex_error& e) {
log_cmd_error("Error in regex expression '%s' !\n", pattern.c_str()); log_cmd_error("Error in regex expression '%s' !\n", pattern.c_str());