mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-12 20:18:20 +00:00
Code Activity

Add "yosys -e regex" for turning warnings into errors

Browse source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-05-04 15:27:28 +02:00
parent 47eb150eec
commit 5c03aeac60
3 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
kernel/driver.cc
View file

@ -255,9 +255,13 @@ int main(int argc, char **argv)
printf(" print a warning for all log messages matching the regex.\n"); printf(" print a warning for all log messages matching the regex.\n");
printf("\n"); printf("\n");
printf(" -w regex\n"); printf(" -w regex\n");
printf(" if a warning message matches the regex, it is printes as regular\n"); printf(" if a warning message matches the regex, it is printed as regular\n");
printf(" message instead.\n"); printf(" message instead.\n");
printf("\n"); printf("\n");
printf(" -e regex\n");
printf(" if a warning message matches the regex, it is printed as error\n");
printf(" message instead and the tool terminates with a nonzero return code.\n");
printf("\n");
printf(" -E <depsfile>\n"); printf(" -E <depsfile>\n");
printf(" write a Makefile dependencies file with in- and output file names\n"); printf(" write a Makefile dependencies file with in- and output file names\n");
printf("\n"); printf("\n");
@ -281,7 +285,7 @@ int main(int argc, char **argv)
} }
int opt; int opt;
while ((opt = getopt(argc, argv, "MXAQTVSm:f:Hh:b:o:p:l:L:qv:tds:c:W:w:D:E:")) != -1) while ((opt = getopt(argc, argv, "MXAQTVSm:f:Hh:b:o:p:l:L:qv:tds:c:W:w:e:D:E:")) != -1)
{ {
switch (opt) switch (opt)
{ {
@ -375,6 +379,12 @@ int main(int argc, char **argv)
std::regex_constants::optimize | std::regex_constants::optimize |
std::regex_constants::egrep)); std::regex_constants::egrep));
break; break;
case 'e':
log_werror_regexes.push_back(std::regex(optarg,
std::regex_constants::nosubs |
std::regex_constants::optimize |
std::regex_constants::egrep));
break;
case 'D': case 'D':
{ {
auto args = split_tokens(optarg, ":"); auto args = split_tokens(optarg, ":");

10
kernel/log.cc
View file

@ -41,7 +41,7 @@ YOSYS_NAMESPACE_BEGIN
std::vector<FILE*> log_files; std::vector<FILE*> log_files;
std::vector<std::ostream*> log_streams; std::vector<std::ostream*> log_streams;
std::map<std::string, std::set<std::string>> log_hdump; std::map<std::string, std::set<std::string>> log_hdump;
std::vector<std::regex> log_warn_regexes, log_nowarn_regexes; std::vector<std::regex> log_warn_regexes, log_nowarn_regexes, log_werror_regexes;
std::set<std::string> log_warnings; std::set<std::string> log_warnings;
int log_warnings_count = 0; int log_warnings_count = 0;
bool log_hdump_all = false; bool log_hdump_all = false;
@ -218,6 +218,10 @@ void logv_warning(const char *format, va_list ap)
} }
else else
{ {
for (auto &re : log_werror_regexes)
if (std::regex_search(message, re))
log_error("%s", message.c_str());
if (log_warnings.count(message)) if (log_warnings.count(message))
{ {
log("Warning: %s", message.c_str()); log("Warning: %s", message.c_str());
@ -256,6 +260,10 @@ void logv_warning_noprefix(const char *format, va_list ap)
} }
else else
{ {
for (auto &re : log_werror_regexes)
if (std::regex_search(message, re))
log_error("%s", message.c_str());
if (log_warnings.count(message)) if (log_warnings.count(message))
{ {
log("%s", message.c_str()); log("%s", message.c_str());

2
kernel/log.h
View file

@ -49,7 +49,7 @@ struct log_cmd_error_exception { };
extern std::vector<FILE*> log_files; extern std::vector<FILE*> log_files;
extern std::vector<std::ostream*> log_streams; extern std::vector<std::ostream*> log_streams;
extern std::map<std::string, std::set<std::string>> log_hdump; extern std::map<std::string, std::set<std::string>> log_hdump;
extern std::vector<std::regex> log_warn_regexes, log_nowarn_regexes; extern std::vector<std::regex> log_warn_regexes, log_nowarn_regexes, log_werror_regexes;
extern std::set<std::string> log_warnings; extern std::set<std::string> log_warnings;
extern int log_warnings_count; extern int log_warnings_count;
extern bool log_hdump_all; extern bool log_hdump_all;