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

fix L2 deadlock bug and add more advanced trace generator

Browse Source
This commit is contained in:
Howard Mao 2016-07-26 12:43:08 -07:00
parent 1063d90993
commit ecd1af326c
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
groundtest

@ -1 +1 @@
Subproject commit 26f8823eaccadc4ad74ce9d4b73c6b388b53c21a Subproject commit 39c3908b2186adcba434c10e783ab638468f7bb3

7
src/main/scala/TestConfigs.scala
View File

@ -185,7 +185,7 @@ class WithUnitTest extends Config(
class WithTraceGen extends Config( class WithTraceGen extends Config(
topDefinitions = (pname, site, here) => pname match { topDefinitions = (pname, site, here) => pname match {
case GroundTestKey => Seq.fill(site(NTiles)) { case GroundTestKey => Seq.fill(site(NTiles)) {
GroundTestTileSettings(cached = 1) GroundTestTileSettings(uncached = 1, cached = 1)
} }
case BuildGroundTest => case BuildGroundTest =>
(p: Parameters) => Module(new GroundTestTraceGenerator()(p)) (p: Parameters) => Module(new GroundTestTraceGenerator()(p))
@ -193,7 +193,7 @@ class WithTraceGen extends Config(
maxRequests = 256, maxRequests = 256,
startAddress = 0) startAddress = 0)
case AddressBag => { case AddressBag => {
val nSets = 16 val nSets = 32 // L2 NSets
val nWays = 1 val nWays = 1
val blockOffset = site(CacheBlockOffsetBits) val blockOffset = site(CacheBlockOffsetBits)
List.tabulate(2 * nWays) { i => List.tabulate(2 * nWays) { i =>
@ -205,6 +205,8 @@ class WithTraceGen extends Config(
knobValues = { knobValues = {
case "L1D_SETS" => 16 case "L1D_SETS" => 16
case "L1D_WAYS" => 1 case "L1D_WAYS" => 1
case "L2_CAPACITY_IN_KB" => 32 * 64 / 1024
case "L2_WAYS" => 1
}) })
class GroundTestConfig extends Config(new WithGroundTest ++ new BaseConfig) class GroundTestConfig extends Config(new WithGroundTest ++ new BaseConfig)
@ -254,6 +256,7 @@ class TraceGenConfig extends Config(
class TraceGenBufferlessConfig extends Config( class TraceGenBufferlessConfig extends Config(
new WithBufferlessBroadcastHub ++ new TraceGenConfig) new WithBufferlessBroadcastHub ++ new TraceGenConfig)
class TraceGenL2Config extends Config( class TraceGenL2Config extends Config(
new WithNL2Ways(1) ++ new WithL2Capacity(32 * 64 / 1024) ++
new WithL2Cache ++ new TraceGenConfig) new WithL2Cache ++ new TraceGenConfig)
class MIF128BitComparatorConfig extends Config( class MIF128BitComparatorConfig extends Config(

2
uncore

@ -1 +1 @@
Subproject commit 384655ea7b09f9d14014737a2cba1a9489151900 Subproject commit ad95aa79ce2aa694fa628c5f1cab101676581f0e