move stuff

SpinalHDL · Jan 5, 2024 · 61d56d6 · 61d56d6
1 parent 2dffaee
commit 61d56d6
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/src/main/scala/vexiiriscv/execute/SimdAddPlugin.scala b/src/main/scala/vexiiriscv/execute/SimdAddPlugin.scala
@@ -1,13 +1,14 @@
 package vexiiriscv.execute
 
-
 import spinal.core._
+import spinal.core.sim.SpinalSimConfig
 import spinal.lib._
 import spinal.lib.pipeline.Stageable
 import vexiiriscv.Generate.args
 import vexiiriscv.{Global, ParamSimple, VexiiRiscv}
 import vexiiriscv.compat.MultiPortWritesSymplifier
 import vexiiriscv.riscv.{IntRegFile, RS1, RS2, Riscv}
+import vexiiriscv.tester.TestOptions
 
 //This plugin example will add a new instruction named SIMD_ADD which do the following :
 //
@@ -80,7 +81,7 @@ class SimdAddPlugin(val layer : LaneLayer) extends ExecutionUnitElementSimple(la
 
 
 
-object Generate extends App {
+object VexiiSimdAddGen extends App {
   val param = new ParamSimple()
   val sc = SpinalConfig()
 
@@ -97,3 +98,31 @@ object Generate extends App {
   }
 }
 
+object VexiiSimdAddSim extends App{
+  val param = new ParamSimple()
+  val testOpt = new TestOptions()
+
+  val genConfig = SpinalConfig()
+  genConfig.includeSimulation
+
+  val simConfig = SpinalSimConfig()
+  simConfig.withFstWave
+  simConfig.withTestFolder
+  simConfig.withConfig(genConfig)
+
+  assert(new scopt.OptionParser[Unit]("VexiiRiscv") {
+    help("help").text("prints this usage text")
+    testOpt.addOptions(this)
+    param.addOptions(this)
+  }.parse(args, Unit).nonEmpty)
+
+  println(s"With Vexiiriscv parm :\n - ${param.getName()}")
+  val compiled = simConfig.compile {
+    val pa = param.pluginsArea()
+    pa.plugins += new SimdAddPlugin(pa.early0)
+    VexiiRiscv(pa.plugins)
+  }
+  testOpt.test(compiled)
+}
+
+
diff --git a/...t/scala/vexiiriscv/tester/TestBench.scala → ...n/scala/vexiiriscv/tester/TestBench.scala b/...t/scala/vexiiriscv/tester/TestBench.scala → ...n/scala/vexiiriscv/tester/TestBench.scala
@@ -10,15 +10,14 @@ import vexiiriscv._
 import vexiiriscv.fetch.PcService
 import vexiiriscv.misc.PrivilegedPlugin
 import vexiiriscv.riscv.Riscv
-
-import java.io.{File, IOException, InputStream, OutputStream, OutputStreamWriter, PrintStream, PrintWriter}
-import scala.collection.mutable
-import scala.collection.mutable.ArrayBuffer
 import vexiiriscv.test.konata.Backend
 import vexiiriscv.test.{PeripheralEmulator, VexiiRiscvProbe}
 
+import java.io.{File, IOException, PrintWriter}
 import java.net.{ServerSocket, Socket}
 import java.util.Scanner
+import scala.collection.mutable
+import scala.collection.mutable.ArrayBuffer
 
 
 class TestOptions{