diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2020-01-22 12:27:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 12:27:41 -0800 |
| commit | da6abc014987ef562a577dc374bcb03aad9256cd (patch) | |
| tree | 7f8df26dafcd23e4f13b69ce678a0faa5820951b | |
| parent | 5791c52e1b0c0e52299ee1c293a41d712d782422 (diff) | |
| parent | a94b41011d5ec9514739c52b963e0bd96890973f (diff) | |
| download | yosys-da6abc014987ef562a577dc374bcb03aad9256cd.tar.gz yosys-da6abc014987ef562a577dc374bcb03aad9256cd.tar.bz2 yosys-da6abc014987ef562a577dc374bcb03aad9256cd.zip | |
Merge pull request #1652 from YosysHQ/eddie/abc9_fixes
Eddie/abc9 fixes
| -rw-r--r-- | passes/techmap/abc9.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/passes/techmap/abc9.cc b/passes/techmap/abc9.cc index 1f6cdaa22..2568a6cd1 100644 --- a/passes/techmap/abc9.cc +++ b/passes/techmap/abc9.cc @@ -304,14 +304,14 @@ void abc9_module(RTLIL::Design *design, RTLIL::Module *module, std::string scrip for (size_t pos = abc9_script.find("{R}"); pos != std::string::npos; pos = abc9_script.find("{R}", pos)) abc9_script = abc9_script.substr(0, pos) + R + abc9_script.substr(pos+3); - abc9_script += stringf("; &ps -l; &write -n %s/output.aig;", tempdir_name.c_str()); + abc9_script += stringf("; &ps -l; &write -n %s/output.aig", tempdir_name.c_str()); if (design->scratchpad_get_bool("abc9.verify")) { if (dff_mode) - abc9_script += "verify -s;"; + abc9_script += "; &verify -s"; else - abc9_script += "verify;"; + abc9_script += "; &verify"; } - abc9_script += "time"; + abc9_script += "; time"; abc9_script = add_echos_to_abc9_cmd(abc9_script); for (size_t i = 0; i+1 < abc9_script.size(); i++) @@ -1069,6 +1069,8 @@ struct Abc9Pass : public Pass { SigSpec abc9_init = assign_map(abc9_init_wire); if (!abc9_init.is_fully_const()) log_error("'%s.init' is not a constant wire present in module '%s'.\n", cell->name.c_str(), log_id(module)); + if (abc9_init == State::S1) + log_error("'%s.init' in module '%s' has value 1'b1 which is not supported by 'abc9 -dff'.\n", cell->name.c_str(), log_id(module)); r2 = cell->attributes.insert(std::make_pair(ID(abc9_init), abc9_init.as_const())); log_assert(r2.second); } |