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

Merge pull request #31 from ucb-bar/multirocc

Browse Source 
implement support for multiple RoCC accelerators
This commit is contained in:
Colin Schmidt 2015-11-28 08:56:07 -05:00
commit 7259239ba4
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rocket

@ -1 +1 @@
Subproject commit 0ab43d421103697cf3f62c734df6c322ba766e8b Subproject commit 3dda614ea9883499ab38767d11d091c520e14af3

21
src/main/scala/Configs.scala
View File

@ -132,8 +132,10 @@ class DefaultConfig extends Config (
Module(new RocketTile(resetSignal = r)(p.alterPartial({case TLId => "L1toL2"}))) Module(new RocketTile(resetSignal = r)(p.alterPartial({case TLId => "L1toL2"})))
} }
} }
case BuildRoCC => None case BuildRoCC => Nil
case RoccNMemChannels => 1 case RoccAcceleratorMemChannels => site(BuildRoCC).map(_ => 1)
case RoccOpcodes => site(BuildRoCC).map(_ => OpcodeSet.all)
case RoccNMemChannels => site(RoccAcceleratorMemChannels).fold(0)(_ + _)
//Rocket Core Constants //Rocket Core Constants
case FetchWidth => 1 case FetchWidth => 1
case RetireWidth => 1 case RetireWidth => 1
@ -384,15 +386,20 @@ class MemtestDualChannelDualBankL2Config extends Config(
new With2MemoryChannels ++ new With2BanksPerMemChannel ++ new With2MemoryChannels ++ new With2BanksPerMemChannel ++
new WithMemtest ++ new WithL2Cache ++ new GroundTestConfig) new WithMemtest ++ new WithL2Cache ++ new GroundTestConfig)
class WithAccumulatorExample extends Config( class WithRoccExample extends Config(
(pname, site, here) => pname match { (pname, site, here) => pname match {
case BuildRoCC => Some((p: Parameters) => case BuildRoCC => Seq(
Module(new AccumulatorExample()(p))) (p: Parameters) => Module(new AccumulatorExample()(p)),
(p: Parameters) => Module(new TranslatorExample()(p)),
(p: Parameters) => Module(new CharacterCountExample()(p)))
case RoccMaxTaggedMemXacts => 1 case RoccMaxTaggedMemXacts => 1
case RoccOpcodes => Seq(
OpcodeSet.custom0,
OpcodeSet.custom1,
OpcodeSet.custom2)
}) })
class AccumulatorExampleCPPConfig extends Config(new WithAccumulatorExample ++ new DefaultCPPConfig) class RoccExampleConfig extends Config(new WithRoccExample ++ new DefaultConfig)
class AccumulatorExampleVLSIConfig extends Config(new WithAccumulatorExample ++ new DefaultVLSIConfig)
class SmallL2Config extends Config( class SmallL2Config extends Config(
new With2MemoryChannels ++ new With4BanksPerMemChannel ++ new With2MemoryChannels ++ new With4BanksPerMemChannel ++