some additions to Travis and fixes for Testing
This commit is contained in:
		| @@ -41,13 +41,14 @@ addons: | ||||
|  | ||||
| env: | ||||
|   matrix: | ||||
|     - CONFIG=DefaultCPPConfig | ||||
|     - CONFIG=DefaultConfig | ||||
|     - CONFIG=RoccExampleConfig | ||||
|     - CONFIG=DmaControllerConfig | ||||
|     - CONFIG=MemtestConfig | ||||
|     - CONFIG=MemtestL2Config | ||||
|     - CONFIG=BroadcastRegressionTestConfig | ||||
|     - CONFIG=CacheRegressionTestConfig | ||||
|     - CONFIG=UnitTestConfig | ||||
|  | ||||
| # blacklist private branches | ||||
| branches: | ||||
|   | ||||
 Submodule groundtest updated: f411a7361a...8a2a19905f
									
								
							 Submodule junctions updated: 5138397ad2...aa67573876
									
								
							 Submodule riscv-tools updated: 509c745061...1527c5ea4a
									
								
							| @@ -25,8 +25,8 @@ class WithGroundTest extends Config( | ||||
|         maxManagerXacts = site(NAcquireTransactors) + 2, | ||||
|         dataBits = site(CacheBlockBytes)*8) | ||||
|     case BuildTiles => { | ||||
|       TestGeneration.addSuite(new AssemblyUnitTestSuite) | ||||
|       TestGeneration.addSuite(new BenchmarkUnitTestSuite) | ||||
|       TestGeneration.addSuite(new AssemblyGroundTestSuite) | ||||
|       TestGeneration.addSuite(new BenchmarkGroundTestSuite) | ||||
|       (0 until site(NTiles)).map { i => | ||||
|         (r: Bool, p: Parameters) => | ||||
|           Module(new GroundTestTile(i, r) | ||||
|   | ||||
| @@ -29,7 +29,7 @@ run-$makeTargetName-debug: $$(addprefix $$(output_dir)/, $$(addsuffix .vpd, $$($ | ||||
| """ | ||||
| } | ||||
|  | ||||
| trait UnitTest extends RocketTestSuite { | ||||
| trait GroundTestSuite extends RocketTestSuite { | ||||
|   override def postScript = s""" | ||||
|  | ||||
| $$(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 | ||||
| } | ||||
|  | ||||
| class AssemblyUnitTestSuite extends AssemblyTestSuite("","",LinkedHashSet())("") with UnitTest { | ||||
| class AssemblyGroundTestSuite extends AssemblyTestSuite("","",LinkedHashSet())("") with GroundTestSuite { | ||||
|   override val dir = "" | ||||
|   override val names = LinkedHashSet[String]() | ||||
|   override val makeTargetName = "unit-test" | ||||
|   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 def toString = s"$makeTargetName = unit-test\\\n" + postScript | ||||
| } | ||||
|   | ||||
							
								
								
									
										2
									
								
								uncore
									
									
									
									
									
								
							
							
								
								
								
								
								
							
						
						
									
										2
									
								
								uncore
									
									
									
									
									
								
							 Submodule uncore updated: 7ff3c3e193...087ed28192
									
								
							
		Reference in New Issue
	
	Block a user