diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2020-11-06 14:17:15 +0100 |
|---|---|---|
| committer | Miodrag Milanovic <mmicko@gmail.com> | 2020-11-06 14:17:15 +0100 |
| commit | 829b5cca602984e67c756d9c81b40e55e32be779 (patch) | |
| tree | 4aa4f9a2fe56fcf665dd16682032d312bec2871e /passes/techmap/abc.cc | |
| parent | e7f36d01e44fb76b2352606ee6c7001662a7c638 (diff) | |
| download | yosys-829b5cca602984e67c756d9c81b40e55e32be779.tar.gz yosys-829b5cca602984e67c756d9c81b40e55e32be779.tar.bz2 yosys-829b5cca602984e67c756d9c81b40e55e32be779.zip | |
Expose abc and data paths as globals
Diffstat (limited to 'passes/techmap/abc.cc')
| -rw-r--r-- | passes/techmap/abc.cc | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc index 66ac6828f..192e39372 100644 --- a/passes/techmap/abc.cc +++ b/passes/techmap/abc.cc @@ -1470,16 +1470,7 @@ struct AbcPass : public Pass { pi_map.clear(); po_map.clear(); -#ifdef ABCEXTERNAL - std::string exe_file; - if (std::getenv("ABC")) { - exe_file = std::getenv("ABC"); - } else { - exe_file = ABCEXTERNAL; - } -#else - std::string exe_file = proc_self_dirname() + proc_program_prefix() + "yosys-abc"; -#endif + std::string exe_file = yosys_abc_executable; std::string script_file, liberty_file, constr_file, clk_str; std::string delay_target, sop_inputs, sop_products, lutin_shared = "-S 1"; bool fast_mode = false, dff_mode = false, keepff = false, cleanup = true; @@ -1494,13 +1485,6 @@ struct AbcPass : public Pass { enabled_gates.clear(); cmos_cost = false; -#ifdef _WIN32 -#ifndef ABCEXTERNAL - if (!check_file_exists(exe_file + ".exe") && check_file_exists(proc_self_dirname() + "..\\" + proc_program_prefix()+ "yosys-abc.exe")) - exe_file = proc_self_dirname() + "..\\" + proc_program_prefix() + "yosys-abc"; -#endif -#endif - // get arguments from scratchpad first, then override by command arguments std::string lut_arg, luts_arg, g_arg; exe_file = design->scratchpad_get_string("abc.exe", exe_file /* inherit default value if not set */); |