From 67028cdb48ce9087aa6c5168d8b0c10584a3ce04 Mon Sep 17 00:00:00 2001 From: Charles Papon Date: Mon, 21 Oct 2019 12:53:53 +0200 Subject: [PATCH] Add Mul16Plugin to regression tests Fix missing MulSimplePlugin in regressions tests --- .../vexriscv/TestIndividualFeatures.scala | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/test/scala/vexriscv/TestIndividualFeatures.scala b/src/test/scala/vexriscv/TestIndividualFeatures.scala index efa975c..005f335 100644 --- a/src/test/scala/vexriscv/TestIndividualFeatures.scala +++ b/src/test/scala/vexriscv/TestIndividualFeatures.scala @@ -102,7 +102,7 @@ class MulDivDimension extends VexRiscvDimension("MulDiv") { - new VexRiscvPosition("MulDivFpgaSimple") { + l = new VexRiscvPosition("MulDivFpgaSimple") { override def testParam = "MUL=yes DIV=yes" override def applyOn(config: VexRiscvConfig): Unit = { config.plugins += new MulSimplePlugin @@ -115,6 +115,19 @@ class MulDivDimension extends VexRiscvDimension("MulDiv") { } } :: l + if(!noMemory && !noWriteBack) l = new VexRiscvPosition("MulDivFpga16BitsDsp") { + override def testParam = "MUL=yes DIV=yes" + override def applyOn(config: VexRiscvConfig): Unit = { + config.plugins += new Mul16Plugin + config.plugins += new MulDivIterativePlugin( + genMul = false, + genDiv = true, + mulUnrollFactor = 32, + divUnrollFactor = 1 + ) + } + } :: l + if(!noMemory) { l = new VexRiscvPosition("MulDivAsic") { override def testParam = "MUL=yes DIV=yes" @@ -619,9 +632,9 @@ class TestIndividualFeatures extends FunSuite { val seed = sys.env.getOrElse("VEXRISCV_REGRESSION_SEED", Random.nextLong().toString).toLong // // val testId = Some(mutable.HashSet(3,4,9,11,13,16,18,19,20,21)) -// val testId = Some(mutable.HashSet(22)) -// val testId = Some(mutable.HashSet(22, 33 , 38, 47, 48)) -// val seed = 5426556825163943143l +// val testId = Some(mutable.HashSet(11)) +// val testId = Some(mutable.HashSet(4, 11)) +// val seed = 6592877339343561798l val rand = new Random(seed)