From c6b56c5f25d654c2c6cd6eebd8403cd42c918083 Mon Sep 17 00:00:00 2001 From: Henry Cook Date: Thu, 4 Apr 2013 15:51:24 -0700 Subject: [PATCH] bump rocket for coherence bug fix --- emulator/Makefile | 6 +++--- riscv-rocket | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/emulator/Makefile b/emulator/Makefile index 6327fa7e..1457bc51 100644 --- a/emulator/Makefile +++ b/emulator/Makefile @@ -68,15 +68,15 @@ output: mkdir -p $@ output/%.run: output/%.hex emulator - ./emulator +dramsim +max-cycles=3000000 +coremap-random +loadmem=$< none 2> /dev/null + ./emulator +dramsim +max-cycles=30000000 +coremap-random +loadmem=$< none 2> /dev/null output/%.out: output/%.hex emulator - ./emulator +dramsim +max-cycles=3000000 +verbose +coremap-random +loadmem=$< none 2> $@ + ./emulator +dramsim +max-cycles=30000000 +verbose +coremap-random +loadmem=$< none 2> $@ output/%.vpd: output/%.hex emulator-debug rm -rf $@.vcd && mkfifo $@.vcd vcd2vpd $@.vcd $@ > /dev/null & - ./emulator-debug +dramsim +max-cycles=3000000 +verbose -v$@.vcd +coremap-random +loadmem=$< none 2> $(patsubst %.vpd,%.out,$@) + ./emulator-debug +dramsim +max-cycles=30000000 +verbose -v$@.vcd +coremap-random +loadmem=$< none 2> $(patsubst %.vpd,%.out,$@) run-asm-tests: $(addprefix output/, $(addsuffix .out, $(global_asm_tests) $(global_asm_vm_tests))) @echo; perl -ne 'print " [$$1] $$ARGV \t$$2\n" if /\*{3}(.{8})\*{3}(.*)/' $^; echo; diff --git a/riscv-rocket b/riscv-rocket index b2c240f2..b9e6abf3 160000 --- a/riscv-rocket +++ b/riscv-rocket @@ -1 +1 @@ -Subproject commit b2c240f2c7728eb8f9436014e46cc040e25e1551 +Subproject commit b9e6abf3defd2c54a990dfca0417bfc704fefd3d