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

Few fixes

This commit is contained in:
Dolu1990 2020-07-05 13:16:39 +02:00
parent c51e25f8c4
commit a404078117
7 changed files with 151 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,12 @@ case class VexRiscvConfig(){
val plugins = ArrayBuffer[Plugin[VexRiscv]]() val plugins = ArrayBuffer[Plugin[VexRiscv]]()
def add(that : Plugin[VexRiscv]) : this.type = {plugins += that;this} def add(that : Plugin[VexRiscv]) : this.type = {plugins += that;this}
def find[T](clazz: Class[T]): Option[T] = {
plugins.find(_.getClass == clazz) match {
case Some(x) => Some(x.asInstanceOf[T])
case None => None
}
}
//Default Stageables //Default Stageables
object IS_RVC extends Stageable(Bool) object IS_RVC extends Stageable(Bool)

12
src/main/scala/vexriscv/VexRiscvBmbGenerator.scala
View File

@ -1,7 +1,7 @@
package vexriscv package vexriscv
import spinal.core._ import spinal.core._
import spinal.lib.bus.bmb.{Bmb, BmbAccessCapabilities, BmbAccessParameter, BmbImplicitDebugDecoder, BmbParameter, BmbSmpInterconnectGenerator} import spinal.lib.bus.bmb.{Bmb, BmbAccessCapabilities, BmbAccessParameter, BmbImplicitDebugDecoder, BmbInvalidationParameter, BmbParameter, BmbSmpInterconnectGenerator}
import spinal.lib.bus.misc.AddressMapping import spinal.lib.bus.misc.AddressMapping
import spinal.lib.com.jtag.{Jtag, JtagTapInstructionCtrl} import spinal.lib.com.jtag.{Jtag, JtagTapInstructionCtrl}
import spinal.lib.generator._ import spinal.lib.generator._
@ -148,9 +148,17 @@ case class VexRiscvBmbGenerator()(implicit interconnectSmp: BmbSmpInterconnectGe
} }
} }
val invalidationSource = Handle[BmbInvalidationParameter]
val invalidationRequirements = Handle[BmbInvalidationParameter]
if(interconnectSmp != null){ if(interconnectSmp != null){
interconnectSmp.addMaster(accessRequirements = parameterGenerator.iBusParameter.derivate(_.access), bus = iBus) interconnectSmp.addMaster(accessRequirements = parameterGenerator.iBusParameter.derivate(_.access), bus = iBus)
interconnectSmp.addMaster(accessRequirements = parameterGenerator.dBusParameter.derivate(_.access), bus = dBus) interconnectSmp.addMaster(
accessRequirements = parameterGenerator.dBusParameter.derivate(_.access),
invalidationSource = invalidationSource,
invalidationCapabilities = invalidationSource,
invalidationRequirements = invalidationRequirements,
bus = dBus
)
} }
} }

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

