Upgrade sbt to 0.13.8, simplify build.scala Tasks, generate tests from TestGenerator App, set addons with env variable ROCKETCHIP_ADDONS
This commit is contained in:
		| @@ -78,8 +78,6 @@ class Top extends Module with TopLevelParameters { | ||||
|     val temp = Module(new ZscaleTop) | ||||
|     io.host <> temp.io.host | ||||
|   } | ||||
|  | ||||
|   TestGeneration.generateMakefrag | ||||
| } | ||||
|  | ||||
| class MultiChannelTop extends Module with TopLevelParameters { | ||||
|   | ||||
| @@ -60,7 +60,7 @@ run-$kind-tests: $$(addprefix $$(output_dir)/, $$(addsuffix .out, $targets)) | ||||
| \t@echo; perl -ne 'print "  [$$$$1] $$$$ARGV \\t$$$$2\\n" if /\\*{3}(.{8})\\*{3}(.*)/' $$^; echo; | ||||
| run-$kind-tests-debug: $$(addprefix $$(output_dir)/, $$(addsuffix .vpd, $targets)) | ||||
| \t@echo; perl -ne 'print "  [$$$$1] $$$$ARGV \\t$$$$2\\n" if /\\*{3}(.{8})\\*{3}(.*)/' $$(patsubst %.vpd,%.out,$$^); echo; | ||||
| run-$kind-fast: $$(addprefix $$(output_dir)/, $$(addsuffix .run, $targets)) | ||||
| run-$kind-tests-fast: $$(addprefix $$(output_dir)/, $$(addsuffix .run, $targets)) | ||||
| \t@echo; perl -ne 'print "  [$$$$1] $$$$ARGV \\t$$$$2\\n" if /\\*{3}(.{8})\\*{3}(.*)/' $$^; echo; | ||||
| """ | ||||
|       } else { "\n" } | ||||
| @@ -118,3 +118,9 @@ object DefaultTestSuites { | ||||
|          "bb","bc","bf","bh","bj","bk","bm","bo","br","bs","ce","cf","cg","ci","ck","cl", | ||||
|          "cm","cs","cv","cy","dc","df","dm","do","dr","ds","du","dv").map(_+"_matmul")).toSet) | ||||
| } | ||||
|  | ||||
| object TestGenerator extends App { | ||||
|   val gen = () => Class.forName("rocketchip."+args(0)).newInstance().asInstanceOf[Module] | ||||
|   chiselMain.run(args.drop(1), gen) | ||||
|   TestGeneration.generateMakefrag | ||||
| } | ||||
|   | ||||
| @@ -71,6 +71,4 @@ class ZscaleTop extends Module { | ||||
|   sys.io.host <> io.host | ||||
|   bootmem.io <> sys.io.bootmem | ||||
|   dram.io <> sys.io.dram | ||||
|  | ||||
|   TestGeneration.generateMakefrag | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user