Skip to content

Fix FIR multiplication #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dankirkham wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix FIR multiplication #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions rust-hdl-widgets/src/mac_fir.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ pub struct MultiplyAccumulateSymmetricFiniteImpulseResponseFilter<const ADDR_BIT
accum: DFF<Signed<48>>,
// FIR state
state: DFF<MACFIRState>,
// The output of the Multiply
multiply_output: Signal<Local, Signed<32>>,
// The output of the MAC slice
mac_output: Signal<Local, Signed<48>>,
// The next write location for data
Expand Down Expand Up @@ -96,9 +98,8 @@ impl<const ADDR_BITS: usize> Logic
self.right_sample.next = 0.into();
}
// Wire up the accumulator
self.mac_output.next = signed_bit_cast::<48, 32>(
(self.left_sample.val() + self.right_sample.val()) * (self.coeff_memory.data.val()),
) + self.accum.q.val();
self.multiply_output.next = (self.left_sample.val() + self.right_sample.val()) * self.coeff_memory.data.val();
self.mac_output.next = signed_bit_cast::<48, 32>(self.multiply_output.val()) + self.accum.q.val();
if self.state.q.val() == MACFIRState::Idle {
self.mac_output.next = 0.into();
}
Expand Down Expand Up @@ -185,6 +186,7 @@ impl<const ADDR_BITS: usize> MultiplyAccumulateSymmetricFiniteImpulseResponseFil
right_sample: Default::default(),
accum: Default::default(),
state: Default::default(),
multiply_output: Default::default(),
mac_output: Default::default(),
data_write: Default::default(),
taps: Constant::new(taps.to_bits()),
Expand Down