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

tilelink: FIFOFixer must support null cases (#860)

Browse Source 
In particular, it is ok if no slaves actually need FIFO fixing.
It is also ok if none of those fixed are FIFO.
This commit is contained in:
Wesley W. Terpstra 2017-07-12 22:20:31 -07:00 committed by GitHub
parent 0053a060ae
commit b7f1ba3428
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/scala/tilelink/FIFOFixer.scala
View File

@ -50,23 +50,28 @@ class TLFIFOFixer(policy: TLFIFOFixer.Policy = TLFIFOFixer.all)(implicit p: Para
val (fixMap, splatMap) = fifoMap(edgeOut.manager.managers) val (fixMap, splatMap) = fifoMap(edgeOut.manager.managers)
// Do we need to serialize the request to this manager? // Do we need to serialize the request to this manager?
// println(s"make FIFO: ${edgeIn.manager.managers.filter(_.fifoId==Some(0)).map(_.name).mkString(", ")}")
// println(s"not FIFO: ${edgeIn.manager.managers.filter(_.fifoId!=Some(0)).map(_.name).mkString(", ")}")
val a_notFIFO = edgeIn.manager.fastProperty(in.a.bits.address, _.fifoId != Some(0), (b:Boolean) => Bool(b)) val a_notFIFO = edgeIn.manager.fastProperty(in.a.bits.address, _.fifoId != Some(0), (b:Boolean) => Bool(b))
// Does this manager have an existing FIFO domain? (don't care about unserialized cases) // Does this manager have an existing FIFO domain? (don't care about unserialized cases)
val hackExist = ((fixMap zip splatMap) zip edgeOut.manager.managers) flatMap { val hackExist = ((fixMap zip splatMap) zip edgeOut.manager.managers) flatMap {
case ((f, s), m) => if (f == Some(0)) Some(m.copy(fifoId = s)) else None case ((f, s), m) => if (f == Some(0)) Some(m.copy(fifoId = s)) else None
} }
// println(s"has domain: ${hackExist.filter( _.fifoId.isDefined).map(_.name).mkString(", ")}") val a_noDomain = if (hackExist.isEmpty) Bool(true) else
// println(s"no domain: ${hackExist.filter(!_.fifoId.isDefined).map(_.name).mkString(", ")}") edgeOut.manager.copy(managers = hackExist).fastProperty(in.a.bits.address, !_.fifoId.isDefined, (b:Boolean) => Bool(b))
val a_noDomain = edgeOut.manager.copy(managers = hackExist).fastProperty(in.a.bits.address, !_.fifoId.isDefined, (b:Boolean) => Bool(b))
// What is that domain? (don't care about noDomain cases) // What is that domain? (don't care about noDomain cases)
val hackDomain = hackExist.filter(_.fifoId.isDefined) val hackDomain = hackExist.filter(_.fifoId.isDefined)
// println(s"domains: ${hackDomain.groupBy(_.name).mapValues(_.map(_.fifoId))}") val a_id = if (hackDomain.isEmpty) UInt(0) else
// println("") edgeOut.manager.copy(managers = hackDomain).fastProperty(in.a.bits.address, _.fifoId.get, (id:Int) => UInt(id))
val a_id = edgeOut.manager.copy(managers = hackDomain).fastProperty(in.a.bits.address, _.fifoId.get, (id:Int) => UInt(id))
val maxId = hackDomain.flatMap(_.fifoId).foldLeft(0)(max) val maxId = hackDomain.flatMap(_.fifoId).foldLeft(0)(max)
if (false) {
println(s"make FIFO: ${edgeIn.manager.managers.filter(_.fifoId==Some(0)).map(_.name).mkString(", ")}")
println(s"not FIFO: ${edgeIn.manager.managers.filter(_.fifoId!=Some(0)).map(_.name).mkString(", ")}")
println(s"has domain: ${hackExist.filter( _.fifoId.isDefined).map(_.name).mkString(", ")}")
println(s"no domain: ${hackExist.filter(!_.fifoId.isDefined).map(_.name).mkString(", ")}")
println(s"domains: ${hackDomain.groupBy(_.name).mapValues(_.map(_.fifoId))}")
println("")
}
// Count beats // Count beats
val a_first = edgeIn.first(in.a) val a_first = edgeIn.first(in.a)
val d_first = edgeOut.first(out.d) && out.d.bits.opcode =/= TLMessages.ReleaseAck val d_first = edgeOut.first(out.d) && out.d.bits.opcode =/= TLMessages.ReleaseAck