Hardware
/
VexRiscv
mirror of https://github.com/SpinalHDL/VexRiscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BarrielShifter -> BarrelShifter

This commit is contained in:
Tom Verbeure 2018-06-03 07:40:11 +00:00
parent 4a433e16f1
commit e9bbbb3965
17 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/vexriscv/TestsWorkspace.scala
View File

@ -100,7 +100,7 @@ object TestsWorkspace {
new SrcPlugin(
separatedAddSub = false
),
new FullBarrielShifterPlugin(earlyInjection = true),
new FullBarrelShifterPlugin(earlyInjection = true),
// new LightShifterPlugin,
new HazardSimplePlugin(
bypassExecute = true,
@ -157,7 +157,7 @@ object TestsWorkspace {
new SrcPlugin(
separatedAddSub = false
),
// new FullBarrielShifterPlugin,
// new FullBarrelShifterPlugin,
new LightShifterPlugin,
// new HazardSimplePlugin(true, true, true, true),
// new HazardSimplePlugin(false, true, false, true),
@ -208,7 +208,7 @@ object TestsWorkspace {
new SrcPlugin(
separatedAddSub = false
),
new FullBarrielShifterPlugin,
new FullBarrelShifterPlugin,
// new LightShifterPlugin,
// new HazardSimplePlugin(true, true, true, true),
// new HazardSimplePlugin(false, true, false, true),

4
src/main/scala/vexriscv/demo/Briey.scala
View File

@ -108,7 +108,7 @@ object BrieyConfig{
separatedAddSub = false,
executeInsertion = true
),
new FullBarrielShifterPlugin,
new FullBarrelShifterPlugin,
new MulPlugin,
new DivPlugin,
new HazardSimplePlugin(
@ -435,4 +435,4 @@ object BrieyDe0Nano{
toplevel
})
}
}
}

2
src/main/scala/vexriscv/demo/FormalSimple.scala
View File

@ -38,7 +38,7 @@ object FormalSimple extends App{
separatedAddSub = false,
executeInsertion = false
),
new FullBarrielShifterPlugin,
new FullBarrelShifterPlugin,
new HazardSimplePlugin(
bypassExecute = false,
bypassMemory = false,

2
src/main/scala/vexriscv/demo/GenCustomCsr.scala
View File

@ -40,7 +40,7 @@ object GenCustomCsr extends App{
separatedAddSub = false,
executeInsertion = false
),
new FullBarrielShifterPlugin,
new FullBarrelShifterPlugin,
new HazardSimplePlugin(
bypassExecute = true,
bypassMemory = true,

2
src/main/scala/vexriscv/demo/GenCustomSimdAdd.scala
View File

@ -36,7 +36,7 @@ object GenCustomSimdAdd extends App{
separatedAddSub = false,
executeInsertion = false
),
new FullBarrielShifterPlugin,
new FullBarrelShifterPlugin,
new HazardSimplePlugin(
bypassExecute = true,
bypassMemory = true,

2
src/main/scala/vexriscv/demo/GenDeterministicVex.scala
View File

@ -39,7 +39,7 @@ object GenDeterministicVex extends App{
separatedAddSub = false,
executeInsertion = true
),
new FullBarrielShifterPlugin(earlyInjection = true),
new FullBarrelShifterPlugin(earlyInjection = true),
new HazardSimplePlugin(
bypassExecute = true,
bypassMemory = true,

2
src/main/scala/vexriscv/demo/GenFull.scala
View File

@ -68,7 +68,7 @@ object GenFull extends App{
separatedAddSub = false,
executeInsertion = true
),
new FullBarrielShifterPlugin,
new FullBarrelShifterPlugin,
new HazardSimplePlugin(
bypassExecute = true,
bypassMemory = true,

2
src/main/scala/vexriscv/demo/GenFullNoMmu.scala
View File

@ -60,7 +60,7 @@ object GenFullNoMmu extends App{
separatedAddSub = false,
executeInsertion = true
),
new FullBarrielShifterPlugin,
new FullBarrelShifterPlugin,
new HazardSimplePlugin(
bypassExecute = true,
bypassMemory = true,

2
src/main/scala/vexriscv/demo/GenFullNoMmuMaxPerf.scala
View File

@ -60,7 +60,7 @@ object GenFullNoMmuMaxPerf extends App{
separatedAddSub = false,
executeInsertion = true
),
new FullBarrielShifterPlugin(earlyInjection = true),
new FullBarrelShifterPlugin(earlyInjection = true),
new HazardSimplePlugin(
bypassExecute = true,
bypassMemory = true,

2
src/main/scala/vexriscv/demo/GenFullNoMmuNoCache.scala
View File

@ -36,7 +36,7 @@ object GenFullNoMmuNoCache extends App{
separatedAddSub = false,
executeInsertion = true
),
new FullBarrielShifterPlugin,
new FullBarrelShifterPlugin,
new HazardSimplePlugin(
bypassExecute = true,
bypassMemory = true,

2
src/main/scala/vexriscv/demo/GenNoCacheNoMmuMaxPerf.scala
View File

@ -40,7 +40,7 @@ object GenNoCacheNoMmuMaxPerf extends App{
separatedAddSub = false,
executeInsertion = true
),
new FullBarrielShifterPlugin(earlyInjection = true),
new FullBarrelShifterPlugin(earlyInjection = true),
new HazardSimplePlugin(
bypassExecute = true,
bypassMemory = true,

4
src/main/scala/vexriscv/demo/Murax.scala
View File

@ -127,7 +127,7 @@ object MuraxConfig{
bypassWriteBack = true,
bypassWriteBackBuffer = true
)
// config.cpuPlugins(config.cpuPlugins.indexWhere(_.isInstanceOf[LightShifterPlugin])) = new FullBarrielShifterPlugin()
// config.cpuPlugins(config.cpuPlugins.indexWhere(_.isInstanceOf[LightShifterPlugin])) = new FullBarrelShifterPlugin()
config
}
@ -314,7 +314,7 @@ object MuraxDhrystoneReadyMulDivStatic{
prediction = STATIC
)
config.cpuPlugins.remove(config.cpuPlugins.indexWhere(_.isInstanceOf[LightShifterPlugin]))
config.cpuPlugins += new FullBarrielShifterPlugin
config.cpuPlugins += new FullBarrelShifterPlugin
Murax(config)
})
}

4
src/main/scala/vexriscv/demo/VexRiscvAvalonForSim.scala
View File

@ -87,7 +87,7 @@ object VexRiscvAvalonForSim{
separatedAddSub = false,
executeInsertion = true
),
new FullBarrielShifterPlugin,
new FullBarrelShifterPlugin,
new MulPlugin,
new DivPlugin,
new HazardSimplePlugin(
@ -191,4 +191,4 @@ object VexRiscvAvalonForSim{
//Generate the QSys TCL script to integrate the CPU
QSysify(report.toplevel)
}
}
}

4
src/main/scala/vexriscv/demo/VexRiscvAvalonWithIntegratedJtag.scala
View File

@ -85,7 +85,7 @@ object VexRiscvAvalonWithIntegratedJtag{
separatedAddSub = false,
executeInsertion = true
),
new FullBarrielShifterPlugin,
new FullBarrelShifterPlugin,
new MulPlugin,
new DivPlugin,
new HazardSimplePlugin(
@ -188,4 +188,4 @@ object VexRiscvAvalonWithIntegratedJtag{
//Generate the QSys TCL script to integrate the CPU
QSysify(report.toplevel)
}
}
}

4
src/main/scala/vexriscv/demo/VexRiscvAxi4WithIntegratedJtag.scala
View File

@ -86,7 +86,7 @@ object VexRiscvAxi4WithIntegratedJtag{
separatedAddSub = false,
executeInsertion = true
),
new FullBarrielShifterPlugin,
new FullBarrelShifterPlugin,
new MulPlugin,
new DivPlugin,
new HazardSimplePlugin(
@ -186,4 +186,4 @@ object VexRiscvAxi4WithIntegratedJtag{
cpu
}
}
}
}

4
src/main/scala/vexriscv/demo/VexRiscvCachedWishboneForSim.scala
View File

@ -85,7 +85,7 @@ object VexRiscvCachedWishboneForSim{
separatedAddSub = false,
executeInsertion = true
),
new FullBarrielShifterPlugin,
new FullBarrelShifterPlugin,
new MulPlugin,
new DivPlugin,
new HazardSimplePlugin(
@ -156,4 +156,4 @@ object VexRiscvCachedWishboneForSim{
//Generate the QSys TCL script to integrate the CPU
QSysify(report.toplevel)
}
}
}

4
src/main/scala/vexriscv/plugin/ShiftPlugins.scala
View File

@ -6,7 +6,7 @@ import spinal.lib.Reverse
class FullBarrielShifterPlugin(earlyInjection : Boolean = false) extends Plugin[VexRiscv]{
class FullBarrelShifterPlugin(earlyInjection : Boolean = false) extends Plugin[VexRiscv]{
object ShiftCtrlEnum extends SpinalEnum(binarySequential){
val DISABLE, SLL, SRL, SRA = newElement()
}
@ -178,4 +178,4 @@ class LightShifterPlugin extends Plugin[VexRiscv]{
}
}
}
}
}