From 35547aa4281d9a8e7eacbec00fc2ca97ddbb9923 Mon Sep 17 00:00:00 2001
From: Howard Mao <zhehao.mao@gmail.com>
Date: Fri, 8 Jul 2016 13:40:52 -0700
Subject: [PATCH] allow NastiConverterTest and Memtest to run simultaneously

---
 groundtest                       |  2 +-
 src/main/scala/TestConfigs.scala | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/groundtest b/groundtest
index dadf8bea..6d65b7f0 160000
--- a/groundtest
+++ b/groundtest
@@ -1 +1 @@
-Subproject commit dadf8beac1204a805f0ef1e27372457c9c5f90ef
+Subproject commit 6d65b7f0dd5bc279d65783aa11c664345107a0b9
diff --git a/src/main/scala/TestConfigs.scala b/src/main/scala/TestConfigs.scala
index 0869ee3a..f314b3ca 100644
--- a/src/main/scala/TestConfigs.scala
+++ b/src/main/scala/TestConfigs.scala
@@ -149,6 +149,9 @@ class WithNastiConverterTest extends Config(
     case GroundTestKey => Seq.fill(site(NTiles)) {
       GroundTestTileSettings(uncached = 1)
     }
+    case GeneratorKey => GeneratorParameters(
+      maxRequests = 128,
+      startAddress = site(GlobalAddrMap)("mem").start)
     case BuildGroundTest =>
       (p: Parameters) => Module(new NastiConverterTest()(p))
     case _ => throw new CDEMatchError
@@ -207,6 +210,11 @@ class CacheRegressionTestConfig extends Config(
   new WithCacheRegressionTest ++ new WithL2Cache ++ new GroundTestConfig)
 
 class NastiConverterTestConfig extends Config(new WithNastiConverterTest ++ new GroundTestConfig)
+class FancyNastiConverterTestConfig extends Config(
+  new WithNCores(2) ++ new WithNastiConverterTest ++
+  new WithNMemoryChannels(2) ++ new WithNBanksPerMemChannel(4) ++
+  new WithL2Cache ++ new GroundTestConfig)
+
 class UnitTestConfig extends Config(new WithUnitTest ++ new GroundTestConfig)
 
 class TraceGenConfig extends Config(
@@ -225,3 +233,23 @@ class MIF32BitComparatorConfig extends Config(
   new WithMIFDataBits(32) ++ new ComparatorConfig)
 class MIF32BitMemtestConfig extends Config(
   new WithMIFDataBits(32) ++ new MemtestConfig)
+
+class WithPCIeMockupTest extends Config(
+  (pname, site, here) => pname match {
+    case NTiles => 2
+    case GroundTestKey => Seq(
+      GroundTestTileSettings(1, 1),
+      GroundTestTileSettings(1))
+    case GeneratorKey => GeneratorParameters(
+      maxRequests = 128,
+      startAddress = site(GlobalAddrMap)("mem").start)
+    case BuildGroundTest =>
+      (p: Parameters) => {
+        val id = p(GroundTestId)
+        if (id == 0) Module(new GeneratorTest()(p))
+        else Module(new NastiConverterTest()(p))
+      }
+    case _ => throw new CDEMatchError
+  })
+class PCIeMockupTestConfig extends Config(
+  new WithPCIeMockupTest ++ new GroundTestConfig)