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

put replacement policy in uncore and minor nbdcache cleanups

Browse Source
This commit is contained in:
Henry Cook 2014-04-22 16:53:20 -07:00
parent 09e2ec1f9e
commit 5c62cff2ce
1 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
rocket/src/main/scala/nbdcache.scala
View File

@ -4,15 +4,14 @@ import Chisel._
import uncore._ import uncore._
import Util._ import Util._
case class DCacheConfig(sets: Int, ways: Int, case class DCacheConfig(val sets: Int, val ways: Int,
nmshr: Int, nrpq: Int, nsdq: Int, ntlb: Int, nmshr: Int, nrpq: Int, nsdq: Int, ntlb: Int,
tl: TileLinkConfiguration, val tl: TileLinkConfiguration,
as: AddressSpaceConfiguration, val as: AddressSpaceConfiguration,
reqtagbits: Int, databits: Int, reqtagbits: Int, databits: Int,
rowwords: Int = 2, rowwords: Int = 2,
code: Code = new IdentityCode, code: Code = new IdentityCode,
narrowRead: Boolean = true) narrowRead: Boolean = true) extends CacheConfig {
{
def states = tl.co.nClientStates def states = tl.co.nClientStates
def lines = sets*ways def lines = sets*ways
def dm = ways == 1 def dm = ways == 1
@ -45,6 +44,7 @@ case class DCacheConfig(sets: Int, ways: Int,
require(isPow2(sets)) require(isPow2(sets))
require(isPow2(ways)) // TODO: relax this require(isPow2(ways)) // TODO: relax this
require(rowbits <= tl.dataBits) require(rowbits <= tl.dataBits)
require(lineaddrbits == tl.addrBits)
} }
abstract trait DCacheBundle extends Bundle { abstract trait DCacheBundle extends Bundle {
@ -52,24 +52,6 @@ abstract trait DCacheBundle extends Bundle {
override def clone = this.getClass.getConstructors.head.newInstance(conf).asInstanceOf[this.type] override def clone = this.getClass.getConstructors.head.newInstance(conf).asInstanceOf[this.type]
} }
abstract class ReplacementPolicy
{
def way: UInt
def miss: Unit
def hit: Unit
}
class RandomReplacement(implicit conf: DCacheConfig) extends ReplacementPolicy
{
private val replace = Bool()
replace := Bool(false)
val lfsr = LFSR16(replace)
def way = if (conf.dm) UInt(0) else lfsr(conf.waybits-1,0)
def miss = replace := Bool(true)
def hit = {}
}
class StoreGen(typ: Bits, addr: Bits, dat: Bits) class StoreGen(typ: Bits, addr: Bits, dat: Bits)
{ {
val byte = typ === MT_B || typ === MT_BU val byte = typ === MT_B || typ === MT_BU
@ -117,9 +99,7 @@ class DataReadReq(implicit val conf: DCacheConfig) extends DCacheBundle {
val addr = Bits(width = conf.untagbits) val addr = Bits(width = conf.untagbits)
} }
class DataWriteReq(implicit val conf: DCacheConfig) extends DCacheBundle { class DataWriteReq(implicit conf: DCacheConfig) extends DataReadReq()(conf) {
val way_en = Bits(width = conf.ways)
val addr = Bits(width = conf.untagbits)
val wmask = Bits(width = conf.rowwords) val wmask = Bits(width = conf.rowwords)
val data = Bits(width = conf.encrowbits) val data = Bits(width = conf.encrowbits)
} }
@ -561,7 +541,7 @@ class ProbeUnit(implicit conf: DCacheConfig) extends Module {
io.rep.bits := Release(tl.co.getReleaseTypeOnProbe(req, Mux(hit, line_state, tl.co.newStateOnFlush)), req.addr, req.client_xact_id, req.master_xact_id) io.rep.bits := Release(tl.co.getReleaseTypeOnProbe(req, Mux(hit, line_state, tl.co.newStateOnFlush)), req.addr, req.client_xact_id, req.master_xact_id)
io.meta_read.valid := state === s_meta_read io.meta_read.valid := state === s_meta_read
io.meta_read.bits.addr := req.addr << UInt(conf.offbits) io.meta_read.bits.addr := req.addr << conf.offbits
io.meta_write.valid := state === s_meta_write io.meta_write.valid := state === s_meta_write
io.meta_write.bits.way_en := way_en io.meta_write.bits.way_en := way_en
@ -782,7 +762,7 @@ class HellaCache(implicit conf: DCacheConfig) extends Module {
val s1_sc = s1_req.cmd === M_XSC val s1_sc = s1_req.cmd === M_XSC
val s1_readwrite = s1_read || s1_write || isPrefetch(s1_req.cmd) val s1_readwrite = s1_read || s1_write || isPrefetch(s1_req.cmd)
val dtlb = Module(new TLB(8)(conf.as)) val dtlb = Module(new TLB(conf.ntlb)(conf.as))
dtlb.io.ptw <> io.cpu.ptw dtlb.io.ptw <> io.cpu.ptw
dtlb.io.req.valid := s1_valid_masked && s1_readwrite && !s1_req.phys dtlb.io.req.valid := s1_valid_masked && s1_readwrite && !s1_req.phys
dtlb.io.req.bits.passthrough := s1_req.phys dtlb.io.req.bits.passthrough := s1_req.phys
@ -857,8 +837,8 @@ class HellaCache(implicit conf: DCacheConfig) extends Module {
when (!metaReadArb.io.in(4).ready) { io.cpu.req.ready := Bool(false) } when (!metaReadArb.io.in(4).ready) { io.cpu.req.ready := Bool(false) }
// data read for new requests // data read for new requests
readArb.io.in(3).bits.addr := io.cpu.req.bits.addr
readArb.io.in(3).valid := io.cpu.req.valid readArb.io.in(3).valid := io.cpu.req.valid
readArb.io.in(3).bits.addr := io.cpu.req.bits.addr
readArb.io.in(3).bits.way_en := SInt(-1) readArb.io.in(3).bits.way_en := SInt(-1)
when (!readArb.io.in(3).ready) { io.cpu.req.ready := Bool(false) } when (!readArb.io.in(3).ready) { io.cpu.req.ready := Bool(false) }