From c8c68e75bb7c56afc615467f23bd6c7316e2839a Mon Sep 17 00:00:00 2001 From: Howard Mao Date: Tue, 1 Dec 2015 15:26:09 -0800 Subject: [PATCH] base NGenerators on NTiles, not the other way around --- src/main/scala/Configs.scala | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/scala/Configs.scala b/src/main/scala/Configs.scala index 27d137d4..a9e6047e 100644 --- a/src/main/scala/Configs.scala +++ b/src/main/scala/Configs.scala @@ -313,15 +313,13 @@ class WithGroundTest extends Config( class WithMemtest extends Config( (pname, site, here) => pname match { - case NGenerators => 1 + case NGenerators => site(NTiles) case GenerateUncached => true case GenerateCached => true case MaxGenerateRequests => 128 case GeneratorStartAddress => 0 case BuildGroundTest => (id: Int, p: Parameters) => Module(new GeneratorTest(id)(p)) - - case NTiles => site(NGenerators) }) class WithCacheFillTest extends Config( @@ -383,8 +381,8 @@ class DualChannelDualBankL2Config extends Config( new With2MemoryChannels ++ new With2BanksPerMemChannel ++ new WithL2Cache ++ new DefaultConfig) -class MemtestDualChannelDualBankL2Config extends Config( - new With2MemoryChannels ++ new With2BanksPerMemChannel ++ +class FancyMemtestConfig extends Config( + new With2Cores ++ new With2MemoryChannels ++ new With2BanksPerMemChannel ++ new WithMemtest ++ new WithL2Cache ++ new GroundTestConfig) class WithRoccExample extends Config(