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

use reorder queue instead of extra tag bit to determine TL g_type in NASTI -> TL converter

Browse Source
This commit is contained in:
Howard Mao 2015-09-18 09:41:37 -07:00
parent bd536d8832
commit 8b2341b1b1
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1369,6 +1369,11 @@ class ClientTileLinkIOUnwrapper extends TLModule {
io.in.probe.valid := Bool(false) io.in.probe.valid := Bool(false)
} }
class NASTIMasterIOTileLinkIOConverterInfo extends TLBundle {
val byteOff = UInt(width = tlByteAddrBits)
val subblock = Bool()
}
class NASTIMasterIOTileLinkIOConverter extends TLModule with NASTIParameters { class NASTIMasterIOTileLinkIOConverter extends TLModule with NASTIParameters {
val io = new Bundle { val io = new Bundle {
val tl = new ClientUncachedTileLinkIO().flip val tl = new ClientUncachedTileLinkIO().flip
@ -1414,11 +1419,17 @@ class NASTIMasterIOTileLinkIOConverter extends TLModule with NASTIParameters {
val tl_done_out = Reg(init=Bool(false)) val tl_done_out = Reg(init=Bool(false))
val roq = Module(new ReorderQueue( val roq = Module(new ReorderQueue(
UInt(width = tlByteAddrBits), nastiRIdBits, tlMaxClientsPerPort)) new NASTIMasterIOTileLinkIOConverterInfo,
roq.io.enq.valid := io.tl.acquire.fire() && !acq_has_data && is_subblock nastiRIdBits, tlMaxClientsPerPort))
val (nasti_cnt_out, nasti_wrap_out) = Counter(
io.nasti.r.fire() && !roq.io.deq.data.subblock, tlDataBeats)
roq.io.enq.valid := io.tl.acquire.fire() && !acq_has_data
roq.io.enq.bits.tag := io.nasti.ar.bits.id roq.io.enq.bits.tag := io.nasti.ar.bits.id
roq.io.enq.bits.data := io.tl.acquire.bits.addr_byte() roq.io.enq.bits.data.byteOff := io.tl.acquire.bits.addr_byte()
roq.io.deq.valid := io.nasti.r.fire() && !io.nasti.r.bits.id(0) roq.io.enq.bits.data.subblock := is_subblock
roq.io.deq.valid := io.nasti.r.fire() && (nasti_wrap_out || roq.io.deq.data.subblock)
roq.io.deq.tag := io.nasti.r.bits.id roq.io.deq.tag := io.nasti.r.bits.id
io.nasti.ar.bits := NASTIReadAddressChannel( io.nasti.ar.bits := NASTIReadAddressChannel(
@ -1442,11 +1453,7 @@ class NASTIMasterIOTileLinkIOConverter extends TLModule with NASTIParameters {
io.nasti.aw.valid := is_write io.nasti.aw.valid := is_write
io.nasti.ar.valid := !is_write io.nasti.ar.valid := !is_write
cmd_sent_out := (!is_write && io.nasti.ar.ready) || (is_write && io.nasti.aw.ready) cmd_sent_out := (!is_write && io.nasti.ar.ready) || (is_write && io.nasti.aw.ready)
// The last bit indicates to the Grant logic what g_type to send back val tag = io.tl.acquire.bits.client_xact_id
// For read, true = getDataBlockType, false = getDataBeatType
// For write, it should always be false, so that putAckType is sent
val tag = Cat(io.tl.acquire.bits.client_xact_id,
!is_write && !is_subblock)
val addr = io.tl.acquire.bits.full_addr() val addr = io.tl.acquire.bits.full_addr()
when(is_write) { when(is_write) {
io.nasti.aw.bits.id := tag io.nasti.aw.bits.id := tag
@ -1488,17 +1495,17 @@ class NASTIMasterIOTileLinkIOConverter extends TLModule with NASTIParameters {
val gnt_arb = Module(new Arbiter(new GrantToDst, 2)) val gnt_arb = Module(new Arbiter(new GrantToDst, 2))
io.tl.grant <> gnt_arb.io.out io.tl.grant <> gnt_arb.io.out
val r_aligned_data = Mux(io.nasti.r.bits.id(0), val r_aligned_data = Mux(roq.io.deq.data.subblock,
io.nasti.r.bits.data, io.nasti.r.bits.data << Cat(roq.io.deq.data.byteOff, UInt(0, 3)),
io.nasti.r.bits.data << Cat(roq.io.deq.data, UInt(0, 3))) io.nasti.r.bits.data)
gnt_arb.io.in(0).valid := io.nasti.r.valid gnt_arb.io.in(0).valid := io.nasti.r.valid
io.nasti.r.ready := gnt_arb.io.in(0).ready io.nasti.r.ready := gnt_arb.io.in(0).ready
gnt_arb.io.in(0).bits := Grant( gnt_arb.io.in(0).bits := Grant(
is_builtin_type = Bool(true), is_builtin_type = Bool(true),
g_type = Mux(io.nasti.r.bits.id(0), g_type = Mux(roq.io.deq.data.subblock,
Grant.getDataBlockType, Grant.getDataBeatType), // TODO: Assumes MI or MEI protocol Grant.getDataBeatType, Grant.getDataBlockType),
client_xact_id = io.nasti.r.bits.id >> 1, client_xact_id = io.nasti.r.bits.id,
manager_xact_id = UInt(0), manager_xact_id = UInt(0),
addr_beat = tl_cnt_in, addr_beat = tl_cnt_in,
data = r_aligned_data) data = r_aligned_data)
@ -1508,7 +1515,7 @@ class NASTIMasterIOTileLinkIOConverter extends TLModule with NASTIParameters {
gnt_arb.io.in(1).bits := Grant( gnt_arb.io.in(1).bits := Grant(
is_builtin_type = Bool(true), is_builtin_type = Bool(true),
g_type = Grant.putAckType, g_type = Grant.putAckType,
client_xact_id = io.nasti.b.bits.id >> 1, client_xact_id = io.nasti.b.bits.id,
manager_xact_id = UInt(0), manager_xact_id = UInt(0),
addr_beat = UInt(0), addr_beat = UInt(0),
data = Bits(0)) data = Bits(0))