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

Merge pull request #1766 from YosysHQ/mmicko/regex_gcc48 

Regex support for GCC 4.8
This commit is contained in:
Miodrag Milanović 2020-03-14 11:18:27 +02:00 committed by GitHub
parent c0a009139b 395daf6ced
commit 989e37f4e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 66 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backends/firrtl/firrtl.cc
View File

@ -25,7 +25,6 @@
#include "kernel/log.h" #include "kernel/log.h"
#include <algorithm> #include <algorithm>
#include <string> #include <string>
#include <regex>
#include <vector> #include <vector>
#include <cmath> #include <cmath>

15
kernel/driver.cc
View File

@ -413,22 +413,13 @@ int main(int argc, char **argv)
scriptfile_tcl = true; scriptfile_tcl = true;
break; break;
case 'W': case 'W':
log_warn_regexes.push_back(std::regex(optarg, log_warn_regexes.push_back(YS_REGEX_COMPILE(optarg));
std::regex_constants::nosubs |
std::regex_constants::optimize |
std::regex_constants::egrep));
break; break;
case 'w': case 'w':
log_nowarn_regexes.push_back(std::regex(optarg, log_nowarn_regexes.push_back(YS_REGEX_COMPILE(optarg));
std::regex_constants::nosubs |
std::regex_constants::optimize |
std::regex_constants::egrep));
break; break;
case 'e': case 'e':
log_werror_regexes.push_back(std::regex(optarg, log_werror_regexes.push_back(YS_REGEX_COMPILE(optarg));
std::regex_constants::nosubs |
std::regex_constants::optimize |
std::regex_constants::egrep));
break; break;
case 'D': case 'D':
vlog_defines.push_back(optarg); vlog_defines.push_back(optarg);

16
kernel/log.cc
View File

