M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

dsp.fir: drop x shift

This commit is contained in:
Robert Jördens 2017-06-28 19:55:15 +02:00
parent 01847271c5
commit 6bb994228f
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
artiq/gateware/dsp/fir.py
View File

@ -70,7 +70,7 @@ class ParallelFIR(Module):
# input and output: old to new, decreasing delay # input and output: old to new, decreasing delay
self.i = [Signal((width, True)) for i in range(p)] self.i = [Signal((width, True)) for i in range(p)]
self.o = [Signal((width, True)) for i in range(p)] self.o = [Signal((width, True)) for i in range(p)]
self.latency = (n + 1)//2//p + 2 self.latency = (n + 1)//2//p + 1
w = _widths[arch] w = _widths[arch]
c_max = max(abs(c) for c in coefficients) c_max = max(abs(c) for c in coefficients)
@ -83,22 +83,17 @@ class ParallelFIR(Module):
# Delay line: increasing delay # Delay line: increasing delay
x = [Signal((w.A, True), reset_less=True) for _ in range(n + p - 1)] x = [Signal((w.A, True), reset_less=True) for _ in range(n + p - 1)]
x_shift = w.A - width
# reduce by pre-adder gain
x_shift -= bits_for(max(cs.count(c) for c in cs if c) - 1)
# TODO: reduce by P width limit?
assert x_shift + width <= w.A
assert sum(abs(c)*(1 << w.A - 1) for c in cs) <= (1 << w.P - 1) - 1 assert sum(abs(c)*(1 << w.A - 1) for c in cs) <= (1 << w.P - 1) - 1
for xi, xj in zip(x, self.i[::-1]): for xi, xj in zip(x, self.i[::-1]):
self.sync += xi.eq(xj << x_shift) self.comb += xi.eq(xj)
for xi, xj in zip(x[len(self.i):], x): for xi, xj in zip(x[len(self.i):], x):
self.sync += xi.eq(xj) self.sync += xi.eq(xj)
for delay in range(p): for delay in range(p):
o = Signal((w.P, True), reset_less=True) o = Signal((w.P, True), reset_less=True)
self.comb += self.o[delay].eq(o >> c_shift + x_shift) self.comb += self.o[delay].eq(o >> c_shift)
# Make products # Make products
for i, c in enumerate(cs): for i, c in enumerate(cs):
# simplify for halfband and symmetric filters # simplify for halfband and symmetric filters
@ -117,8 +112,8 @@ class ParallelFIR(Module):
self.comb += q.eq(reduce(add, [x[j - delay] for j in js])) self.comb += q.eq(reduce(add, [x[j - delay] for j in js]))
self.sync += m.eq(c*q) self.sync += m.eq(c*q)
# symmetric rounding # symmetric rounding
if c_shift + x_shift > 1: if c_shift > 1:
self.comb += o.eq((1 << c_shift + x_shift - 1) - 1) self.comb += o.eq((1 << c_shift - 1) - 1)
class FIR(ParallelFIR): class FIR(ParallelFIR):