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

Make DefaultRV32Config be RV32IMAFCS, not RV32IMC

Browse Source 
The latter is more the domain of TinyConfig.
This commit is contained in:
Andrew Waterman 2016-09-07 01:58:25 -07:00
parent a7f47f3c23
commit 70cfd7ce13
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/scala/coreplex/Configs.scala
View File

@ -333,8 +333,6 @@ class WithNL2Ways(n: Int) extends Config(
class WithRV32 extends Config( class WithRV32 extends Config(
(pname,site,here) => pname match { (pname,site,here) => pname match {
case XLen => 32 case XLen => 32
case UseVM => false
case UseUser => false
case FPUKey => Some(FPUConfig(divSqrt = false)) case FPUKey => Some(FPUConfig(divSqrt = false))
case RegressionTestNames => LinkedHashSet( case RegressionTestNames => LinkedHashSet(
"rv32mi-p-ma_addr", "rv32mi-p-ma_addr",
@ -356,14 +354,16 @@ class WithBlockingL1 extends Config (
) )
class WithSmallCores extends Config ( class WithSmallCores extends Config (
topDefinitions = { (pname,site,here) => pname match { topDefinitions = { (pname,site,here) => pname match {
case MulDivKey => Some(MulDivConfig()) case MulDivKey => Some(MulDivConfig())
case FPUKey => None case FPUKey => None
case NTLBEntries => 4 case UseVM => false
case BtbKey => BtbParameters(nEntries = 0) case UseUser => false
case NAcquireTransactors => 2 case NTLBEntries => 4
case _ => throw new CDEMatchError case BtbKey => BtbParameters(nEntries = 0)
}}, case NAcquireTransactors => 2
case _ => throw new CDEMatchError
}},
knobValues = { knobValues = {
case "L1D_SETS" => 64 case "L1D_SETS" => 64
case "L1D_WAYS" => 1 case "L1D_WAYS" => 1

2
src/main/scala/rocketchip/Configs.scala
View File

@ -219,7 +219,7 @@ class WithScratchpads extends Config(new WithNMemoryChannels(0) ++ new WithDataS
class DefaultFPGASmallConfig extends Config(new WithSmallCores ++ new DefaultFPGAConfig) class DefaultFPGASmallConfig extends Config(new WithSmallCores ++ new DefaultFPGAConfig)
class DefaultSmallConfig extends Config(new WithSmallCores ++ new BaseConfig) class DefaultSmallConfig extends Config(new WithSmallCores ++ new BaseConfig)
class DefaultRV32Config extends Config(new WithRV32 ++ new DefaultSmallConfig) class DefaultRV32Config extends Config(new WithRV32 ++ new DefaultConfig)
class DualBankConfig extends Config( class DualBankConfig extends Config(
new WithNBanksPerMemChannel(2) ++ new BaseConfig) new WithNBanksPerMemChannel(2) ++ new BaseConfig)