1
0

Fix testing of DefaultSmallConfig; bump rocket et al

This commit is contained in:
Andrew Waterman 2016-07-07 19:34:03 -07:00
parent 8c13e78ab5
commit 32ee5432dd
10 changed files with 16 additions and 12 deletions

@ -1 +1 @@
Subproject commit 378edecbf797f19cf26f5a4d6a3ed3df701ba66d Subproject commit c90be4ea06faf9a39c85f38e932d29fe63eb4b37

View File

@ -52,7 +52,7 @@ verilator/verilator-$(VERILATOR_VERSION).tar.gz:
# Run Verilator to produce a fast binary to emulate this circuit. # Run Verilator to produce a fast binary to emulate this circuit.
VERILATOR := $(INSTALLED_VERILATOR) --cc --exe VERILATOR := $(INSTALLED_VERILATOR) --cc --exe
VERILATOR_FLAGS := --top-module $(MODEL) +define+PRINTF_COND=\$$c\(\"verbose\"\) --assert \ VERILATOR_FLAGS := --top-module $(MODEL) +define+PRINTF_COND=\$$c\(\"verbose\"\) --assert \
-Wno-UNSIGNED -Wno-COMBDLY -Wno-MULTIDRIVEN -Wno-WIDTH -Wno-STMTDLY -Wno-SELRANGE -Wno-IMPLICIT \ -Wno-STMTDLY --x-assign unique \
-O3 -CFLAGS "$(CXXFLAGS) -DVERILATOR -include $(base_dir)/csrc/verilator.h" -O3 -CFLAGS "$(CXXFLAGS) -DVERILATOR -include $(base_dir)/csrc/verilator.h"
cppfiles = $(addprefix $(base_dir)/csrc/, $(addsuffix .cc, $(CXXSRCS))) cppfiles = $(addprefix $(base_dir)/csrc/, $(addsuffix .cc, $(CXXSRCS)))

2
firrtl

@ -1 +1 @@
Subproject commit 5e6fac5d51bf62078d2319a0aae05807f82cf809 Subproject commit b7de40e23161a7346fea90576f07b5c200c2675b

@ -1 +1 @@
Subproject commit a7c8c20300c1218b9d8f56c6f3d62f46b0359648 Subproject commit 9eeefb6e859cb8b68a91065b00992949ef677fe6

@ -1 +1 @@
Subproject commit 40894cdde5de0c87b959663ce62535e47412a843 Subproject commit 6953e5c4a32afd0055200578a3e7eda064f58859

2
rocket

@ -1 +1 @@
Subproject commit fad901bdc023824dd7cd54d68ab91ac9a5a89a59 Subproject commit d972677a0c07b6cdf6b806cbd4a152b103c3293c

View File

@ -179,7 +179,7 @@ class BaseConfig extends Config (
else (rv32i, rv32u) else (rv32i, rv32u)
TestGeneration.addSuites(rvi.map(_("p"))) TestGeneration.addSuites(rvi.map(_("p")))
TestGeneration.addSuites((if(site(UseVM)) List("v") else List()).flatMap(env => rvu.map(_(env)))) TestGeneration.addSuites((if(site(UseVM)) List("v") else List()).flatMap(env => rvu.map(_(env))))
TestGeneration.addSuite(bmarks) TestGeneration.addSuite(benchmarks)
List.fill(site(NTiles)){ (r: Bool, p: Parameters) => List.fill(site(NTiles)){ (r: Bool, p: Parameters) =>
Module(new RocketTile(resetSignal = r)(p.alterPartial({ Module(new RocketTile(resetSignal = r)(p.alterPartial({
case TLId => "L1toL2" case TLId => "L1toL2"
@ -208,11 +208,11 @@ class BaseConfig extends Config (
case XLen => 64 case XLen => 64
case UseFPU => { case UseFPU => {
val env = if(site(UseVM)) List("p","v") else List("p") val env = if(site(UseVM)) List("p","v") else List("p")
TestGeneration.addSuite(rv32udBenchmarks)
if(site(FDivSqrt)) { if(site(FDivSqrt)) {
TestGeneration.addSuites(env.map(rv64uf)) TestGeneration.addSuites(env.map(rv64uf))
TestGeneration.addSuites(env.map(rv64ud)) TestGeneration.addSuites(env.map(rv64ud))
} } else {
else {
TestGeneration.addSuites(env.map(rv64ufNoDiv)) TestGeneration.addSuites(env.map(rv64ufNoDiv))
TestGeneration.addSuites(env.map(rv64udNoDiv)) TestGeneration.addSuites(env.map(rv64udNoDiv))
} }

View File

@ -146,8 +146,11 @@ object DefaultTestSuites {
val rv64u = List(rv64ui, rv64um) val rv64u = List(rv64ui, rv64um)
val rv64i = List(rv64ui, rv64si, rv64mi) val rv64i = List(rv64ui, rv64si, rv64mi)
val bmarks = new BenchmarkTestSuite("basic", "$(RISCV)/riscv64-unknown-elf/share/riscv-tests/benchmarks", LinkedHashSet( val benchmarks = new BenchmarkTestSuite("basic", "$(RISCV)/riscv64-unknown-elf/share/riscv-tests/benchmarks", LinkedHashSet(
"median", "multiply", "qsort", "towers", "vvadd", "mm", "dhrystone", "spmv", "mt-vvadd", "mt-matmul")) "median", "multiply", "qsort", "towers", "vvadd", "dhrystone", "mt-matmul"))
val rv32udBenchmarks = new BenchmarkTestSuite("basic", "$(RISCV)/riscv64-unknown-elf/share/riscv-tests/benchmarks", LinkedHashSet(
"mm", "spmv", "mt-vvadd"))
val emptyBmarks = new BenchmarkTestSuite("empty", 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)

2
uncore

@ -1 +1 @@
Subproject commit 2109a48e18719383942d535ff4c1d0a859dcc424 Subproject commit bc6679ecd5edfe8dbfa27e52d06651f7b8ae47dc

View File

@ -45,6 +45,7 @@ VCS_OPTS = -notice -line +lint=all,noVCDE,noONGS,noUI -error=PCWM-L -timescale=1
+incdir+$(generated_dir) \ +incdir+$(generated_dir) \
+define+CLOCK_PERIOD=0.5 $(sim_vsrcs) $(sim_csrcs) \ +define+CLOCK_PERIOD=0.5 $(sim_vsrcs) $(sim_csrcs) \
+define+PRINTF_COND=$(TB).printf_cond \ +define+PRINTF_COND=$(TB).printf_cond \
+define+RANDOMIZE \
+libext+.v \ +libext+.v \
#-------------------------------------------------------------------- #--------------------------------------------------------------------