From 4ed2d614a2546856af346c1120795b42f24640e6 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@eecs.berkeley.edu>
Date: Sun, 4 Nov 2012 16:43:02 -0800
Subject: [PATCH] update to new rocket; retime fpu in dc-syn

---
 Makefrag          | 1 +
 chisel            | 2 +-
 csrc/emulator.cc  | 2 +-
 emulator/Makefile | 4 ++--
 riscv-rocket      | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefrag b/Makefrag
index 2b10368b..43369e71 100644
--- a/Makefrag
+++ b/Makefrag
@@ -494,6 +494,7 @@ global_bmarks = \
 	vvadd.riscv \
 	dgemm.riscv \
 	dhrystone.riscv \
+	spmv.riscv \
 
 global_vec_bmarkdir = $(basedir)/../../riscv-app/misc/build
 global_vec_bmarks = \
diff --git a/chisel b/chisel
index bc4e7688..b8385857 160000
--- a/chisel
+++ b/chisel
@@ -1 +1 @@
-Subproject commit bc4e7688efe1630c50a06aa114a4e827f367a04e
+Subproject commit b838585734ab2eb75186dca25d989bf58c018135
diff --git a/csrc/emulator.cc b/csrc/emulator.cc
index 20a8d049..935e4980 100644
--- a/csrc/emulator.cc
+++ b/csrc/emulator.cc
@@ -156,7 +156,7 @@ int main(int argc, char** argv)
 
       fprintf(logfile, "C: %10lld [%ld] pc=[%011lx] W[r%2ld=%016lx][%ld] R[r%2ld=%016lx] R[r%2ld=%016lx] inst=[%08lx] %-32s\n", \
               (long long)trace_count, tile.Top_Tile_cpu_ctrl__wb_reg_valid.lo_word(), tile.Top_Tile_cpu_dpath__wb_reg_pc.lo_word(), \
-              tile.Top_Tile_cpu_dpath_rfile__io_w0_addr.lo_word(), tile.Top_Tile_cpu_dpath_rfile__io_w0_data.lo_word(), tile.Top_Tile_cpu_dpath_rfile__io_w0_en.lo_word(),
+              tile.Top_Tile_cpu_dpath__rf_waddr.lo_word(), tile.Top_Tile_cpu_dpath__rf_wdata.lo_word(), tile.Top_Tile_cpu_dpath__rf_wen.lo_word(),
               wb_reg_raddr1, wb_reg_rs1, wb_reg_raddr2, wb_reg_rs2, wb_reg_inst, wb_inst_str);
     }
 
diff --git a/emulator/Makefile b/emulator/Makefile
index b8e8caaa..7c013819 100644
--- a/emulator/Makefile
+++ b/emulator/Makefile
@@ -32,7 +32,7 @@ $(addsuffix -debug.o,$(CXXSRCS)): %-debug.o: testbench/%.cc testbench/* generate
 
 DRAMSIM_OBJS := $(patsubst %.cpp,%.o,$(wildcard ../dramsim2/*.cpp))
 $(DRAMSIM_OBJS): %.o: %.cpp
-	$(CXX) $(CXXFLAGS) -DNO_STORAGE -Dmain=nomain -c -o $@ $<
+	$(CXX) $(CXXFLAGS) -DNO_STORAGE -DNO_OUTPUT -Dmain=nomain -c -o $@ $<
 libdramsim.a: $(DRAMSIM_OBJS)
 	ar rcs $@ $^
 
@@ -43,7 +43,7 @@ emulator-debug: $(DEBUG_OBJS) libdramsim.a
 	$(CXX) $(CXXFLAGS) -o $@ $(DEBUG_OBJS) -L. -ldramsim
  
 clean:
-	rm -rf *.o emulator emulator-debug generated-src generated-src-debug DVEfiles output
+	rm -rf *.o *.a emulator emulator-debug generated-src generated-src-debug DVEfiles output
 
 test:
 	cd $(basedir)/sbt && $(SBT) "project referencechip" "~make ../emulator run-fast"
diff --git a/riscv-rocket b/riscv-rocket
index 12da72a5..17301fbf 160000
--- a/riscv-rocket
+++ b/riscv-rocket
@@ -1 +1 @@
-Subproject commit 12da72a5a6fcb9d33d8f3ceaedc8281c4849fd57
+Subproject commit 17301fbfbd10034c61f12663d53599a8de7d00ce