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

Merge remote-tracking branch 'origin/biancolin/tracerv-fmr-fix' into revamp-wide-tracerv-w-fix

This commit is contained in:
abejgonzalez 2023-07-10 11:03:48 -07:00
parent f00b3a2223 073b62254d
commit 58be50680f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sim/firesim-lib/src/main/scala/bridges/TracerVBridge.scala
View File

@ -201,14 +201,6 @@ class TracerVBridgeModule(key: TraceBundleWidths)(implicit p: Parameters)
),
)
val tFireHelper = DecoupledHelper(streamEnq.ready, hPort.toHost.hValid, hPort.fromHost.hReady, initDone)
val triggerReg = RegEnable(trigger, false.B, tFireHelper.fire())
hPort.hBits.triggerDebit := !trigger && triggerReg
hPort.hBits.triggerCredit := trigger && !triggerReg
hPort.fromHost.hValid := tFireHelper.fire(hPort.fromHost.hReady)
// the maximum width of a single arm, this is determined by the 512 bit width of a single beat
val armWidth = 7
@ -247,8 +239,9 @@ class TracerVBridgeModule(key: TraceBundleWidths)(implicit p: Parameters)
val maybeFire = !anyValidRemainMux || (counter === (armCount - 1).U)
val maybeEnq = anyValidRemainMux
val do_enq_helper = DecoupledHelper(hPort.toHost.hValid, streamEnq.ready, maybeEnq, traceEnable)
val do_fire_helper = DecoupledHelper(hPort.toHost.hValid, streamEnq.ready, maybeFire)
val commonPredicates = Seq(hPort.toHost.hValid, hPort.fromHost.hReady, streamEnq.ready, initDone)
val do_enq_helper = DecoupledHelper((Seq(maybeEnq, traceEnable) ++ commonPredicates):_*)
val do_fire_helper = DecoupledHelper((maybeFire +: commonPredicates):_*)
// Note, if we dequeue a token that wins out over the increment below
when(do_fire_helper.fire()) {
@ -260,6 +253,13 @@ class TracerVBridgeModule(key: TraceBundleWidths)(implicit p: Parameters)
streamEnq.valid := do_enq_helper.fire(streamEnq.ready, trigger)
hPort.toHost.hReady := do_fire_helper.fire(hPort.toHost.hValid)
// Output token (back to hub model) handling.
val triggerReg = RegEnable(trigger, false.B, do_fire_helper.fire())
hPort.hBits.triggerDebit := !trigger && triggerReg
hPort.hBits.triggerCredit := trigger && !triggerReg
hPort.fromHost.hValid := do_fire_helper.fire(hPort.fromHost.hReady)
when(hPort.toHost.fire) {
trace_cycle_counter := trace_cycle_counter + 1.U
}