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

explicitly configure the number of requests being sent by generators

Browse Source
This commit is contained in:
Howard Mao 2015-11-11 14:32:19 -08:00
parent 13f62e0364
commit 8a6b231b08
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
groundtest/src/main/scala/generator.scala
View File

@ -11,6 +11,7 @@ case object NGeneratorsPerTile extends Field[Int]
case object NGeneratorTiles extends Field[Int] case object NGeneratorTiles extends Field[Int]
case object GenerateUncached extends Field[Boolean] case object GenerateUncached extends Field[Boolean]
case object GenerateCached extends Field[Boolean] case object GenerateCached extends Field[Boolean]
case object MaxGenerateRequests extends Field[Int]
trait HasGeneratorParams { trait HasGeneratorParams {
implicit val p: Parameters implicit val p: Parameters
@ -20,6 +21,7 @@ trait HasGeneratorParams {
val genUncached = p(GenerateUncached) val genUncached = p(GenerateUncached)
val genCached = p(GenerateCached) val genCached = p(GenerateCached)
val genTimeout = 4096 val genTimeout = 4096
val maxRequests = p(MaxGenerateRequests)
} }
class Timer(initCount: Int) extends Module { class Timer(initCount: Int) extends Module {
@ -63,8 +65,6 @@ class UncachedTileLinkGenerator(id: Int)
private val tlBlockOffset = tlBeatAddrBits + tlByteAddrBits private val tlBlockOffset = tlBeatAddrBits + tlByteAddrBits
private val wordBits = 64 private val wordBits = 64
private val wordOffset = log2Up(wordBits / 8) private val wordOffset = log2Up(wordBits / 8)
private val maxAddress = (p(MMIOBase) >> wordOffset).toInt / 2
private val totalRequests = maxAddress / nGens
val io = new Bundle { val io = new Bundle {
val mem = new ClientUncachedTileLinkIO val mem = new ClientUncachedTileLinkIO
@ -74,7 +74,7 @@ class UncachedTileLinkGenerator(id: Int)
val (s_start :: s_put :: s_get :: s_finished :: Nil) = Enum(Bits(), 4) val (s_start :: s_put :: s_get :: s_finished :: Nil) = Enum(Bits(), 4)
val state = Reg(init = s_start) val state = Reg(init = s_start)
val (req_cnt, req_wrap) = Counter(io.mem.grant.fire() && state === s_get, totalRequests) val (req_cnt, req_wrap) = Counter(io.mem.grant.fire() && state === s_get, maxRequests)
val sending = Reg(init = Bool(false)) val sending = Reg(init = Bool(false))
@ -147,9 +147,7 @@ class HellaCacheGenerator(id: Int)
(implicit p: Parameters) extends L1HellaCacheModule()(p) with HasGeneratorParams { (implicit p: Parameters) extends L1HellaCacheModule()(p) with HasGeneratorParams {
private val wordOffset = log2Up(coreDataBits / 8) private val wordOffset = log2Up(coreDataBits / 8)
private val maxAddress = (p(MMIOBase) >> wordOffset).toInt private val startAddress = (p(MMIOBase) >> wordOffset).toInt / 2
private val startAddress = maxAddress / 2
private val totalRequests = (maxAddress - startAddress) / nGens
val io = new Bundle { val io = new Bundle {
val finished = Bool(OUTPUT) val finished = Bool(OUTPUT)
@ -164,7 +162,7 @@ class HellaCacheGenerator(id: Int)
val sending = Reg(init = Bool(false)) val sending = Reg(init = Bool(false))
val (req_cnt, req_wrap) = Counter( val (req_cnt, req_wrap) = Counter(
io.mem.resp.valid && io.mem.resp.bits.has_data, totalRequests) io.mem.resp.valid && io.mem.resp.bits.has_data, maxRequests)
val req_addr = UInt(startAddress) + val req_addr = UInt(startAddress) +
Cat(req_cnt, UInt(id, log2Up(nGens)), UInt(0, wordOffset)) Cat(req_cnt, UInt(id, log2Up(nGens)), UInt(0, wordOffset))