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

Merge pull request #1026 from YosysHQ/clifford/fix1023 

Keep zero-width wires in opt_clean if and only if they are ports
This commit is contained in:
Clifford Wolf 2019-05-27 13:24:19 +02:00 committed by GitHub
parent da140dd260 e3f9ccf56d
commit 2a9c68e2d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/log.cc
View File

@ -230,6 +230,9 @@ static void logv_warning_with_prefix(const char *prefix,
} }
else else
{ {
int bak_log_make_debug = log_make_debug;
log_make_debug = 0;
for (auto &re : log_werror_regexes) for (auto &re : log_werror_regexes)
if (std::regex_search(message, re)) if (std::regex_search(message, re))
log_error("%s", message.c_str()); log_error("%s", message.c_str());
@ -254,6 +257,7 @@ static void logv_warning_with_prefix(const char *prefix,
} }
log_warnings_count++; log_warnings_count++;
log_make_debug = bak_log_make_debug;
} }
} }
@ -285,6 +289,9 @@ static void logv_error_with_prefix(const char *prefix,
#ifdef EMSCRIPTEN #ifdef EMSCRIPTEN
auto backup_log_files = log_files; auto backup_log_files = log_files;
#endif #endif
int bak_log_make_debug = log_make_debug;
log_make_debug = 0;
log_suppressed();
if (log_errfile != NULL) if (log_errfile != NULL)
log_files.push_back(log_errfile); log_files.push_back(log_errfile);
@ -298,6 +305,8 @@ static void logv_error_with_prefix(const char *prefix,
log("%s%s", prefix, log_last_error.c_str()); log("%s%s", prefix, log_last_error.c_str());
log_flush(); log_flush();
log_make_debug = bak_log_make_debug;
if (log_error_atexit) if (log_error_atexit)
log_error_atexit(); log_error_atexit();

5
passes/opt/opt_clean.cc
View File

@ -319,8 +319,9 @@ bool rmunused_module_signals(RTLIL::Module *module, bool purge_mode, bool verbos
wire->attributes.erase("\\init"); wire->attributes.erase("\\init");
if (GetSize(wire) == 0) { if (GetSize(wire) == 0) {
// delete zero-width wires // delete zero-width wires, unless they are module ports
goto delete_this_wire; if (wire->port_id == 0)
goto delete_this_wire;
} else } else
if (wire->port_id != 0 || wire->get_bool_attribute("\\keep") || !initval.is_fully_undef()) { if (wire->port_id != 0 || wire->get_bool_attribute("\\keep") || !initval.is_fully_undef()) {
// do not delete anything with "keep" or module ports or initialized wires // do not delete anything with "keep" or module ports or initialized wires