Fix {r,w}_level in AsyncFIFOBuffered #512
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #512 +/- ##
==========================================
+ Coverage 81.32% 81.33% +0.01%
==========================================
Files 49 49
Lines 6414 6419 +5
Branches 1282 1282
==========================================
+ Hits 5216 5221 +5
Misses 1009 1009
Partials 189 189
Continue to review full report at Codecov.
|
whitequark
reviewed
Oct 22, 2020
|
This should be rebased onto master now (which includes the other PR) |
whitequark
requested changes
Oct 25, 2020
nmigen/lib/fifo.py
Outdated
| ] | ||
|
|
||
| m.d[self._r_domain] += self.r_level.eq(fifo.r_level + self.r_rdy - self.r_en) | ||
| buffer_used = Signal() |
There was a problem hiding this comment.
I think this code would be easier to understand if the signals subject to CDC used the same naming conventions as the ones in AsyncFIFO; something like r_consume_buffered and w_consume_buffered.
nmigen/lib/fifo.py
Outdated
| m.d[self._r_domain] += self.r_level.eq(fifo.r_level + buffer_used) | ||
|
|
||
| buffer_used_in_wr_domain = Signal() | ||
| m.submodules.rst_cdc = AsyncFFSynchronizer(buffer_used, buffer_used_in_wr_domain, o_domain=self._w_domain) |
There was a problem hiding this comment.
The rst_cdc name is a copy/paste leftover. I'd use consume_buffered_cdc.
anuejn
force-pushed
the
fifo_bugfix
branch
2 times, most recently
from
54051b8
to
8332cc5
Compare
whitequark
approved these changes
Nov 3, 2020
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This Fixes #485 as per discussion in https://freenode.irclog.whitequark.org/glasgow/2020-10-22#1603367304-1603369561