mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-10-31 11:42:30 +00:00
Code Activity

Handle expect no warnings together with expected

Browse source
This commit is contained in:
Miodrag Milanovic 2020-02-22 10:52:46 +01:00
parent 596bb2d443
commit d079ab9d19
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kernel/driver.cc
View file

@ -558,8 +558,9 @@ int main(int argc, char **argv)
fprintf(f, "\n"); fprintf(f, "\n");
} }
if (log_expect_no_warnings && log_warnings_count) if (log_expect_no_warnings && log_warnings_count_noexpect)
log_error("Warnings: %d unique messages, %d total\n", GetSize(log_warnings), log_warnings_count); log_error("Unexpected warnings found: %d unique messages, %d total, %d expected\n", GetSize(log_warnings),
log_warnings_count, log_warnings_count - log_warnings_count_noexpect);
if (print_stats) if (print_stats)
{ {

10
kernel/log.cc
View file

@ -45,6 +45,7 @@ std::vector<std::regex> log_warn_regexes, log_nowarn_regexes, log_werror_regexes
std::vector<std::pair<std::regex,LogExpectedItem>> log_expect_log, log_expect_warning, log_expect_error; std::vector<std::pair<std::regex,LogExpectedItem>> log_expect_log, log_expect_warning, log_expect_error;
std::set<std::string> log_warnings, log_experimentals, log_experimentals_ignored; std::set<std::string> log_warnings, log_experimentals, log_experimentals_ignored;
int log_warnings_count = 0; int log_warnings_count = 0;
int log_warnings_count_noexpect = 0;
bool log_expect_no_warnings = false; bool log_expect_no_warnings = false;
bool log_hdump_all = false; bool log_hdump_all = false;
FILE *log_errfile = NULL; FILE *log_errfile = NULL;
@ -253,9 +254,12 @@ static void logv_warning_with_prefix(const char *prefix,
if (std::regex_search(message, re)) if (std::regex_search(message, re))
log_error("%s", message.c_str()); log_error("%s", message.c_str());
bool warning_match = false;
for (auto &item : log_expect_warning) for (auto &item : log_expect_warning)
if (std::regex_search(message, item.first)) if (std::regex_search(message, item.first)) {
item.second.current_count++; item.second.current_count++;
warning_match = true;
}
if (log_warnings.count(message)) if (log_warnings.count(message))
{ {
@ -276,6 +280,8 @@ static void logv_warning_with_prefix(const char *prefix,
log_warnings.insert(message); log_warnings.insert(message);
} }
if (!warning_match)
log_warnings_count_noexpect++;
log_warnings_count++; log_warnings_count++;
log_make_debug = bak_log_make_debug; log_make_debug = bak_log_make_debug;
} }
@ -661,7 +667,7 @@ void log_check_expected()
check_expected_logs = false; check_expected_logs = false;
for (auto &item : log_expect_warning) { for (auto &item : log_expect_warning) {
if (item.second.current_count != item.second.expected_count) { if (item.second.current_count == 0) {
log_error("Expected warning pattern '%s' not found !\n", item.second.pattern.c_str()); log_error("Expected warning pattern '%s' not found !\n", item.second.pattern.c_str());
} }
if (item.second.current_count != item.second.expected_count) { if (item.second.current_count != item.second.expected_count) {

1
kernel/log.h
View file

@ -52,6 +52,7 @@ extern std::map<std::string, std::set<std::string>> log_hdump;
extern std::vector<std::regex> log_warn_regexes, log_nowarn_regexes, log_werror_regexes; extern std::vector<std::regex> log_warn_regexes, log_nowarn_regexes, log_werror_regexes;
extern std::set<std::string> log_warnings, log_experimentals, log_experimentals_ignored; extern std::set<std::string> log_warnings, log_experimentals, log_experimentals_ignored;
extern int log_warnings_count; extern int log_warnings_count;
extern int log_warnings_count_noexpect;
extern bool log_expect_no_warnings; extern bool log_expect_no_warnings;
extern bool log_hdump_all; extern bool log_hdump_all;
extern FILE *log_errfile; extern FILE *log_errfile;