-
Notifications
You must be signed in to change notification settings - Fork 615
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* Make PriorityMux stack safe (#2854) It used to be implemented with recursion, now it's implemented with a stack safe reverse and foldLeft. Also there were no tests for PriorityMux so I added one which helps prove the change is functionally correct. (cherry picked from commit 269ce47) # Conflicts: # src/test/scala/chiselTests/util/PipeSpec.scala * Resolve backport conflicts Co-authored-by: Jack Koenig <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
- Loading branch information
1 parent
fa11cd7
commit 41d0d4c
Showing
2 changed files
with
64 additions
and
1 deletion.
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
package chiselTests.util | ||
|
||
import chisel3._ | ||
import chisel3.util.{is, switch, Counter, PriorityMux} | ||
import chisel3.testers.BasicTester | ||
import chisel3.stage.ChiselStage.emitChirrtl | ||
|
||
import chiselTests.ChiselFlatSpec | ||
|
||
class PriorityMuxTester extends BasicTester { | ||
|
||
val sel = Wire(UInt(3.W)) | ||
sel := 0.U // default | ||
|
||
val elts = Seq(5.U, 6.U, 7.U) | ||
val muxed = PriorityMux(sel, elts) | ||
|
||
// Priority is given to lowest order bit | ||
val tests = Seq( | ||
1.U -> elts(0), | ||
2.U -> elts(1), | ||
3.U -> elts(0), | ||
4.U -> elts(2), | ||
5.U -> elts(0), | ||
6.U -> elts(1), | ||
7.U -> elts(0) | ||
) | ||
val (cycle, done) = Counter(0 until tests.size + 1) | ||
|
||
for (((in, out), idx) <- tests.zipWithIndex) { | ||
when(cycle === idx.U) { | ||
sel := in | ||
assert(muxed === out) | ||
} | ||
} | ||
|
||
when(done) { | ||
stop() | ||
} | ||
} | ||
|
||
class PriorityMuxSpec extends ChiselFlatSpec { | ||
behavior.of("PriorityMux") | ||
|
||
it should "be functionally correct" in { | ||
assertTesterPasses(new PriorityMuxTester) | ||
} | ||
|
||
it should "be stack safe" in { | ||
emitChirrtl(new RawModule { | ||
val n = 1 << 15 | ||
val in = IO(Input(Vec(n, UInt(8.W)))) | ||
val sel = IO(Input(UInt(n.W))) | ||
val out = IO(Output(UInt(8.W))) | ||
out := PriorityMux(sel, in) | ||
}) | ||
} | ||
} |