diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2020-01-06 12:04:08 -0800 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2020-01-06 12:04:08 -0800 |
| commit | 921ff0f5e3f0ec688d08e8bf67e36ca877a9dc80 (patch) | |
| tree | 0735437101f3b2219918146e5b2b3244b2f54f1b /techlibs | |
| parent | c89186b363056060838c79621889075aa1484194 (diff) | |
| parent | 64ace4b0dc5c8dd24132bc8046b2bacc163f9164 (diff) | |
| download | yosys-921ff0f5e3f0ec688d08e8bf67e36ca877a9dc80.tar.gz yosys-921ff0f5e3f0ec688d08e8bf67e36ca877a9dc80.tar.bz2 yosys-921ff0f5e3f0ec688d08e8bf67e36ca877a9dc80.zip | |
Merge remote-tracking branch 'origin/xaig_dff' into eddie/abc9_refactor
Diffstat (limited to 'techlibs')
| -rw-r--r-- | techlibs/ice40/ice40_opt.cc | 2 | ||||
| -rw-r--r-- | techlibs/xilinx/abc9_xc7.box | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/techlibs/ice40/ice40_opt.cc b/techlibs/ice40/ice40_opt.cc index 371ceb623..9bee0444b 100644 --- a/techlibs/ice40/ice40_opt.cc +++ b/techlibs/ice40/ice40_opt.cc @@ -128,6 +128,8 @@ static void run_ice40_opts(Module *module) new_attr.insert(std::make_pair(a.first, a.second)); else if (a.first.in(ID(SB_LUT4.name), ID::keep, ID(module_not_derived))) continue; + else if (a.first.begins_with("\\SB_CARRY.\\")) + continue; else log_abort(); cell->attributes = std::move(new_attr); diff --git a/techlibs/xilinx/abc9_xc7.box b/techlibs/xilinx/abc9_xc7.box index 1dff88509..a68da745f 100644 --- a/techlibs/xilinx/abc9_xc7.box +++ b/techlibs/xilinx/abc9_xc7.box @@ -58,7 +58,7 @@ $__ABC9_ASYNC0 1000 1 2 1 # Box 1001 : $__ABC9_ASYNC1 # (private cell to emulate async behaviour of FDP*) # name ID w/b ins outs -$__ABC9_ASYNC1 1001 1 2 1 +$__ABC9_ASYNC1 1001 1 2 1 #A S 0 764 # Y |