@ -54,39 +54,86 @@ object VexRiscvSynthesisBench {
val twoStage = new Rtl { val twoStage = new Rtl {
override def getName(): String = "VexRiscv two stages" override def getName(): String = "VexRiscv two stages"
override def getRtlPath(): String = "VexRiscvTwoStages.v" override def getRtlPath(): String = "VexRiscvTwoStages.v"
SpinalVerilog(wrap(GenTwoStage.cpu( SpinalVerilog(wrap(GenTwoThreeStage.cpu(
withMulDiv = false, withMulDiv = false,
bypass = false, bypass = false,
barrielShifter = false barrielShifter = false,
withMemoryStage = false
)).setDefinitionName(getRtlPath().split("\\.").head)) )).setDefinitionName(getRtlPath().split("\\.").head))
} }
val twoStageBarell = new Rtl { val twoStageBarell = new Rtl {
override def getName(): String = "VexRiscv two stages with barriel" override def getName(): String = "VexRiscv two stages with barriel"
override def getRtlPath(): String = "VexRiscvTwoStagesBar.v" override def getRtlPath(): String = "VexRiscvTwoStagesBar.v"
SpinalVerilog(wrap(GenTwoStage.cpu( SpinalVerilog(wrap(GenTwoThreeStage.cpu(
withMulDiv = false, withMulDiv = false,
bypass = true, bypass = true,
barrielShifter = true barrielShifter = true,
withMemoryStage = false
)).setDefinitionName(getRtlPath().split("\\.").head)) )).setDefinitionName(getRtlPath().split("\\.").head))
} }
val twoStageMulDiv = new Rtl { val twoStageMulDiv = new Rtl {
override def getName(): String = "VexRiscv two stages with Mul Div" override def getName(): String = "VexRiscv two stages with Mul Div"
override def getRtlPath(): String = "VexRiscvTwoStagesMD.v" override def getRtlPath(): String = "VexRiscvTwoStagesMD.v"
SpinalVerilog(wrap(GenTwoStage.cpu( SpinalVerilog(wrap(GenTwoThreeStage.cpu(
withMulDiv = true, withMulDiv = true,
bypass = false, bypass = false,
barrielShifter = false barrielShifter = false,
withMemoryStage = false
)).setDefinitionName(getRtlPath().split("\\.").head)) )).setDefinitionName(getRtlPath().split("\\.").head))
} }
val twoStageAll = new Rtl { val twoStageAll = new Rtl {
override def getName(): String = "VexRiscv two stages with Mul Div fast" override def getName(): String = "VexRiscv two stages with Mul Div fast"
override def getRtlPath(): String = "VexRiscvTwoStagesMDfast.v" override def getRtlPath(): String = "VexRiscvTwoStagesMDfast.v"
SpinalVerilog(wrap(GenTwoStage.cpu( SpinalVerilog(wrap(GenTwoThreeStage.cpu(
withMulDiv = true, withMulDiv = true,
bypass = true, bypass = true,
barrielShifter = true barrielShifter = true,
withMemoryStage = false
)).setDefinitionName(getRtlPath().split("\\.").head)) )).setDefinitionName(getRtlPath().split("\\.").head))
} }
val threeStage = new Rtl {
override def getName(): String = "VexRiscv three stages"
override def getRtlPath(): String = "VexRiscvThreeStages.v"
SpinalVerilog(wrap(GenTwoThreeStage.cpu(
withMulDiv = false,
bypass = false,
barrielShifter = false,
withMemoryStage = true
)).setDefinitionName(getRtlPath().split("\\.").head))
}
val threeStageBarell = new Rtl {
override def getName(): String = "VexRiscv three stages with barriel"
override def getRtlPath(): String = "VexRiscvThreeStagesBar.v"
SpinalVerilog(wrap(GenTwoThreeStage.cpu(
withMulDiv = false,
bypass = true,
barrielShifter = true,
withMemoryStage = true
)).setDefinitionName(getRtlPath().split("\\.").head))
}
val threeStageMulDiv = new Rtl {
override def getName(): String = "VexRiscv three stages with Mul Div"
override def getRtlPath(): String = "VexRiscvThreeStagesMD.v"
SpinalVerilog(wrap(GenTwoThreeStage.cpu(
withMulDiv = true,
bypass = false,
barrielShifter = false,
withMemoryStage = true
)).setDefinitionName(getRtlPath().split("\\.").head))
}
val threeStageAll = new Rtl {
override def getName(): String = "VexRiscv three stages with Mul Div fast"
override def getRtlPath(): String = "VexRiscvThreeStagesMDfast.v"
SpinalVerilog(wrap(GenTwoThreeStage.cpu(
withMulDiv = true,
bypass = true,
barrielShifter = true,
withMemoryStage = true
)).setDefinitionName(getRtlPath().split("\\.").head))
}
val smallestNoCsr = new Rtl { val smallestNoCsr = new Rtl {
override def getName(): String = "VexRiscv smallest no CSR" override def getName(): String = "VexRiscv smallest no CSR"
override def getRtlPath(): String = "VexRiscvSmallestNoCsr.v" override def getRtlPath(): String = "VexRiscvSmallestNoCsr.v"
@ -155,8 +202,12 @@ object VexRiscvSynthesisBench {
// val rtls = List(twoStage, twoStageBarell, twoStageMulDiv, twoStageAll, smallestNoCsr, smallest, smallAndProductive, smallAndProductiveWithICache, fullNoMmuNoCache, noCacheNoMmuMaxPerf, fullNoMmuMaxPerf, fullNoMmu, full, linuxBalanced, linuxBalancedSmp) val rtls = List(
val rtls = List(linuxBalanced, linuxBalancedSmp) twoStage, twoStageBarell, twoStageMulDiv, twoStageAll,
threeStage, threeStageBarell, threeStageMulDiv, threeStageAll,
smallestNoCsr, smallest, smallAndProductive, smallAndProductiveWithICache, fullNoMmuNoCache, noCacheNoMmuMaxPerf, fullNoMmuMaxPerf, fullNoMmu, full, linuxBalanced, linuxBalancedSmp
)
// val rtls = List(linuxBalanced, linuxBalancedSmp)
// val rtls = List(smallest) // val rtls = List(smallest)
val targets = XilinxStdTargets() ++ AlteraStdTargets() ++ IcestormStdTargets().take(1) ++ List( val targets = XilinxStdTargets() ++ AlteraStdTargets() ++ IcestormStdTargets().take(1) ++ List(
new Target { new Target {

3
src/main/scala/vexriscv/ip/DataCache.scala
View File

@ -88,7 +88,8 @@ case class DataCacheConfig(cacheSize : Int,
lengthWidth = log2Up(this.bytePerLine), lengthWidth = log2Up(this.bytePerLine),
contextWidth = (if(!withWriteResponse) 1 else 0) + (if(cpuDataWidth != memDataWidth) log2Up(memDataBytes) else 0), contextWidth = (if(!withWriteResponse) 1 else 0) + (if(cpuDataWidth != memDataWidth) log2Up(memDataBytes) else 0),
alignment = BmbParameter.BurstAlignement.LENGTH, alignment = BmbParameter.BurstAlignement.LENGTH,
canExclusive = withExclusive canExclusive = withExclusive,
withCachedRead = true
)), )),
BmbInvalidationParameter( BmbInvalidationParameter(
canInvalidate = withInvalidate, canInvalidate = withInvalidate,

21
src/test/cpp/regression/main.cpp
View File

@ -1248,8 +1248,13 @@ public:
}; };
CpuRef riscvRef = CpuRef(this); CpuRef riscvRef = CpuRef(this);
string vcdName;
Workspace* setVcdName(string name){
vcdName = name;
return this;
}
Workspace(string name){ Workspace(string name){
vcdName = name;
//seed = VL_RANDOM_I(32)^VL_RANDOM_I(32)^0x1093472; //seed = VL_RANDOM_I(32)^VL_RANDOM_I(32)^0x1093472;
//srand48(seed); //srand48(seed);
// setIStall(false); // setIStall(false);
@ -1450,7 +1455,7 @@ public:
Verilated::traceEverOn(true); Verilated::traceEverOn(true);
tfp = new VerilatedVcdC; tfp = new VerilatedVcdC;
top->trace(tfp, 99); top->trace(tfp, 99);
tfp->open((string(name)+ ".vcd").c_str()); tfp->open((vcdName + ".vcd").c_str());
#endif #endif
// Reset // Reset
@ -1679,7 +1684,7 @@ public:
dump(i); dump(i+2);
dump(i+10); dump(i+10);
#ifdef TRACE #ifdef TRACE
tfp->close(); tfp->close();
@ -1750,6 +1755,7 @@ public:
#endif #endif
case 0xF00FFF48u: mTimeCmp = (mTimeCmp & 0xFFFFFFFF00000000) | *data;break; case 0xF00FFF48u: mTimeCmp = (mTimeCmp & 0xFFFFFFFF00000000) | *data;break;
case 0xF00FFF4Cu: mTimeCmp = (mTimeCmp & 0x00000000FFFFFFFF) | (((uint64_t)*data) << 32); break; case 0xF00FFF4Cu: mTimeCmp = (mTimeCmp & 0x00000000FFFFFFFF) | (((uint64_t)*data) << 32); break;
case 0xF00FFF50u: cout << "mTime " << *data << " : " << mTime << endl;
} }
if((addr & 0xFFFFF000) == 0xF5670000){ if((addr & 0xFFFFF000) == 0xF5670000){
uint32_t t = 0x900FF000 | (addr & 0xFFF); uint32_t t = 0x900FF000 | (addr & 0xFFF);
@ -3970,14 +3976,15 @@ int main(int argc, char **argv, char **env) {
w.loadHex(RUN_HEX); w.loadHex(RUN_HEX);
w.withRiscvRef(); w.withRiscvRef();
#endif #endif
//w.setIStall(false); w.setIStall(false);
//w.setDStall(false); w.setDStall(false);
#if defined(TRACE) || defined(TRACE_ACCESS) #if defined(TRACE) || defined(TRACE_ACCESS)
//w.setCyclesPerSecond(5e3); //w.setCyclesPerSecond(5e3);
//printf("Speed reduced 5Khz\n"); //printf("Speed reduced 5Khz\n");
#endif #endif
w.run(0xFFFFFFFFFFFF); w.run(0xFFFFFFFFFFFF);
exit(0);
} }
#endif #endif
@ -4047,11 +4054,11 @@ int main(int argc, char **argv, char **env) {
#ifndef COMPRESSED #ifndef COMPRESSED
uint32_t machineCsrRef[] = {1,11, 2,0x80000003u, 3,0x80000007u, 4,0x8000000bu, 5,6,7,0x80000007u , uint32_t machineCsrRef[] = {1,11, 2,0x80000003u, 3,0x80000007u, 4,0x8000000bu, 5,6,7,0x80000007u ,
8,6,9,6,10,4,11,4, 12,13,0, 14,2, 15,5,16,17,1 }; 8,6,9,6,10,4,11,4, 12,13,0, 14,2, 15,5,16,17,1 };
redo(REDO,TestX28("../../cpp/raw/machineCsr/build/machineCsr",machineCsrRef, sizeof(machineCsrRef)/4).withRiscvRef()->run(10e4);) redo(REDO,TestX28("../../cpp/raw/machineCsr/build/machineCsr",machineCsrRef, sizeof(machineCsrRef)/4).withRiscvRef()->setVcdName("machineCsr")->run(10e4);)
#else #else
uint32_t machineCsrRef[] = {1,11, 2,0x80000003u, 3,0x80000007u, 4,0x8000000bu, 5,6,7,0x80000007u , uint32_t machineCsrRef[] = {1,11, 2,0x80000003u, 3,0x80000007u, 4,0x8000000bu, 5,6,7,0x80000007u ,
8,6,9,6,10,4,11,4, 12,13, 14,2, 15,5,16,17,1 }; 8,6,9,6,10,4,11,4, 12,13, 14,2, 15,5,16,17,1 };
redo(REDO,TestX28("../../cpp/raw/machineCsr/build/machineCsrCompressed",machineCsrRef, sizeof(machineCsrRef)/4).withRiscvRef()->run(10e4);) redo(REDO,TestX28("../../cpp/raw/machineCsr/build/machineCsrCompressed",machineCsrRef, sizeof(machineCsrRef)/4).withRiscvRef()->setVcdName("machineCsrCompressed")->run(10e4);)
#endif #endif
#endif #endif
// #ifdef MMU // #ifdef MMU

98
src/test/scala/vexriscv/DhrystoneBench.scala
View File

@ -8,27 +8,34 @@ import vexriscv.demo._
import scala.sys.process._ import scala.sys.process._
class DhrystoneBench extends FunSuite{ class DhrystoneBench extends FunSuite {
def doCmd(cmd : String) : String = { def doCmd(cmd: String): String = {
val stdOut = new StringBuilder() val stdOut = new StringBuilder()
class Logger extends ProcessLogger {override def err(s: => String): Unit = {if(!s.startsWith("ar: creating ")) println(s)} class Logger extends ProcessLogger {
override def err(s: => String): Unit = {
if (!s.startsWith("ar: creating ")) println(s)
}
override def out(s: => String): Unit = { override def out(s: => String): Unit = {
println(s) println(s)
stdOut ++= s stdOut ++= s
} }
override def buffer[T](f: => T) = f override def buffer[T](f: => T) = f
} }
Process(cmd, new File("src/test/cpp/regression")).!(new Logger) Process(cmd, new File("src/test/cpp/regression")).!(new Logger)
stdOut.toString() stdOut.toString()
} }
val report = new StringBuilder() val report = new StringBuilder()
def getDmips(name : String, gen : => Unit, testCmd : String): Unit = {
def getDmips(name: String, gen: => Unit, testCmd: String): Unit = {
var genPassed = false var genPassed = false
test(name + "_gen") { test(name + "_gen") {
gen gen
genPassed = true genPassed = true
} }
test(name + "_test"){ test(name + "_test") {
assert(genPassed) assert(genPassed)
val str = doCmd(testCmd) val str = doCmd(testCmd)
assert(!str.contains("FAIL")) assert(!str.contains("FAIL"))
@ -37,48 +44,55 @@ class DhrystoneBench extends FunSuite{
val coremarkTicks = intFind.findFirstIn("Total ticks \\: (\\d+.?)+".r.findAllIn(str).toList.last).get.toDouble val coremarkTicks = intFind.findFirstIn("Total ticks \\: (\\d+.?)+".r.findAllIn(str).toList.last).get.toDouble
val coremarkIterations = intFind.findFirstIn("Iterations \\: (\\d+.?)+".r.findAllIn(str).toList.last).get.toDouble val coremarkIterations = intFind.findFirstIn("Iterations \\: (\\d+.?)+".r.findAllIn(str).toList.last).get.toDouble
val coremarkHzs = intFind.findFirstIn("DCLOCKS_PER_SEC=(\\d+.?)+".r.findAllIn(str).toList.last).get.toDouble val coremarkHzs = intFind.findFirstIn("DCLOCKS_PER_SEC=(\\d+.?)+".r.findAllIn(str).toList.last).get.toDouble
val coremarkPerMhz =1e6*coremarkIterations/coremarkTicks val coremarkPerMhz = 1e6 * coremarkIterations / coremarkTicks
report ++= s"$name -> $dmips DMIPS/Mhz $coremarkPerMhz Coremark/Mhz\n" report ++= s"$name -> $dmips DMIPS/Mhz $coremarkPerMhz Coremark/Mhz\n"
} }
} }
getDmips( for(withMemoryStage <- List(false, true)){
name = "GenTwoStageArty", val stages = if(withMemoryStage) "Three" else "Two"
gen = SpinalVerilog(GenTwoStage.cpu( getDmips(
withMulDiv = false, name = s"Gen${stages}StageArty",
bypass = false, gen = SpinalVerilog(GenTwoThreeStage.cpu(
barrielShifter = false withMulDiv = false,
)), bypass = false,
testCmd = "make clean run REDO=10 IBUS=SIMPLE DBUS=SIMPLE CSR=no MMU=no DEBUG_PLUGIN=no MUL=no DIV=no COREMARK=yes" barrielShifter = false,
) withMemoryStage = withMemoryStage
getDmips( )),
name = "GenTwoStageBarrielArty", testCmd = "make clean run REDO=10 IBUS=SIMPLE DBUS=SIMPLE CSR=no MMU=no DEBUG_PLUGIN=no MUL=no DIV=no COREMARK=yes"
gen = SpinalVerilog(GenTwoStage.cpu( )
withMulDiv = false, getDmips(
bypass = true, name = s"Gen${stages}StageBarrielArty",
barrielShifter = true gen = SpinalVerilog(GenTwoThreeStage.cpu(
)), withMulDiv = false,
testCmd = "make clean run REDO=10 IBUS=SIMPLE DBUS=SIMPLE CSR=no MMU=no DEBUG_PLUGIN=no MUL=no DIV=no COREMARK=yes" bypass = true,
) barrielShifter = true,
getDmips( withMemoryStage = withMemoryStage
name = "GenTwoStageMDArty", )),
gen = SpinalVerilog(GenTwoStage.cpu( testCmd = "make clean run REDO=10 IBUS=SIMPLE DBUS=SIMPLE CSR=no MMU=no DEBUG_PLUGIN=no MUL=no DIV=no COREMARK=yes"
withMulDiv = true, )
bypass = false, getDmips(
barrielShifter = false name = s"Gen${stages}StageMDArty",
)), gen = SpinalVerilog(GenTwoThreeStage.cpu(
testCmd = "make clean run REDO=10 IBUS=SIMPLE DBUS=SIMPLE CSR=no MMU=no DEBUG_PLUGIN=no MUL=yes DIV=yes COREMARK=yes" withMulDiv = true,
) bypass = false,
getDmips( barrielShifter = false,
name = "GenTwoStageMDBarrielArty", withMemoryStage = withMemoryStage
gen = SpinalVerilog(GenTwoStage.cpu( )),
withMulDiv = true, testCmd = "make clean run REDO=10 IBUS=SIMPLE DBUS=SIMPLE CSR=no MMU=no DEBUG_PLUGIN=no MUL=yes DIV=yes COREMARK=yes"
bypass = true, )
barrielShifter = true getDmips(
)), name = s"Gen${stages}StageMDBarrielArty",
testCmd = "make clean run REDO=10 IBUS=SIMPLE DBUS=SIMPLE CSR=no MMU=no DEBUG_PLUGIN=no MUL=yes DIV=yes COREMARK=yes" gen = SpinalVerilog(GenTwoThreeStage.cpu(
) withMulDiv = true,
bypass = true,
barrielShifter = true,
withMemoryStage = withMemoryStage
)),
testCmd = "make clean run REDO=10 IBUS=SIMPLE DBUS=SIMPLE CSR=no MMU=no DEBUG_PLUGIN=no MUL=yes DIV=yes COREMARK=yes"
)
}
getDmips( getDmips(
name = "GenSmallestNoCsr", name = "GenSmallestNoCsr",

3
src/test/scala/vexriscv/TestIndividualFeatures.scala
View File

@ -669,6 +669,7 @@ class TestIndividualFeatures extends MultithreadedFunSuite(sys.env.getOrElse("VE
val zephyrCount = sys.env.getOrElse("VEXRISCV_REGRESSION_ZEPHYR_COUNT", "4") val zephyrCount = sys.env.getOrElse("VEXRISCV_REGRESSION_ZEPHYR_COUNT", "4")
val demwRate = sys.env.getOrElse("VEXRISCV_REGRESSION_CONFIG_DEMW_RATE", "0.6").toDouble val demwRate = sys.env.getOrElse("VEXRISCV_REGRESSION_CONFIG_DEMW_RATE", "0.6").toDouble
val demRate = sys.env.getOrElse("VEXRISCV_REGRESSION_CONFIG_DEM_RATE", "0.5").toDouble val demRate = sys.env.getOrElse("VEXRISCV_REGRESSION_CONFIG_DEM_RATE", "0.5").toDouble
val stopOnError = sys.env.getOrElse("VEXRISCV_REGRESSION_STOP_ON_ERROR", "no")
val lock = new{} val lock = new{}
@ -740,7 +741,7 @@ class TestIndividualFeatures extends MultithreadedFunSuite(sys.env.getOrElse("VE
//Test RTL //Test RTL
val debug = true val debug = true
val stdCmd = (s"make run REGRESSION_PATH=../../src/test/cpp/regression VEXRISCV_FILE=VexRiscv.v WITH_USER_IO=no REDO=10 TRACE=${if(debug) "yes" else "no"} TRACE_START=100000000000ll FLOW_INFO=no STOP_ON_ERROR=no DHRYSTONE=yes COREMARK=${coremarkRegression} THREAD_COUNT=1 ") + s" SEED=${testSeed} " val stdCmd = (s"make run REGRESSION_PATH=../../src/test/cpp/regression VEXRISCV_FILE=VexRiscv.v WITH_USER_IO=no REDO=10 TRACE=${if(debug) "yes" else "no"} TRACE_START=100000000000ll FLOW_INFO=no STOP_ON_ERROR=$stopOnError DHRYSTONE=yes COREMARK=${coremarkRegression} THREAD_COUNT=1 ") + s" SEED=${testSeed} "
val testCmd = stdCmd + (positionsToApply).map(_.testParam).mkString(" ") val testCmd = stdCmd + (positionsToApply).map(_.testParam).mkString(" ")
println(testCmd) println(testCmd)
val str = doCmd(testCmd) val str = doCmd(testCmd)