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

MulPlugin add withInputBuffer feature and now use RSx instead of SRCx

This commit is contained in:
Charles Papon 2019-10-11 00:23:29 +02:00
parent 3fc0a74102
commit 711eed1e77
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/scala/vexriscv/plugin/MulPlugin.scala
View File

@ -3,7 +3,8 @@ import vexriscv._
import vexriscv.VexRiscv import vexriscv.VexRiscv
import spinal.core._ import spinal.core._
class MulPlugin extends Plugin[VexRiscv]{ //Input buffer generaly avoid the FPGA synthesis to duplicate reg inside the DSP cell, which could stress timings quite much.
class MulPlugin(inputBuffer : Boolean = false) extends Plugin[VexRiscv]{
object MUL_LL extends Stageable(UInt(32 bits)) object MUL_LL extends Stageable(UInt(32 bits))
object MUL_LH extends Stageable(SInt(34 bits)) object MUL_LH extends Stageable(SInt(34 bits))
object MUL_HL extends Stageable(SInt(34 bits)) object MUL_HL extends Stageable(SInt(34 bits))
@ -19,8 +20,8 @@ class MulPlugin extends Plugin[VexRiscv]{
val actions = List[(Stageable[_ <: BaseType],Any)]( val actions = List[(Stageable[_ <: BaseType],Any)](
SRC1_CTRL -> Src1CtrlEnum.RS, // SRC1_CTRL -> Src1CtrlEnum.RS,
SRC2_CTRL -> Src2CtrlEnum.RS, // SRC2_CTRL -> Src2CtrlEnum.RS,
REGFILE_WRITE_VALID -> True, REGFILE_WRITE_VALID -> True,
BYPASSABLE_EXECUTE_STAGE -> False, BYPASSABLE_EXECUTE_STAGE -> False,
BYPASSABLE_MEMORY_STAGE -> False, BYPASSABLE_MEMORY_STAGE -> False,
@ -48,8 +49,26 @@ class MulPlugin extends Plugin[VexRiscv]{
val aSigned,bSigned = Bool val aSigned,bSigned = Bool
val a,b = Bits(32 bit) val a,b = Bits(32 bit)
a := input(SRC1) // a := input(SRC1)
b := input(SRC2) // b := input(SRC2)
val withInputBuffer = inputBuffer generate new Area{
val rs1 = RegNext(input(RS1))
val rs2 = RegNext(input(RS2))
a := rs1
b := rs2
val delay = RegNext(arbitration.isStuck)
when(arbitration.isValid && input(IS_MUL) && !delay){
arbitration.haltItself := True
}
}
val noInputBuffer = (!inputBuffer) generate new Area{
a := input(RS1)
b := input(RS2)
}
switch(input(INSTRUCTION)(13 downto 12)) { switch(input(INSTRUCTION)(13 downto 12)) {
is(B"01") { is(B"01") {
aSigned := True aSigned := True