diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2020-04-23 06:43:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-23 06:43:30 -0700 |
| commit | b048afc3a60984d10da7e4618236b957dab527a8 (patch) | |
| tree | 0fd01b6aa473c02cdfd3a5e7fcf211cf5beee04f | |
| parent | dc9a72bc8d003e4d6cc6b40afbb8b6ce792799c0 (diff) | |
| parent | 3d7b98335150bc5ffe58e312ea4433311af8b111 (diff) | |
| download | yosys-b048afc3a60984d10da7e4618236b957dab527a8.tar.gz yosys-b048afc3a60984d10da7e4618236b957dab527a8.tar.bz2 yosys-b048afc3a60984d10da7e4618236b957dab527a8.zip | |
Merge pull request #1974 from YosysHQ/eddie/abc9_disable_mfs
abc9: tolerate &mfs failure by writing output file before calling it (and using that if it fails)
| -rw-r--r-- | passes/techmap/abc9_exe.cc | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/passes/techmap/abc9_exe.cc b/passes/techmap/abc9_exe.cc index 18618ff91..bad91a224 100644 --- a/passes/techmap/abc9_exe.cc +++ b/passes/techmap/abc9_exe.cc @@ -219,6 +219,17 @@ void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe 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); + if (design->scratchpad_get_bool("abc9.nomfs")) + for (size_t pos = abc9_script.find("&mfs"); pos != std::string::npos; pos = abc9_script.find("&mfs", pos)) + abc9_script = abc9_script.erase(pos, strlen("&mfs")); + else { + auto s = stringf("&write -n %s/output.aig; ", tempdir_name.c_str()); + for (size_t pos = abc9_script.find("&mfs"); pos != std::string::npos; pos = abc9_script.find("&mfs", pos)) { + abc9_script = abc9_script.insert(pos, s); + pos += GetSize(s) + strlen("&mfs"); + } + } + abc9_script += stringf("; &ps -l; &write -n %s/output.aig", tempdir_name.c_str()); if (design->scratchpad_get_bool("abc9.verify")) { if (dff_mode) @@ -272,8 +283,12 @@ void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe free(abc9_argv[2]); free(abc9_argv[3]); #endif - if (ret != 0) - log_error("ABC: execution of command \"%s\" failed: return code %d.\n", buffer.c_str(), ret); + if (ret != 0) { + if (check_file_exists(stringf("%s/output.aig", tempdir_name.c_str()))) + log_warning("ABC: execution of command \"%s\" failed: return code %d.\n", buffer.c_str(), ret); + else + log_error("ABC: execution of command \"%s\" failed: return code %d.\n", buffer.c_str(), ret); + } } struct Abc9ExePass : public Pass { |