From 72a876bfba0f5d0d34f261385801fd032034ee31 Mon Sep 17 00:00:00 2001 From: Howard Mao Date: Wed, 10 Feb 2016 11:12:39 -0800 Subject: [PATCH] add NASTI to TL converter --- groundtest | 2 +- src/main/scala/TestConfigs.scala | 7 +++++++ uncore | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/groundtest b/groundtest index 5cc2e28f..88843dbf 160000 --- a/groundtest +++ b/groundtest @@ -1 +1 @@ -Subproject commit 5cc2e28f1f8af3fa7cb35b1ba53c667f8f516690 +Subproject commit 88843dbfe6014d8c1df999669ecd8f985e660ec3 diff --git a/src/main/scala/TestConfigs.scala b/src/main/scala/TestConfigs.scala index 7bf6bcae..85e1b513 100644 --- a/src/main/scala/TestConfigs.scala +++ b/src/main/scala/TestConfigs.scala @@ -98,6 +98,12 @@ class WithDmaStreamTest extends Config( size = site(StreamLoopbackWidth) / 8) }) +class WithNastiConverterTest extends Config( + (pname, site, here) => pname match { + case BuildGroundTest => + (id: Int, p: Parameters) => Module(new NastiConverterTest()(p)) + }) + class GroundTestConfig extends Config(new WithGroundTest ++ new DefaultConfig) class MemtestConfig extends Config(new WithMemtest ++ new GroundTestConfig) class MemtestL2Config extends Config( @@ -110,6 +116,7 @@ class CacheRegressionTestConfig extends Config( new WithCacheRegressionTest ++ new WithL2Cache ++ new GroundTestConfig) class DmaTestConfig extends Config(new WithDmaTest ++ new WithL2Cache ++ new GroundTestConfig) class DmaStreamTestConfig extends Config(new WithDmaStreamTest ++ new WithStreamLoopback ++ new WithL2Cache ++ new GroundTestConfig) +class NastiConverterTestConfig extends Config(new WithNastiConverterTest ++ new GroundTestConfig) class FancyMemtestConfig extends Config( new With2Cores ++ new With2MemoryChannels ++ new With2BanksPerMemChannel ++ diff --git a/uncore b/uncore index dbdc7ddd..9af7cf79 160000 --- a/uncore +++ b/uncore @@ -1 +1 @@ -Subproject commit dbdc7ddd4c368b06b14799ed76b2069c25a6c313 +Subproject commit 9af7cf79a45ddf010a913cea2ad9bfa254174cbe