riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

some additions to Travis and fixes for Testing

Browse Source
This commit is contained in:
Howard Mao 2016-02-23 16:56:13 -08:00
parent 90a73c621d
commit 8c02cb09ca
7 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -41,13 +41,14 @@ addons:
env: env:
matrix: matrix:
- CONFIG=DefaultCPPConfig - CONFIG=DefaultConfig
- CONFIG=RoccExampleConfig - CONFIG=RoccExampleConfig
- CONFIG=DmaControllerConfig - CONFIG=DmaControllerConfig
- CONFIG=MemtestConfig - CONFIG=MemtestConfig
- CONFIG=MemtestL2Config - CONFIG=MemtestL2Config
- CONFIG=BroadcastRegressionTestConfig - CONFIG=BroadcastRegressionTestConfig
- CONFIG=CacheRegressionTestConfig - CONFIG=CacheRegressionTestConfig
- CONFIG=UnitTestConfig
# blacklist private branches # blacklist private branches
branches: branches:

2
groundtest

@ -1 +1 @@
Subproject commit f411a7361af079e6456681edb5b94e7e0330b45b Subproject commit 8a2a19905f1acd48b722ea49e2d25a0e79dba782

2
junctions

@ -1 +1 @@
Subproject commit 5138397ad2167a8f7c755a42d8640584620119b3 Subproject commit aa67573876a6fdf9332dd7640439243213693d5d

2
riscv-tools

@ -1 +1 @@
Subproject commit 509c745061ce072e175015b9df83310a68eeb4a4 Subproject commit 1527c5ea4a500ae142d4c8bef4d2926d9a1d45c5

4
src/main/scala/TestConfigs.scala
View File

@ -25,8 +25,8 @@ class WithGroundTest extends Config(
maxManagerXacts = site(NAcquireTransactors) + 2, maxManagerXacts = site(NAcquireTransactors) + 2,
dataBits = site(CacheBlockBytes)*8) dataBits = site(CacheBlockBytes)*8)
case BuildTiles => { case BuildTiles => {
TestGeneration.addSuite(new AssemblyUnitTestSuite) TestGeneration.addSuite(new AssemblyGroundTestSuite)
TestGeneration.addSuite(new BenchmarkUnitTestSuite) TestGeneration.addSuite(new BenchmarkGroundTestSuite)
(0 until site(NTiles)).map { i => (0 until site(NTiles)).map { i =>
(r: Bool, p: Parameters) => (r: Bool, p: Parameters) =>
Module(new GroundTestTile(i, r) Module(new GroundTestTile(i, r)

6
src/main/scala/Testing.scala
View File

@ -29,7 +29,7 @@ run-$makeTargetName-debug: $$(addprefix $$(output_dir)/, $$(addsuffix .vpd, $$($
""" """
} }
trait UnitTest extends RocketTestSuite { trait GroundTestSuite extends RocketTestSuite {
override def postScript = s""" override def postScript = s"""
$$(addprefix $$(output_dir)/, $$(addsuffix .hex, $$($makeTargetName))): $$(addprefix $$(output_dir)/, $$(addsuffix .hex, $$($makeTargetName))):
@ -59,14 +59,14 @@ class BenchmarkTestSuite(makePrefix: String, val dir: String, val names: LinkedH
override def toString = s"$makeTargetName = \\\n" + names.map(n => s"\t$n.riscv").mkString(" \\\n") + postScript override def toString = s"$makeTargetName = \\\n" + names.map(n => s"\t$n.riscv").mkString(" \\\n") + postScript
} }
class AssemblyUnitTestSuite extends AssemblyTestSuite("","",LinkedHashSet())("") with UnitTest { class AssemblyGroundTestSuite extends AssemblyTestSuite("","",LinkedHashSet())("") with GroundTestSuite {
override val dir = "" override val dir = ""
override val names = LinkedHashSet[String]() override val names = LinkedHashSet[String]()
override val makeTargetName = "unit-test" override val makeTargetName = "unit-test"
override def toString = s"$makeTargetName = unit-test\\\n" + postScript override def toString = s"$makeTargetName = unit-test\\\n" + postScript
} }
class BenchmarkUnitTestSuite extends BenchmarkTestSuite("", "", LinkedHashSet()) with UnitTest { class BenchmarkGroundTestSuite extends BenchmarkTestSuite("", "", LinkedHashSet()) with GroundTestSuite {
override val makeTargetName = "unit-bmark-tests" override val makeTargetName = "unit-bmark-tests"
override def toString = s"$makeTargetName = unit-test\\\n" + postScript override def toString = s"$makeTargetName = unit-test\\\n" + postScript
} }

2
uncore

@ -1 +1 @@
Subproject commit 7ff3c3e1938c81f2d92ab1695e9646a4fff95f79 Subproject commit 087ed2819207ff0abc6bcd13b0891ba87b2a8a34