Adds parallel testing
This commit is contained in:
3
Makefile
3
Makefile
@@ -98,7 +98,8 @@ mill:
|
|||||||
|
|
||||||
autotest: mill test-bench/mem/tests/$(PROG).mem ##! Lance la simulation automatique pour tous les tests ou juste celui fourni dans PROG
|
autotest: mill test-bench/mem/tests/$(PROG).mem ##! Lance la simulation automatique pour tous les tests ou juste celui fourni dans PROG
|
||||||
|
|
||||||
testall: mill $(MEM_TESTS)
|
testall: mill compile
|
||||||
|
@PROOT=$(PWD) ./mill TPchisel.test.testOnly $(TOP_REP).ZzTopAllSpec
|
||||||
|
|
||||||
simulation: compile ##! Lance gtkwave sur le test fourni dans PROG
|
simulation: compile ##! Lance gtkwave sur le test fourni dans PROG
|
||||||
@$(call check_vars,PROG)
|
@$(call check_vars,PROG)
|
||||||
|
|||||||
10
build.sc
10
build.sc
@@ -28,14 +28,20 @@ object `TPchisel` extends SbtModule { m =>
|
|||||||
"-Ywarn-unused"
|
"-Ywarn-unused"
|
||||||
)
|
)
|
||||||
override def ivyDeps = Agg(
|
override def ivyDeps = Agg(
|
||||||
ivy"org.chipsalliance::chisel:7.2.0",
|
ivy"org.chipsalliance::chisel:7.2.0"
|
||||||
)
|
)
|
||||||
override def scalacPluginIvyDeps = Agg(
|
override def scalacPluginIvyDeps = Agg(
|
||||||
ivy"org.chipsalliance:::chisel-plugin:7.2.0",
|
ivy"org.chipsalliance:::chisel-plugin:7.2.0"
|
||||||
)
|
)
|
||||||
object test extends SbtTests with TestModule.ScalaTest {
|
object test extends SbtTests with TestModule.ScalaTest {
|
||||||
override def ivyDeps = m.ivyDeps() ++ Agg(
|
override def ivyDeps = m.ivyDeps() ++ Agg(
|
||||||
ivy"org.scalatest::scalatest::3.2.19"
|
ivy"org.scalatest::scalatest::3.2.19"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
override def forkArgs = super.forkArgs() ++ Seq(
|
||||||
|
"-Dscalatest.parallel.enabled=true",
|
||||||
|
"-Dscalatest.parallel.mode=concurrent",
|
||||||
|
"-Dscalatest.parallel.config.fixed.pool.size=12"
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
109
src/test/scala/projet/ZzTopAllSpec.scala
Normal file
109
src/test/scala/projet/ZzTopAllSpec.scala
Normal file
@@ -0,0 +1,109 @@
|
|||||||
|
package projet
|
||||||
|
|
||||||
|
import chisel3.simulator.scalatest.ChiselSim
|
||||||
|
import org.scalatest.freespec.AnyFreeSpec
|
||||||
|
import org.scalatest.matchers.must.Matchers
|
||||||
|
import java.nio.file.{Files, Paths}
|
||||||
|
import scala.jdk.CollectionConverters._
|
||||||
|
import scala.io.Source
|
||||||
|
import scala.collection.mutable.ListBuffer
|
||||||
|
import java.nio.file.FileSystems
|
||||||
|
import java.nio.file.Path
|
||||||
|
import org.scalatest.ParallelTestExecution
|
||||||
|
|
||||||
|
class ZzTopAllSpec
|
||||||
|
extends AnyFreeSpec
|
||||||
|
with Matchers
|
||||||
|
with ParallelTestExecution
|
||||||
|
with ChiselSim {
|
||||||
|
|
||||||
|
def expectedValuesFromAsm(path: String): Seq[BigInt] = {
|
||||||
|
val line =
|
||||||
|
Source.fromFile(path).getLines().find(_.startsWith("# expected:"))
|
||||||
|
line match {
|
||||||
|
case Some(l) =>
|
||||||
|
l.stripPrefix("# expected:")
|
||||||
|
.split(",")
|
||||||
|
.map(_.trim)
|
||||||
|
.filter(_.nonEmpty)
|
||||||
|
.map(str => BigInt(str, 16))
|
||||||
|
.toSeq
|
||||||
|
case None =>
|
||||||
|
Seq.empty
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def failTrace(msg: String = "Erreur", trace: ListBuffer[String]): Unit = {
|
||||||
|
val prefix = s"🛑 $msg\n"
|
||||||
|
val traceStr =
|
||||||
|
if (trace.nonEmpty)
|
||||||
|
"Trace:\n" + trace.map(" - " + _).mkString("\n") + "\n"
|
||||||
|
else ""
|
||||||
|
fail(prefix + traceStr)
|
||||||
|
}
|
||||||
|
|
||||||
|
def expectNextValue(
|
||||||
|
dut: ZzTop,
|
||||||
|
expected: BigInt,
|
||||||
|
timeout: Int,
|
||||||
|
trace: ListBuffer[String]
|
||||||
|
): Unit = {
|
||||||
|
var cycles = 0
|
||||||
|
dut.clock.step(12) // Attente d'un cycle proc (12 cycles systeme)
|
||||||
|
// Attendre une écriture dans x31
|
||||||
|
while (!dut.io.valid_x31.get.peek().litToBoolean && cycles < timeout) {
|
||||||
|
dut.clock.step(12) // Attente d'un cycle proc
|
||||||
|
cycles += 1
|
||||||
|
trace += f"Attente $cycles cycles"
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cycles < timeout) {
|
||||||
|
// Vérifier la nouvelle valeur
|
||||||
|
val got = dut.io.x31.get.peek().litValue
|
||||||
|
trace += f"Valeur attendue = 0x$expected%08X, reçue = 0x$got%08X"
|
||||||
|
if (got != expected) failTrace("Mauvaise sortie", trace)
|
||||||
|
} else {
|
||||||
|
trace += f"Valeur attendue = 0x$expected%08X, reçue = ⏰"
|
||||||
|
failTrace("Simulation bloquée", trace)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fonction de test commune
|
||||||
|
def testWith(file: String): Unit = {
|
||||||
|
val path = file.replace("/mem/", "/").replace(".mem", ".s")
|
||||||
|
if (Files.exists(Paths.get(path))) {
|
||||||
|
val expected = expectedValuesFromAsm(path)
|
||||||
|
val test_name = file.hashCode();
|
||||||
|
|
||||||
|
simulate(
|
||||||
|
new ZzTop(file, true),
|
||||||
|
subdirectory = Some(test_name.toString())
|
||||||
|
) { dut =>
|
||||||
|
val trace = ListBuffer[String]()
|
||||||
|
expected.foreach { value =>
|
||||||
|
expectNextValue(dut, value, timeout = 100, trace)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val dir =
|
||||||
|
FileSystems.getDefault().getPath(sys.env("PROOT") + "/bench/mem/tests")
|
||||||
|
// val suffix = ".mem"
|
||||||
|
|
||||||
|
// val path = dir + name + suffix
|
||||||
|
// print(path)
|
||||||
|
|
||||||
|
var tests = Files
|
||||||
|
.walk(dir)
|
||||||
|
.iterator()
|
||||||
|
.asScala
|
||||||
|
.filter(path => path.getFileName().toString().split('.').last == "mem")
|
||||||
|
.toArray[Path];
|
||||||
|
|
||||||
|
for (t <- tests) {
|
||||||
|
s"Sim ${t.toString()}" in {
|
||||||
|
testWith(t.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user