1
0

[unittest] more Config cleanup

This commit is contained in:
Henry Cook 2016-09-21 17:11:57 -07:00
parent 8e63f4a1a5
commit 270011b768

View File

@ -2,8 +2,6 @@
package unittest package unittest
import scala.collection.mutable.LinkedHashSet
import Chisel._ import Chisel._
import cde.{Parameters, Config, CDEMatchError} import cde.{Parameters, Config, CDEMatchError}
import coreplex._ import coreplex._
@ -11,7 +9,6 @@ import rocketchip._
class WithJunctionsUnitTests extends Config( class WithJunctionsUnitTests extends Config(
(pname, site, here) => pname match { (pname, site, here) => pname match {
case RegressionTestNames => LinkedHashSet("rv64ui-p-simple")
case UnitTests => (p: Parameters) => { case UnitTests => (p: Parameters) => {
TestGeneration.addSuite(DefaultTestSuites.groundtest64("p")) // TODO why TestGeneration.addSuite(DefaultTestSuites.groundtest64("p")) // TODO why
TestGeneration.addSuite(DefaultTestSuites.emptyBmarks) TestGeneration.addSuite(DefaultTestSuites.emptyBmarks)
@ -27,16 +24,17 @@ class WithUncoreUnitTests extends Config(
(pname, site, here) => pname match { (pname, site, here) => pname match {
case NCoreplexExtClients => 0 case NCoreplexExtClients => 0
case uncore.tilelink.TLId => "L1toL2" case uncore.tilelink.TLId => "L1toL2"
case RegressionTestNames => LinkedHashSet("rv64ui-p-simple")
case UnitTests => (p: Parameters) => { case UnitTests => (p: Parameters) => {
TestGeneration.addSuite(DefaultTestSuites.groundtest64("p")) // TODO why TestGeneration.addSuite(DefaultTestSuites.groundtest64("p")) // TODO why
TestGeneration.addSuite(DefaultTestSuites.emptyBmarks) TestGeneration.addSuite(DefaultTestSuites.emptyBmarks)
Seq( Seq(
Module(new uncore.devices.ROMSlaveTest()(p)), Module(new uncore.devices.ROMSlaveTest()(p)),
Module(new uncore.devices.TileLinkRAMTest()(p)), Module(new uncore.devices.TileLinkRAMTest()(p)),
Module(new uncore.tilelink2.TLFuzzRAMTest)) Module(new uncore.tilelink2.TLFuzzRAMTest)
)
} }
case _ => throw new CDEMatchError case _ => throw new CDEMatchError
}) }
)
class UnitTestConfig extends Config(new WithUncoreUnitTests ++ new WithJunctionsUnitTests ++ new BaseConfig) class UnitTestConfig extends Config(new WithUncoreUnitTests ++ new WithJunctionsUnitTests ++ new BaseConfig)