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

fix IdMapper and TL -> NASTI converter

Browse Source
This commit is contained in:
Howard Mao 2016-07-07 10:16:44 -07:00
parent 5d8d5e598b
commit 8ccc50a8f0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
uncore/src/main/scala/converters/Nasti.scala
View File

@ -40,7 +40,7 @@ class IdMapper(val inIdBits: Int, val outIdBits: Int,
val out_id_free = Reg(init = Vec.fill(nOutXacts){Bool(true)}) val out_id_free = Reg(init = Vec.fill(nOutXacts){Bool(true)})
val next_out_id = PriorityEncoder(out_id_free) val next_out_id = PriorityEncoder(out_id_free)
val id_mapping = Reg(Vec(nInXacts, UInt(0, outIdBits))) val id_mapping = Reg(Vec(nInXacts, UInt(0, outIdBits)))
val id_valid = Reg(init = Vec.fill(nOutXacts){Bool(false)}) val id_valid = Reg(init = Vec.fill(nInXacts){Bool(false)})
val req_fire = io.req.valid && io.req.ready val req_fire = io.req.valid && io.req.ready
when (req_fire) { when (req_fire) {
@ -236,7 +236,8 @@ class NastiIOTileLinkIOConverter(implicit p: Parameters) extends TLModule()(p)
id = put_id_mapper.io.req.out_id, id = put_id_mapper.io.req.out_id,
data = io.tl.acquire.bits.data, data = io.tl.acquire.bits.data,
strb = Some(io.tl.acquire.bits.wmask()), strb = Some(io.tl.acquire.bits.wmask()),
last = tl_wrap_out || (io.tl.acquire.fire() && is_subblock)) last = Mux(w_inflight,
tl_cnt_out === UInt(tlDataBeats - 1), !is_multibeat))
io.tl.acquire.ready := Mux(has_data, io.tl.acquire.ready := Mux(has_data,
put_helper.fire(put_valid), put_helper.fire(put_valid),