From 61abd994e9a3755fc69aff2a400e4a20dc64865c Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Tue, 13 Dec 2016 23:53:36 +0100 Subject: [PATCH] Revert "fir: force dsp48" This reverts commit 0ad433832d1b6dcd803ffa086ae73b2ee0568326. --- artiq/gateware/dsp/fir.py | 2 -- artiq/gateware/targets/phaser.py | 3 --- 2 files changed, 5 deletions(-) diff --git a/artiq/gateware/dsp/fir.py b/artiq/gateware/dsp/fir.py index cc0635106..6f1535528 100644 --- a/artiq/gateware/dsp/fir.py +++ b/artiq/gateware/dsp/fir.py @@ -65,7 +65,6 @@ class FIR(Module): if c == 0 or c in coefficients[i + 1:]: continue m = Signal((width + shift, True)) - m.attr.add("use_multiplier") self.sync += m.eq(c*reduce(add, [ xj for xj, cj in zip(x[::-1], coefficients) if cj == c ])) @@ -109,7 +108,6 @@ class ParallelFIR(Module): if c == 0 or c in coefficients[i + 1:]: continue m = Signal((width + shift, True)) - m.attr.add("use_multiplier") self.sync += m.eq(c*reduce(add, [ xj for xj, cj in zip(x[-1 - j::-1], coefficients) if cj == c ])) diff --git a/artiq/gateware/targets/phaser.py b/artiq/gateware/targets/phaser.py index 6f68517a7..9cc7c1559 100755 --- a/artiq/gateware/targets/phaser.py +++ b/artiq/gateware/targets/phaser.py @@ -169,9 +169,6 @@ class Phaser(MiniSoC, AMPSoC): ident=artiq_version, **kwargs) AMPSoC.__init__(self) - self.platform.toolchain.attr_translate["use_multiplier"] = \ - ("use_dsp48", "yes") - self.platform.toolchain.bitstream_commands.extend([ "set_property BITSTREAM.GENERAL.COMPRESS True [current_design]", ])