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

rocc: fix RoccExampleConfig

Browse Source
This commit is contained in:
Henry Cook 2017-05-16 16:44:53 -07:00
parent a19fc2549e
commit 5f22e91a7f
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,18 +163,20 @@ class WithNBreakpoints(hwbp: Int) extends Config ((site, here, up) => {
}) })
class WithRoccExample extends Config((site, here, up) => { class WithRoccExample extends Config((site, here, up) => {
case BuildRoCC => Seq( case RocketTilesKey => up(RocketTilesKey, site) map { r =>
RoCCParams( r.copy(rocc = Seq(
opcodes = OpcodeSet.custom0, RoCCParams(
generator = (p: Parameters) => Module(new AccumulatorExample()(p))), opcodes = OpcodeSet.custom0,
RoCCParams( generator = (p: Parameters) => Module(new AccumulatorExample()(p))),
opcodes = OpcodeSet.custom1, RoCCParams(
generator = (p: Parameters) => Module(new TranslatorExample()(p)), opcodes = OpcodeSet.custom1,
nPTWPorts = 1), generator = (p: Parameters) => Module(new TranslatorExample()(p)),
RoCCParams( nPTWPorts = 1),
opcodes = OpcodeSet.custom2, RoCCParams(
generator = (p: Parameters) => Module(new CharacterCountExample()(p)))) opcodes = OpcodeSet.custom2,
generator = (p: Parameters) => Module(new CharacterCountExample()(p)))
))
}
case RoccMaxTaggedMemXacts => 1 case RoccMaxTaggedMemXacts => 1
}) })

4
src/main/scala/tile/LegacyRoCC.scala
View File

@ -48,7 +48,7 @@ trait CanHaveLegacyRoccs extends CanHaveSharedFPU with CanHavePTW with HasTileLi
}}))) }})))
legacyRocc foreach { lr => legacyRocc foreach { lr =>
tileBus.node := lr.masterNode tileBus.node :=* lr.masterNode
nPTWPorts += lr.nPTWPorts nPTWPorts += lr.nPTWPorts
nDCachePorts += lr.nRocc nDCachePorts += lr.nRocc
} }
@ -66,7 +66,7 @@ trait CanHaveLegacyRoccsModule extends CanHaveSharedFPUModule
None None
} foreach { lr => } foreach { lr =>
fpu.io.cp_req <> lr.module.io.fpu.cp_req fpu.io.cp_req <> lr.module.io.fpu.cp_req
fpu.io.cp_resp <> lr.module.io.fpu.cp_resp lr.module.io.fpu.cp_resp <> fpu.io.cp_resp
} }
} }