@ -41,8 +41,8 @@ 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, log_werror_regexes; std::vector<YS_REGEX_TYPE> 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<YS_REGEX_TYPE,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; int log_warnings_count_noexpect = 0;
@ -177,11 +177,11 @@ void logv(const char *format, va_list ap)
if (!linebuffer.empty() && linebuffer.back() == '\n') { if (!linebuffer.empty() && linebuffer.back() == '\n') {
for (auto &re : log_warn_regexes) for (auto &re : log_warn_regexes)
if (std::regex_search(linebuffer, re)) if (YS_REGEX_NS::regex_search(linebuffer, re))
log_warning("Found log message matching -W regex:\n%s", str.c_str()); log_warning("Found log message matching -W regex:\n%s", str.c_str());
for (auto &item : log_expect_log) for (auto &item : log_expect_log)
if (std::regex_search(linebuffer, item.first)) if (YS_REGEX_NS::regex_search(linebuffer, item.first))
item.second.current_count++; item.second.current_count++;
linebuffer.clear(); linebuffer.clear();
@ -238,7 +238,7 @@ static void logv_warning_with_prefix(const char *prefix,
bool suppressed = false; bool suppressed = false;
for (auto &re : log_nowarn_regexes) for (auto &re : log_nowarn_regexes)
if (std::regex_search(message, re)) if (YS_REGEX_NS::regex_search(message, re))
suppressed = true; suppressed = true;
if (suppressed) if (suppressed)
@ -251,12 +251,12 @@ static void logv_warning_with_prefix(const char *prefix,
log_make_debug = 0; log_make_debug = 0;
for (auto &re : log_werror_regexes) for (auto &re : log_werror_regexes)
if (std::regex_search(message, re)) if (YS_REGEX_NS::regex_search(message, re))
log_error("%s", message.c_str()); log_error("%s", message.c_str());
bool warning_match = false; bool warning_match = false;
for (auto &item : log_expect_warning) for (auto &item : log_expect_warning)
if (std::regex_search(message, item.first)) { if (YS_REGEX_NS::regex_search(message, item.first)) {
item.second.current_count++; item.second.current_count++;
warning_match = true; warning_match = true;
} }
@ -349,7 +349,7 @@ static void logv_error_with_prefix(const char *prefix,
log_error_atexit(); log_error_atexit();
for (auto &item : log_expect_error) for (auto &item : log_expect_error)
if (std::regex_search(log_last_error, item.first)) if (YS_REGEX_NS::regex_search(log_last_error, item.first))
item.second.current_count++; item.second.current_count++;
if (check_expected_logs) if (check_expected_logs)

22
kernel/log.h
View File

@ -23,7 +23,25 @@
#define LOG_H #define LOG_H
#include <time.h> #include <time.h>
// In GCC 4.8 std::regex is not working correctlty, in order to make features
// using regular expressions to work replacement regex library is used
#if defined(__GNUC__) && !defined( __clang__) && ( __GNUC__ == 4 && __GNUC_MINOR__ <= 8)
#include <boost/xpressive/xpressive.hpp>
#define YS_REGEX_TYPE boost::xpressive::sregex
#define YS_REGEX_NS boost::xpressive
#define YS_REGEX_COMPILE(param) boost::xpressive::sregex::compile(param, \
boost::xpressive::regex_constants::nosubs | \
boost::xpressive::regex_constants::optimize)
# else
#include <regex> #include <regex>
#define YS_REGEX_TYPE std::regex
#define YS_REGEX_NS std
#define YS_REGEX_COMPILE(param) std::regex(param, \
std::regex_constants::nosubs | \
std::regex_constants::optimize | \
std::regex_constants::egrep)
#endif
#ifndef _WIN32 #ifndef _WIN32
# include <sys/time.h> # include <sys/time.h>
@ -49,7 +67,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, log_werror_regexes; extern std::vector<YS_REGEX_TYPE> 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 int log_warnings_count_noexpect;
@ -151,7 +169,7 @@ struct LogExpectedItem
std::string pattern; std::string pattern;
}; };
extern std::vector<std::pair<std::regex,LogExpectedItem>> log_expect_log, log_expect_warning, log_expect_error; extern std::vector<std::pair<YS_REGEX_TYPE,LogExpectedItem>> log_expect_log, log_expect_warning, log_expect_error;
void log_check_expected(); void log_check_expected();
const char *log_signal(const RTLIL::SigSpec &sig, bool autoint = true); const char *log_signal(const RTLIL::SigSpec &sig, bool autoint = true);

38
passes/cmds/logger.cc
View File

@ -96,12 +96,9 @@ struct LoggerPass : public Pass {
if (pattern.front() == '\"' && pattern.back() == '\"') pattern = pattern.substr(1, pattern.size() - 2); if (pattern.front() == '\"' && pattern.back() == '\"') pattern = pattern.substr(1, pattern.size() - 2);
try { try {
log("Added regex '%s' for warnings to warn list.\n", pattern.c_str()); log("Added regex '%s' for warnings to warn list.\n", pattern.c_str());
log_warn_regexes.push_back(std::regex(pattern, log_warn_regexes.push_back(YS_REGEX_COMPILE(pattern));
std::regex_constants::nosubs |
std::regex_constants::optimize |
std::regex_constants::egrep));
} }
catch (const std::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());
} }
continue; continue;
@ -111,12 +108,9 @@ struct LoggerPass : public Pass {
if (pattern.front() == '\"' && pattern.back() == '\"') pattern = pattern.substr(1, pattern.size() - 2); if (pattern.front() == '\"' && pattern.back() == '\"') pattern = pattern.substr(1, pattern.size() - 2);
try { try {
log("Added regex '%s' for warnings to nowarn list.\n", pattern.c_str()); log("Added regex '%s' for warnings to nowarn list.\n", pattern.c_str());
log_nowarn_regexes.push_back(std::regex(pattern, log_nowarn_regexes.push_back(YS_REGEX_COMPILE(pattern));
std::regex_constants::nosubs |
std::regex_constants::optimize |
std::regex_constants::egrep));
} }
catch (const std::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());
} }
continue; continue;
@ -126,12 +120,9 @@ struct LoggerPass : public Pass {
if (pattern.front() == '\"' && pattern.back() == '\"') pattern = pattern.substr(1, pattern.size() - 2); if (pattern.front() == '\"' && pattern.back() == '\"') pattern = pattern.substr(1, pattern.size() - 2);
try { try {
log("Added regex '%s' for warnings to werror list.\n", pattern.c_str()); log("Added regex '%s' for warnings to werror list.\n", pattern.c_str());
log_werror_regexes.push_back(std::regex(pattern, log_werror_regexes.push_back(YS_REGEX_COMPILE(pattern));
std::regex_constants::nosubs |
std::regex_constants::optimize |
std::regex_constants::egrep));
} }
catch (const std::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());
} }
continue; continue;
@ -168,22 +159,13 @@ struct LoggerPass : public Pass {
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(std::regex(pattern, log_expect_error.push_back(std::make_pair(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count)));
std::regex_constants::nosubs |
std::regex_constants::optimize |
std::regex_constants::egrep), LogExpectedItem(pattern, count)));
else if (type=="warning") else if (type=="warning")
log_expect_warning.push_back(std::make_pair(std::regex(pattern, log_expect_warning.push_back(std::make_pair(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count)));
std::regex_constants::nosubs |
std::regex_constants::optimize |
std::regex_constants::egrep), LogExpectedItem(pattern, count)));
else else
log_expect_log.push_back(std::make_pair(std::regex(pattern, log_expect_log.push_back(std::make_pair(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count)));
std::regex_constants::nosubs |
std::regex_constants::optimize |
std::regex_constants::egrep), LogExpectedItem(pattern, count)));
} }
catch (const std::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());
} }
continue; continue;

6
tests/various/logger_error.ys Normal file
View File

@ -0,0 +1,6 @@
logger -werror "is implicitly declared." -expect error "is implicitly declared." 1
read_verilog << EOF
module top(...);
assign b = w;
endmodule
EOF

6
tests/various/logger_nowarning.ys Normal file
View File

@ -0,0 +1,6 @@
logger -expect-no-warnings -nowarn "is implicitly declared."
read_verilog << EOF
module top(...);
assign b = w;
endmodule
EOF

6
tests/various/logger_warn.ys Normal file
View File

@ -0,0 +1,6 @@
logger -warn "Successfully finished Verilog frontend." -expect warning "Successfully finished Verilog frontend." 1
read_verilog << EOF
module top(...);
assign b = w;
endmodule
EOF

6
tests/various/logger_warning.ys Normal file
View File

@ -0,0 +1,6 @@
logger -expect warning "is implicitly declared." 2
read_verilog << EOF
module top(...);
assign b = w;
endmodule
EOF