diff options
| author | Clifford Wolf <clifford@clifford.at> | 2017-06-20 04:22:34 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2017-06-20 04:22:34 +0200 |
| commit | f6421c83a28f0db29fd80ad2b2fbc59f6b1ccace (patch) | |
| tree | dd0ab5ea54b182c2e43c8ea1202df59b7376af4f | |
| parent | 8f8baccfde62d238025024eb1060ae0aba4c77e3 (diff) | |
| download | yosys-f6421c83a28f0db29fd80ad2b2fbc59f6b1ccace.tar.gz yosys-f6421c83a28f0db29fd80ad2b2fbc59f6b1ccace.tar.bz2 yosys-f6421c83a28f0db29fd80ad2b2fbc59f6b1ccace.zip | |
Switched abc "clock domain not found" error to log_cmd_error()
| -rw-r--r-- | passes/techmap/abc.cc | 52 |
1 files changed, 28 insertions, 24 deletions
diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc index dd2469839..2f8310848 100644 --- a/passes/techmap/abc.cc +++ b/passes/techmap/abc.cc @@ -621,6 +621,30 @@ void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std::strin en_sig = RTLIL::SigSpec(); } + if (!clk_str.empty() && clk_str != "$") + { + if (clk_str.find(',') != std::string::npos) { + int pos = clk_str.find(','); + std::string en_str = clk_str.substr(pos+1); + clk_str = clk_str.substr(0, pos); + if (en_str[0] == '!') { + en_polarity = false; + en_str = en_str.substr(1); + } + if (module->wires_.count(RTLIL::escape_id(en_str)) != 0) + en_sig = assign_map(RTLIL::SigSpec(module->wires_.at(RTLIL::escape_id(en_str)), 0)); + } + if (clk_str[0] == '!') { + clk_polarity = false; + clk_str = clk_str.substr(1); + } + if (module->wires_.count(RTLIL::escape_id(clk_str)) != 0) + clk_sig = assign_map(RTLIL::SigSpec(module->wires_.at(RTLIL::escape_id(clk_str)), 0)); + } + + if (dff_mode && clk_sig.empty()) + log_cmd_error("Clock domain %s not found.\n", clk_str.c_str()); + std::string tempdir_name = "/tmp/yosys-abc-XXXXXX"; if (!cleanup) tempdir_name[0] = tempdir_name[4] = '_'; @@ -693,30 +717,6 @@ void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std::strin fprintf(f, "%s\n", abc_script.c_str()); fclose(f); - if (!clk_str.empty() && clk_str != "$") - { - if (clk_str.find(',') != std::string::npos) { - int pos = clk_str.find(','); - std::string en_str = clk_str.substr(pos+1); - clk_str = clk_str.substr(0, pos); - if (en_str[0] == '!') { - en_polarity = false; - en_str = en_str.substr(1); - } - if (module->wires_.count(RTLIL::escape_id(en_str)) != 0) - en_sig = assign_map(RTLIL::SigSpec(module->wires_.at(RTLIL::escape_id(en_str)), 0)); - } - if (clk_str[0] == '!') { - clk_polarity = false; - clk_str = clk_str.substr(1); - } - if (module->wires_.count(RTLIL::escape_id(clk_str)) != 0) - clk_sig = assign_map(RTLIL::SigSpec(module->wires_.at(RTLIL::escape_id(clk_str)), 0)); - } - - if (dff_mode && clk_sig.empty()) - log_error("Clock domain %s not found.\n", clk_str.c_str()); - if (dff_mode || !clk_str.empty()) { if (clk_sig.size() == 0) @@ -1369,6 +1369,10 @@ struct AbcPass : public Pass { log_header(design, "Executing ABC pass (technology mapping using ABC).\n"); log_push(); + assign_map.clear(); + signal_list.clear(); + signal_map.clear(); + #ifdef ABCEXTERNAL std::string exe_file = ABCEXTERNAL; #else |