From 4045a07eda8852fdc821d9f6aa83b88450095618 Mon Sep 17 00:00:00 2001 From: Howard Mao Date: Tue, 3 May 2016 17:11:25 -0700 Subject: [PATCH] Remove need for separate riscv-tests for groundtest --- riscv-tools | 2 +- src/main/scala/TestConfigs.scala | 6 +++++- src/main/scala/Testing.scala | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/riscv-tools b/riscv-tools index 4cacd6c0..958a4053 160000 --- a/riscv-tools +++ b/riscv-tools @@ -1 +1 @@ -Subproject commit 4cacd6c014069761cacfed4f7d2c607b8db444d4 +Subproject commit 958a4053a2816c2dc5f29016a2247733e7ea2119 diff --git a/src/main/scala/TestConfigs.scala b/src/main/scala/TestConfigs.scala index aa69ed17..1ca5f492 100644 --- a/src/main/scala/TestConfigs.scala +++ b/src/main/scala/TestConfigs.scala @@ -25,7 +25,11 @@ class WithGroundTest extends Config( maxManagerXacts = site(NAcquireTransactors) + 2, dataBits = site(CacheBlockBytes)*8) case BuildTiles => { - TestGeneration.addSuite(DefaultTestSuites.rvall("p")) + val groundtest = if (site(XLen) == 64) + DefaultTestSuites.groundtest64 + else + DefaultTestSuites.groundtest32 + TestGeneration.addSuite(groundtest("p")) TestGeneration.addSuite(DefaultTestSuites.emptyBmarks) (0 until site(NTiles)).map { i => (r: Bool, p: Parameters) => diff --git a/src/main/scala/Testing.scala b/src/main/scala/Testing.scala index e4134433..3ecc50e8 100644 --- a/src/main/scala/Testing.scala +++ b/src/main/scala/Testing.scala @@ -23,10 +23,10 @@ $$(addprefix $$(output_dir)/, $$($makeTargetName)): $$(output_dir)/%: $dir/% \tln -fs $$< $$@ run-$makeTargetName: $$(addprefix $$(output_dir)/, $$(addsuffix .out, $$($makeTargetName))) -\t@echo; perl -ne 'print " [$$$$1] $$$$ARGV \\t$$$$2\\n" if /\\*{3}(.{8})\\*{3}(.*)/' $$^; echo; +\t@echo; perl -ne 'print " [$$$$1] $$$$ARGV \\t$$$$2\\n" if /\\*{3}(.{8})\\*{3}(.*)/' $$^ /dev/null; echo; run-$makeTargetName-debug: $$(addprefix $$(output_dir)/, $$(addsuffix .vpd, $$($makeTargetName))) -\t@echo; perl -ne 'print " [$$$$1] $$$$ARGV \\t$$$$2\\n" if /\\*{3}(.{8})\\*{3}(.*)/' $$(patsubst %.vpd,%.out,$$^); echo; +\t@echo; perl -ne 'print " [$$$$1] $$$$ARGV \\t$$$$2\\n" if /\\*{3}(.{8})\\*{3}(.*)/' $$(patsubst %.vpd,%.out,$$^) /dev/null; echo; """ } @@ -67,18 +67,18 @@ object TestGeneration extends FileSystemUtilities{ val suites = envsuites.map(t => s"$$(${t.makeTargetName})").mkString(" ") s""" run-$kind-$env-tests: $$(addprefix $$(output_dir)/, $$(addsuffix .out, $suites)) -\t@echo; perl -ne 'print " [$$$$1] $$$$ARGV \\t$$$$2\\n" if /\\*{3}(.{8})\\*{3}(.*)/' $$^; echo; +\t@echo; perl -ne 'print " [$$$$1] $$$$ARGV \\t$$$$2\\n" if /\\*{3}(.{8})\\*{3}(.*)/' $$^ /dev/null; echo; run-$kind-$env-tests-debug: $$(addprefix $$(output_dir)/, $$(addsuffix .vpd, $suites)) -\t@echo; perl -ne 'print " [$$$$1] $$$$ARGV \\t$$$$2\\n" if /\\*{3}(.{8})\\*{3}(.*)/' $$(patsubst %.vpd,%.out,$$^); echo; +\t@echo; perl -ne 'print " [$$$$1] $$$$ARGV \\t$$$$2\\n" if /\\*{3}(.{8})\\*{3}(.*)/' $$(patsubst %.vpd,%.out,$$^) /dev/null; echo; run-$kind-$env-tests-fast: $$(addprefix $$(output_dir)/, $$(addsuffix .run, $suites)) -\t@echo; perl -ne 'print " [$$$$1] $$$$ARGV \\t$$$$2\\n" if /\\*{3}(.{8})\\*{3}(.*)/' $$^; echo; +\t@echo; perl -ne 'print " [$$$$1] $$$$ARGV \\t$$$$2\\n" if /\\*{3}(.{8})\\*{3}(.*)/' $$^ /dev/null; echo; """} } ).mkString("\n") + s""" run-$kind-tests: $$(addprefix $$(output_dir)/, $$(addsuffix .out, $targets)) -\t@echo; perl -ne 'print " [$$$$1] $$$$ARGV \\t$$$$2\\n" if /\\*{3}(.{8})\\*{3}(.*)/' $$^; echo; +\t@echo; perl -ne 'print " [$$$$1] $$$$ARGV \\t$$$$2\\n" if /\\*{3}(.{8})\\*{3}(.*)/' $$^ /dev/null; 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; +\t@echo; perl -ne 'print " [$$$$1] $$$$ARGV \\t$$$$2\\n" if /\\*{3}(.{8})\\*{3}(.*)/' $$(patsubst %.vpd,%.out,$$^) /dev/null; echo; 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; +\t@echo; perl -ne 'print " [$$$$1] $$$$ARGV \\t$$$$2\\n" if /\\*{3}(.{8})\\*{3}(.*)/' $$^ /dev/null; echo; """ } else { "\n" } } @@ -134,8 +134,9 @@ object DefaultTestSuites { val rv64miNames = rv32miNames val rv64mi = new AssemblyTestSuite("rv64mi", "rv64mi", rv64miNames)(_) - val rvallNames = LinkedHashSet("empty") - val rvall = new AssemblyTestSuite("rvall", "rvall", rvallNames)(_) + val groundtestNames = LinkedHashSet("simple") + val groundtest64 = new AssemblyTestSuite("groundtest", "rv64ui", groundtestNames)(_) + val groundtest32 = new AssemblyTestSuite("groundtest", "rv32ui", groundtestNames)(_) // TODO: "rv64ui-pm-lrsc", "rv64mi-pm-ipi", @@ -146,8 +147,7 @@ object DefaultTestSuites { "median", "multiply", "qsort", "towers", "vvadd", "mm", "dhrystone", "spmv", "mt-vvadd", "mt-matmul")) val emptyBmarks = new BenchmarkTestSuite("empty", - "$(RISCV)/riscv64-unknown-elf/share/riscv-tests/benchmarks", - LinkedHashSet("empty")) + "$(RISCV)/riscv64-unknown-elf/share/riscv-tests/benchmarks", LinkedHashSet.empty) val mtBmarks = new BenchmarkTestSuite("mt", "$(RISCV)/riscv64-unknown-elf/share/riscv-tests/mt", LinkedHashSet(((0 to 4).map("vvadd"+_) ++