BarrielShifter -> BarrelShifter
This commit is contained in:
parent
4a433e16f1
commit
e9bbbb3965
|
@ -100,7 +100,7 @@ object TestsWorkspace {
|
||||||
new SrcPlugin(
|
new SrcPlugin(
|
||||||
separatedAddSub = false
|
separatedAddSub = false
|
||||||
),
|
),
|
||||||
new FullBarrielShifterPlugin(earlyInjection = true),
|
new FullBarrelShifterPlugin(earlyInjection = true),
|
||||||
// new LightShifterPlugin,
|
// new LightShifterPlugin,
|
||||||
new HazardSimplePlugin(
|
new HazardSimplePlugin(
|
||||||
bypassExecute = true,
|
bypassExecute = true,
|
||||||
|
@ -157,7 +157,7 @@ object TestsWorkspace {
|
||||||
new SrcPlugin(
|
new SrcPlugin(
|
||||||
separatedAddSub = false
|
separatedAddSub = false
|
||||||
),
|
),
|
||||||
// new FullBarrielShifterPlugin,
|
// new FullBarrelShifterPlugin,
|
||||||
new LightShifterPlugin,
|
new LightShifterPlugin,
|
||||||
// new HazardSimplePlugin(true, true, true, true),
|
// new HazardSimplePlugin(true, true, true, true),
|
||||||
// new HazardSimplePlugin(false, true, false, true),
|
// new HazardSimplePlugin(false, true, false, true),
|
||||||
|
@ -208,7 +208,7 @@ object TestsWorkspace {
|
||||||
new SrcPlugin(
|
new SrcPlugin(
|
||||||
separatedAddSub = false
|
separatedAddSub = false
|
||||||
),
|
),
|
||||||
new FullBarrielShifterPlugin,
|
new FullBarrelShifterPlugin,
|
||||||
// new LightShifterPlugin,
|
// new LightShifterPlugin,
|
||||||
// new HazardSimplePlugin(true, true, true, true),
|
// new HazardSimplePlugin(true, true, true, true),
|
||||||
// new HazardSimplePlugin(false, true, false, true),
|
// new HazardSimplePlugin(false, true, false, true),
|
||||||
|
|
|
@ -108,7 +108,7 @@ object BrieyConfig{
|
||||||
separatedAddSub = false,
|
separatedAddSub = false,
|
||||||
executeInsertion = true
|
executeInsertion = true
|
||||||
),
|
),
|
||||||
new FullBarrielShifterPlugin,
|
new FullBarrelShifterPlugin,
|
||||||
new MulPlugin,
|
new MulPlugin,
|
||||||
new DivPlugin,
|
new DivPlugin,
|
||||||
new HazardSimplePlugin(
|
new HazardSimplePlugin(
|
||||||
|
@ -435,4 +435,4 @@ object BrieyDe0Nano{
|
||||||
toplevel
|
toplevel
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,7 +38,7 @@ object FormalSimple extends App{
|
||||||
separatedAddSub = false,
|
separatedAddSub = false,
|
||||||
executeInsertion = false
|
executeInsertion = false
|
||||||
),
|
),
|
||||||
new FullBarrielShifterPlugin,
|
new FullBarrelShifterPlugin,
|
||||||
new HazardSimplePlugin(
|
new HazardSimplePlugin(
|
||||||
bypassExecute = false,
|
bypassExecute = false,
|
||||||
bypassMemory = false,
|
bypassMemory = false,
|
||||||
|
|
|
@ -40,7 +40,7 @@ object GenCustomCsr extends App{
|
||||||
separatedAddSub = false,
|
separatedAddSub = false,
|
||||||
executeInsertion = false
|
executeInsertion = false
|
||||||
),
|
),
|
||||||
new FullBarrielShifterPlugin,
|
new FullBarrelShifterPlugin,
|
||||||
new HazardSimplePlugin(
|
new HazardSimplePlugin(
|
||||||
bypassExecute = true,
|
bypassExecute = true,
|
||||||
bypassMemory = true,
|
bypassMemory = true,
|
||||||
|
|
|
@ -36,7 +36,7 @@ object GenCustomSimdAdd extends App{
|
||||||
separatedAddSub = false,
|
separatedAddSub = false,
|
||||||
executeInsertion = false
|
executeInsertion = false
|
||||||
),
|
),
|
||||||
new FullBarrielShifterPlugin,
|
new FullBarrelShifterPlugin,
|
||||||
new HazardSimplePlugin(
|
new HazardSimplePlugin(
|
||||||
bypassExecute = true,
|
bypassExecute = true,
|
||||||
bypassMemory = true,
|
bypassMemory = true,
|
||||||
|
|
|
@ -39,7 +39,7 @@ object GenDeterministicVex extends App{
|
||||||
separatedAddSub = false,
|
separatedAddSub = false,
|
||||||
executeInsertion = true
|
executeInsertion = true
|
||||||
),
|
),
|
||||||
new FullBarrielShifterPlugin(earlyInjection = true),
|
new FullBarrelShifterPlugin(earlyInjection = true),
|
||||||
new HazardSimplePlugin(
|
new HazardSimplePlugin(
|
||||||
bypassExecute = true,
|
bypassExecute = true,
|
||||||
bypassMemory = true,
|
bypassMemory = true,
|
||||||
|
|
|
@ -68,7 +68,7 @@ object GenFull extends App{
|
||||||
separatedAddSub = false,
|
separatedAddSub = false,
|
||||||
executeInsertion = true
|
executeInsertion = true
|
||||||
),
|
),
|
||||||
new FullBarrielShifterPlugin,
|
new FullBarrelShifterPlugin,
|
||||||
new HazardSimplePlugin(
|
new HazardSimplePlugin(
|
||||||
bypassExecute = true,
|
bypassExecute = true,
|
||||||
bypassMemory = true,
|
bypassMemory = true,
|
||||||
|
|
|
@ -60,7 +60,7 @@ object GenFullNoMmu extends App{
|
||||||
separatedAddSub = false,
|
separatedAddSub = false,
|
||||||
executeInsertion = true
|
executeInsertion = true
|
||||||
),
|
),
|
||||||
new FullBarrielShifterPlugin,
|
new FullBarrelShifterPlugin,
|
||||||
new HazardSimplePlugin(
|
new HazardSimplePlugin(
|
||||||
bypassExecute = true,
|
bypassExecute = true,
|
||||||
bypassMemory = true,
|
bypassMemory = true,
|
||||||
|
|
|
@ -60,7 +60,7 @@ object GenFullNoMmuMaxPerf extends App{
|
||||||
separatedAddSub = false,
|
separatedAddSub = false,
|
||||||
executeInsertion = true
|
executeInsertion = true
|
||||||
),
|
),
|
||||||
new FullBarrielShifterPlugin(earlyInjection = true),
|
new FullBarrelShifterPlugin(earlyInjection = true),
|
||||||
new HazardSimplePlugin(
|
new HazardSimplePlugin(
|
||||||
bypassExecute = true,
|
bypassExecute = true,
|
||||||
bypassMemory = true,
|
bypassMemory = true,
|
||||||
|
|
|
@ -36,7 +36,7 @@ object GenFullNoMmuNoCache extends App{
|
||||||
separatedAddSub = false,
|
separatedAddSub = false,
|
||||||
executeInsertion = true
|
executeInsertion = true
|
||||||
),
|
),
|
||||||
new FullBarrielShifterPlugin,
|
new FullBarrelShifterPlugin,
|
||||||
new HazardSimplePlugin(
|
new HazardSimplePlugin(
|
||||||
bypassExecute = true,
|
bypassExecute = true,
|
||||||
bypassMemory = true,
|
bypassMemory = true,
|
||||||
|
|
|
@ -40,7 +40,7 @@ object GenNoCacheNoMmuMaxPerf extends App{
|
||||||
separatedAddSub = false,
|
separatedAddSub = false,
|
||||||
executeInsertion = true
|
executeInsertion = true
|
||||||
),
|
),
|
||||||
new FullBarrielShifterPlugin(earlyInjection = true),
|
new FullBarrelShifterPlugin(earlyInjection = true),
|
||||||
new HazardSimplePlugin(
|
new HazardSimplePlugin(
|
||||||
bypassExecute = true,
|
bypassExecute = true,
|
||||||
bypassMemory = true,
|
bypassMemory = true,
|
||||||
|
|
|
@ -127,7 +127,7 @@ object MuraxConfig{
|
||||||
bypassWriteBack = true,
|
bypassWriteBack = true,
|
||||||
bypassWriteBackBuffer = true
|
bypassWriteBackBuffer = true
|
||||||
)
|
)
|
||||||
// config.cpuPlugins(config.cpuPlugins.indexWhere(_.isInstanceOf[LightShifterPlugin])) = new FullBarrielShifterPlugin()
|
// config.cpuPlugins(config.cpuPlugins.indexWhere(_.isInstanceOf[LightShifterPlugin])) = new FullBarrelShifterPlugin()
|
||||||
|
|
||||||
config
|
config
|
||||||
}
|
}
|
||||||
|
@ -314,7 +314,7 @@ object MuraxDhrystoneReadyMulDivStatic{
|
||||||
prediction = STATIC
|
prediction = STATIC
|
||||||
)
|
)
|
||||||
config.cpuPlugins.remove(config.cpuPlugins.indexWhere(_.isInstanceOf[LightShifterPlugin]))
|
config.cpuPlugins.remove(config.cpuPlugins.indexWhere(_.isInstanceOf[LightShifterPlugin]))
|
||||||
config.cpuPlugins += new FullBarrielShifterPlugin
|
config.cpuPlugins += new FullBarrelShifterPlugin
|
||||||
Murax(config)
|
Murax(config)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
@ -87,7 +87,7 @@ object VexRiscvAvalonForSim{
|
||||||
separatedAddSub = false,
|
separatedAddSub = false,
|
||||||
executeInsertion = true
|
executeInsertion = true
|
||||||
),
|
),
|
||||||
new FullBarrielShifterPlugin,
|
new FullBarrelShifterPlugin,
|
||||||
new MulPlugin,
|
new MulPlugin,
|
||||||
new DivPlugin,
|
new DivPlugin,
|
||||||
new HazardSimplePlugin(
|
new HazardSimplePlugin(
|
||||||
|
@ -191,4 +191,4 @@ object VexRiscvAvalonForSim{
|
||||||
//Generate the QSys TCL script to integrate the CPU
|
//Generate the QSys TCL script to integrate the CPU
|
||||||
QSysify(report.toplevel)
|
QSysify(report.toplevel)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,7 +85,7 @@ object VexRiscvAvalonWithIntegratedJtag{
|
||||||
separatedAddSub = false,
|
separatedAddSub = false,
|
||||||
executeInsertion = true
|
executeInsertion = true
|
||||||
),
|
),
|
||||||
new FullBarrielShifterPlugin,
|
new FullBarrelShifterPlugin,
|
||||||
new MulPlugin,
|
new MulPlugin,
|
||||||
new DivPlugin,
|
new DivPlugin,
|
||||||
new HazardSimplePlugin(
|
new HazardSimplePlugin(
|
||||||
|
@ -188,4 +188,4 @@ object VexRiscvAvalonWithIntegratedJtag{
|
||||||
//Generate the QSys TCL script to integrate the CPU
|
//Generate the QSys TCL script to integrate the CPU
|
||||||
QSysify(report.toplevel)
|
QSysify(report.toplevel)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,7 +86,7 @@ object VexRiscvAxi4WithIntegratedJtag{
|
||||||
separatedAddSub = false,
|
separatedAddSub = false,
|
||||||
executeInsertion = true
|
executeInsertion = true
|
||||||
),
|
),
|
||||||
new FullBarrielShifterPlugin,
|
new FullBarrelShifterPlugin,
|
||||||
new MulPlugin,
|
new MulPlugin,
|
||||||
new DivPlugin,
|
new DivPlugin,
|
||||||
new HazardSimplePlugin(
|
new HazardSimplePlugin(
|
||||||
|
@ -186,4 +186,4 @@ object VexRiscvAxi4WithIntegratedJtag{
|
||||||
cpu
|
cpu
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,7 +85,7 @@ object VexRiscvCachedWishboneForSim{
|
||||||
separatedAddSub = false,
|
separatedAddSub = false,
|
||||||
executeInsertion = true
|
executeInsertion = true
|
||||||
),
|
),
|
||||||
new FullBarrielShifterPlugin,
|
new FullBarrelShifterPlugin,
|
||||||
new MulPlugin,
|
new MulPlugin,
|
||||||
new DivPlugin,
|
new DivPlugin,
|
||||||
new HazardSimplePlugin(
|
new HazardSimplePlugin(
|
||||||
|
@ -156,4 +156,4 @@ object VexRiscvCachedWishboneForSim{
|
||||||
//Generate the QSys TCL script to integrate the CPU
|
//Generate the QSys TCL script to integrate the CPU
|
||||||
QSysify(report.toplevel)
|
QSysify(report.toplevel)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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){
|
object ShiftCtrlEnum extends SpinalEnum(binarySequential){
|
||||||
val DISABLE, SLL, SRL, SRA = newElement()
|
val DISABLE, SLL, SRL, SRA = newElement()
|
||||||
}
|
}
|
||||||
|
@ -178,4 +178,4 @@ class LightShifterPlugin extends Plugin[VexRiscv]{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue