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

Merge remote-tracking branch 'origin/master' into reworkFetcher

This commit is contained in:
Dolu1990 2018-05-24 14:05:35 +02:00
parent 6004dcc365 c4f33b30e2
commit b0777bc646
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/scala/vexriscv/demo/SynthesisBench.scala
View File

@ -7,6 +7,7 @@ import vexriscv.VexRiscv
import vexriscv.plugin.{DecoderSimplePlugin, KeepAttribute} import vexriscv.plugin.{DecoderSimplePlugin, KeepAttribute}
import scala.collection.mutable.ArrayBuffer import scala.collection.mutable.ArrayBuffer
import scala.util.Random
/** /**
* Created by PIC32F_USER on 16/07/2017. * Created by PIC32F_USER on 16/07/2017.
@ -105,7 +106,6 @@ object VexRiscvSynthesisBench {
// val rtls = List(smallAndProductive, smallAndProductiveWithICache, fullNoMmuMaxPerf, fullNoMmu, full) // val rtls = List(smallAndProductive, smallAndProductiveWithICache, fullNoMmuMaxPerf, fullNoMmu, full)
// val rtls = List(smallAndProductive, full) // val rtls = List(smallAndProductive, full)
val targets = XilinxStdTargets( val targets = XilinxStdTargets(
vivadoArtix7Path = "/eda/Xilinx/Vivado/2017.2/bin" vivadoArtix7Path = "/eda/Xilinx/Vivado/2017.2/bin"
) ++ AlteraStdTargets( ) ++ AlteraStdTargets(
@ -154,7 +154,7 @@ object MuraxSynthesisBench {
override def getName(): String = "Murax" override def getName(): String = "Murax"
override def getRtlPath(): String = "Murax.v" override def getRtlPath(): String = "Murax.v"
SpinalVerilog({ SpinalVerilog({
val murax = new Murax(MuraxConfig.default).setDefinitionName(getRtlPath().split("\\.").head) val murax = new Murax(MuraxConfig.default.copy(gpioWidth = 8)).setDefinitionName(getRtlPath().split("\\.").head)
murax.io.mainClk.setName("clk") murax.io.mainClk.setName("clk")
murax murax
}) })
@ -165,7 +165,7 @@ object MuraxSynthesisBench {
override def getName(): String = "MuraxFast" override def getName(): String = "MuraxFast"
override def getRtlPath(): String = "MuraxFast.v" override def getRtlPath(): String = "MuraxFast.v"
SpinalVerilog({ SpinalVerilog({
val murax = new Murax(MuraxConfig.fast).setDefinitionName(getRtlPath().split("\\.").head) val murax = new Murax(MuraxConfig.fast.copy(gpioWidth = 8)).setDefinitionName(getRtlPath().split("\\.").head)
murax.io.mainClk.setName("clk") murax.io.mainClk.setName("clk")
murax murax
}) })
@ -173,13 +173,14 @@ object MuraxSynthesisBench {
val rtls = List(murax, muraxFast) val rtls = List(murax, muraxFast)
val targets = XilinxStdTargets( val targets = IcestormStdTargets() ++ XilinxStdTargets(
vivadoArtix7Path = "/eda/Xilinx/Vivado/2017.2/bin" vivadoArtix7Path = "/eda/Xilinx/Vivado/2017.2/bin"
) ++ AlteraStdTargets( ) ++ AlteraStdTargets(
quartusCycloneIVPath = "/eda/intelFPGA_lite/17.0/quartus/bin/", quartusCycloneIVPath = "/eda/intelFPGA_lite/17.0/quartus/bin/",
quartusCycloneVPath = "/eda/intelFPGA_lite/17.0/quartus/bin/" quartusCycloneVPath = "/eda/intelFPGA_lite/17.0/quartus/bin/"
) )
Bench(rtls, targets, "/eda/tmp/") Bench(rtls, targets, "/eda/tmp/")
} }
} }