Merge remote-tracking branch 'origin/dev-ext' into dev

src/main/scala/vexiiriscv/misc/PrivilegedPlugin.scala

@@ -28,6 +28,7 @@ object PrivilegedParam{
     withUserTrap   = false,
     withRdTime     = false,
     withDebug      = false,
+    mstatusFsInit  = 0,
     vendorId       = 0,
     archId         = 46, //As spike
     impId          = 0,
@@ -53,6 +54,7 @@ case class PrivilegedParam(var withSupervisor : Boolean,
                            var withUserTrap: Boolean,
                            var withRdTime : Boolean,
                            var withDebug: Boolean,
+                           var mstatusFsInit : Int,
                            var debugTriggers : Int,
                            var debugTriggersLsu : Boolean,
                            var vendorId: Int,
@@ -187,7 +189,7 @@ class PrivilegedPlugin(val p : PrivilegedParam, val hartIds : Seq[Int]) extends
 
         bus.running := hartRunning
         bus.halted := !hartRunning
-        bus.unavailable := BufferCC(ClockDomain.current.isResetActive)
+        bus.unavailable := BufferCC.withTag(ClockDomain.current.isResetActive)
 
         when(debugMode) {
           inhibateInterrupts(hartId)
@@ -519,7 +521,7 @@ class PrivilegedPlugin(val p : PrivilegedParam, val hartIds : Seq[Int]) extends
         val status = new api.Csr(CSR.MSTATUS) {
           val mie, mpie = RegInit(False)
           val mpp = p.withUser.mux(RegInit(U"00"), U"11")
-          val fs = withFs generate RegInit(U"00")
+          val fs = withFs generate RegInit(U(p.mstatusFsInit, 2 bits))
           val sd = False
           val tsr, tvm = p.withSupervisor generate RegInit(False)
           val tw = p.withUser.mux(RegInit(False), False)

src/main/scala/vexiiriscv/test/VexiiRiscvProbe.scala

@@ -99,6 +99,16 @@ class VexiiRiscvProbe(cpu : VexiiRiscv, kb : Option[konata.Backend], var withRvl
     if(withRvls) rvls.jni.Frontend.deleteDisassemble(disass)
   }
 
+  def clearStats(): Unit = {
+    for (hart <- harts) {
+      hart.jbStats.clear()
+      hart.branchStats.clear()
+      hart.commits = 0
+    }
+    statsCycleOffset = cycle
+  }
+
+  var statsCycleOffset = 0l
   def getStats(): String = {
     val str = new StringBuilder()
     str ++= "### Stats ###\n"
@@ -119,8 +129,8 @@ class VexiiRiscvProbe(cpu : VexiiRiscv, kb : Option[konata.Backend], var withRvl
     }
 
     def cycleRatio(times: Long) = {
-      val rate = (1000f * times / cycle).toInt
-      f"${times}%7d / ${cycle}%7d ${rate / 10}%3d.${rate % 10}%%"
+      val rate = (1000f * times / (cycle-statsCycleOffset)).toInt
+      f"${times}%7d / ${cycle-statsCycleOffset}%7d ${rate / 10}%3d.${rate % 10}%%"
     }
 
     for ((hw, i) <- wbp.perf.dispatchFeedCounters.zipWithIndex) {
@@ -145,6 +155,12 @@ class VexiiRiscvProbe(cpu : VexiiRiscv, kb : Option[konata.Backend], var withRvl
     var failed = 0l
     var taken = 0l
 
+    def clear(): Unit = {
+      count = 0
+      failed = 0
+      taken = 0
+    }
+
     override def toString(): String ={
       val rate = (1000f*failed/count).toInt
       val rate2 = (1000f*taken/count).toInt