riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

fix combinational loop in TileLink Unwrapper

Browse Source
This commit is contained in:
Howard Mao 2015-10-20 23:26:11 -07:00
parent ffe7df2fed
commit baf95533a4
2 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
uncore/src/main/scala/tilelink.scala
View File

@ -1313,8 +1313,12 @@ class ClientTileLinkIOUnwrapper(implicit p: Parameters) extends TLModule()(p) {
val acqArb = Module(new LockingRRArbiter(new Acquire, 2, tlDataBeats, val acqArb = Module(new LockingRRArbiter(new Acquire, 2, tlDataBeats,
Some((acq: Acquire) => acq.hasMultibeatData()))) Some((acq: Acquire) => acq.hasMultibeatData())))
val roqArb = Module(new RRArbiter(new ReorderQueueWrite(
new ClientTileLinkIOUnwrapperInfo, tlClientXactIdBits), 2)) val acqRoq = Module(new ReorderQueue(
Bool(), tlClientXactIdBits, tlMaxClientsPerPort))
val relRoq = Module(new ReorderQueue(
Bool(), tlClientXactIdBits, tlMaxClientsPerPort))
val iacq = io.in.acquire.bits val iacq = io.in.acquire.bits
val irel = io.in.release.bits val irel = io.in.release.bits
@ -1323,8 +1327,8 @@ class ClientTileLinkIOUnwrapper(implicit p: Parameters) extends TLModule()(p) {
val acq_roq_enq = needsRoqEnq(iacq) val acq_roq_enq = needsRoqEnq(iacq)
val rel_roq_enq = needsRoqEnq(irel) val rel_roq_enq = needsRoqEnq(irel)
val acq_roq_ready = !acq_roq_enq || roqArb.io.in(0).ready val acq_roq_ready = !acq_roq_enq || acqRoq.io.enq.ready
val rel_roq_ready = !rel_roq_enq || roqArb.io.in(1).ready val rel_roq_ready = !rel_roq_enq || relRoq.io.enq.ready
val acq_helper = DecoupledHelper( val acq_helper = DecoupledHelper(
io.in.acquire.valid, io.in.acquire.valid,
@ -1336,10 +1340,9 @@ class ClientTileLinkIOUnwrapper(implicit p: Parameters) extends TLModule()(p) {
rel_roq_ready, rel_roq_ready,
acqArb.io.in(1).ready) acqArb.io.in(1).ready)
roqArb.io.in(0).valid := acq_helper.fire(acq_roq_ready, acq_roq_enq) acqRoq.io.enq.valid := acq_helper.fire(acq_roq_ready, acq_roq_enq)
roqArb.io.in(0).bits.data.voluntary := Bool(false) acqRoq.io.enq.bits.data := iacq.isBuiltInType()
roqArb.io.in(0).bits.data.builtin := iacq.isBuiltInType() acqRoq.io.enq.bits.tag := iacq.client_xact_id
roqArb.io.in(0).bits.tag := iacq.client_xact_id
acqArb.io.in(0).valid := acq_helper.fire(acqArb.io.in(0).ready) acqArb.io.in(0).valid := acq_helper.fire(acqArb.io.in(0).ready)
acqArb.io.in(0).bits := Acquire( acqArb.io.in(0).bits := Acquire(
@ -1351,13 +1354,12 @@ class ClientTileLinkIOUnwrapper(implicit p: Parameters) extends TLModule()(p) {
addr_beat = iacq.addr_beat, addr_beat = iacq.addr_beat,
data = iacq.data, data = iacq.data,
union = Mux(iacq.isBuiltInType(), union = Mux(iacq.isBuiltInType(),
iacq.union, Cat(Acquire.fullWriteMask, Bool(false)))) iacq.union, Cat(MT_Q, M_XRD, Bool(true))))
io.in.acquire.ready := acq_helper.fire(io.in.acquire.valid) io.in.acquire.ready := acq_helper.fire(io.in.acquire.valid)
roqArb.io.in(1).valid := rel_helper.fire(rel_roq_ready, rel_roq_enq) relRoq.io.enq.valid := rel_helper.fire(rel_roq_ready, rel_roq_enq)
roqArb.io.in(1).bits.data.voluntary := irel.isVoluntary() relRoq.io.enq.bits.data := irel.isVoluntary()
roqArb.io.in(1).bits.data.builtin := Bool(true) relRoq.io.enq.bits.tag := irel.client_xact_id
roqArb.io.in(1).bits.tag := irel.client_xact_id
acqArb.io.in(1).valid := rel_helper.fire(acqArb.io.in(1).ready) acqArb.io.in(1).valid := rel_helper.fire(acqArb.io.in(1).ready)
acqArb.io.in(1).bits := PutBlock( acqArb.io.in(1).bits := PutBlock(
@ -1370,25 +1372,33 @@ class ClientTileLinkIOUnwrapper(implicit p: Parameters) extends TLModule()(p) {
io.out.acquire <> acqArb.io.out io.out.acquire <> acqArb.io.out
val roq = Module(new ReorderQueue( acqRoq.io.deq.valid := io.out.grant.fire() && needsRoqDeq(ognt)
new ClientTileLinkIOUnwrapperInfo, tlClientXactIdBits, tlMaxClientsPerPort)) acqRoq.io.deq.tag := ognt.client_xact_id
roq.io.enq <> roqArb.io.out
roq.io.deq.valid := io.out.grant.valid && needsRoqDeq(ognt)
roq.io.deq.tag := ognt.client_xact_id
val gnt_builtin = roq.io.deq.data.builtin relRoq.io.deq.valid := io.out.grant.fire() && needsRoqDeq(ognt)
val gnt_voluntary = roq.io.deq.data.voluntary relRoq.io.deq.tag := ognt.client_xact_id
io.in.grant.valid := io.out.grant.valid val gnt_builtin = acqRoq.io.deq.data
io.in.grant.bits := Grant( val gnt_voluntary = relRoq.io.deq.data
val acq_grant = Grant(
is_builtin_type = gnt_builtin, is_builtin_type = gnt_builtin,
g_type = MuxCase(ognt.g_type, Seq( g_type = Mux(gnt_builtin, ognt.g_type, tlCoh.getExclusiveGrantType),
(!gnt_builtin, tlCoh.getExclusiveGrantType),
(gnt_voluntary, Grant.voluntaryAckType))),
client_xact_id = ognt.client_xact_id, client_xact_id = ognt.client_xact_id,
manager_xact_id = ognt.manager_xact_id, manager_xact_id = ognt.manager_xact_id,
addr_beat = ognt.addr_beat, addr_beat = ognt.addr_beat,
data = ognt.data) data = ognt.data)
val rel_grant = Grant(
is_builtin_type = Bool(true),
g_type = Mux(gnt_voluntary, Grant.voluntaryAckType, ognt.g_type),
client_xact_id = ognt.client_xact_id,
manager_xact_id = ognt.manager_xact_id,
addr_beat = ognt.addr_beat,
data = ognt.data)
io.in.grant.valid := io.out.grant.valid
io.in.grant.bits := Mux(acqRoq.io.deq.matches, acq_grant, rel_grant)
io.out.grant.ready := io.in.grant.ready io.out.grant.ready := io.in.grant.ready
io.in.probe.valid := Bool(false) io.in.probe.valid := Bool(false)

5
uncore/src/main/scala/util.scala
View File

@ -121,6 +121,7 @@ class ReorderQueue[T <: Data](dType: T, tagWidth: Int, size: Int)
val valid = Bool(INPUT) val valid = Bool(INPUT)
val tag = UInt(INPUT, tagWidth) val tag = UInt(INPUT, tagWidth)
val data = dType.cloneType.asOutput val data = dType.cloneType.asOutput
val matches = Bool(OUTPUT)
} }
val full = Bool(OUTPUT) val full = Bool(OUTPUT)
} }
@ -130,10 +131,12 @@ class ReorderQueue[T <: Data](dType: T, tagWidth: Int, size: Int)
val roq_free = Reg(init = Vec.fill(size)(Bool(true))) val roq_free = Reg(init = Vec.fill(size)(Bool(true)))
val roq_enq_addr = PriorityEncoder(roq_free) val roq_enq_addr = PriorityEncoder(roq_free)
val roq_deq_addr = PriorityEncoder(roq_tags.map(_ === io.deq.tag)) val roq_matches = roq_tags.map(_ === io.deq.tag)
val roq_deq_addr = PriorityEncoder(roq_matches)
io.enq.ready := roq_free.reduce(_ || _) io.enq.ready := roq_free.reduce(_ || _)
io.deq.data := roq_data(roq_deq_addr) io.deq.data := roq_data(roq_deq_addr)
io.deq.matches := roq_matches.reduce(_ || _)
when (io.enq.valid && io.enq.ready) { when (io.enq.valid && io.enq.ready) {
roq_data(roq_enq_addr) := io.enq.bits.data roq_data(roq_enq_addr) := io.enq.bits.data