replica
/
firesim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 'origin/master' into dev for blkdev fix; bump midas

This commit is contained in:
David Biancolin 2019-07-23 23:19:34 +00:00
parent 71ac2daf42 06afda9853
commit 341a538b6f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sim/firesim-lib/src/main/scala/endpoints/BlockDevWidget.scala
View File

@ -164,6 +164,9 @@ class BlockDevWidget(implicit p: Parameters) extends EndpointWidget()(p) {
when (tFire) {
when (done || idle) {
readRespBeatsLeft := 0.U
returnWrite := false.B
// If a write-response is waiting, return it first
when(writeLatencyPipe.io.deq.valid) {
returnWrite := true.B
@ -171,9 +174,6 @@ class BlockDevWidget(implicit p: Parameters) extends EndpointWidget()(p) {
}.elsewhen(readLatencyPipe.io.deq.valid) {
readRespBeatsLeft := readLatencyPipe.io.deq.bits * dataBeats.U
readLatencyPipe.io.deq.ready := true.B
}.otherwise {
readRespBeatsLeft := 0.U
returnWrite := false.B
}
}.elsewhen(readRespBusy && target.resp.fire) {
readRespBeatsLeft := readRespBeatsLeft - 1.U

2
sim/midas

@ -1 +1 @@
Subproject commit e88aa10dc6db4ca4b4fd0c7b439fc2fef8db8e8e
Subproject commit 71a516a5fd70e05b35d388a2c83a494f63fdbe26