Moved backends from procs folder to backends folder

csail-csg · Apr 26, 2017 · 0e0f007 · 0e0f007
1 parent f7b91ef
commit 0e0f007
Show file tree

Hide file tree

Showing 36 changed files with 27 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,16 @@
+# compiled toolchains
 /tools/RV*
 
-# generated directories and executables
+# generated directories and files
 verilator
-!/procs/verilator
+!/backends/verilator
+accelerator
+!/accelerator
 build
 out
 /tools/elf2hex/elf2hex
 *.exe
+generatedDesignInterfaceFile.json
 
 # hex files
 *.hex

diff --git a/procs/connectal/Makefile → backends/connectal/Makefile b/procs/connectal/Makefile → backends/connectal/Makefile
@@ -48,25 +48,25 @@ endif
 BSVPATH += \
 	$(RISCY_HOME)/procs/riscy-lib \
 	$(RISCY_HOME)/procs/$(PROC) \
-	$(RISCY_HOME)/procs/connectal/bsv \
+	$(RISCY_HOME)/backends/connectal/bsv \
 	$(RISCY_HOME)/recycle-bsv-lib/src/bsv \
 
 BSVFILES += \
-	$(RISCY_HOME)/procs/connectal/bsv/ProcConnectal.bsv \
 	$(RISCY_HOME)/procs/riscy-lib/ProcPins.bsv \
 	$(RISCY_HOME)/procs/riscy-lib/VerificationPacket.bsv \
+	$(RISCY_HOME)/backends/connectal/bsv/ProcConnectal.bsv \
 	$(RISCY_HOME)/recycle-bsv-lib/src/bsv/PerfMonitorConnectal.bsv \
 
 CPPFILES += \
-	$(RISCY_HOME)/procs/connectal/cpp/testproc.cpp \
-	$(RISCY_HOME)/procs/connectal/cpp/Platform.cpp \
-	$(RISCY_HOME)/procs/connectal/cpp/ProcControl.cpp \
-	$(RISCY_HOME)/procs/connectal/cpp/Verification.cpp \
-	$(RISCY_HOME)/procs/connectal/cpp/ExternalMMIO.cpp \
-	$(RISCY_HOME)/procs/connectal/cpp/SpikeTandemVerifier.cpp \
-	$(RISCY_HOME)/procs/connectal/cpp/PrintTrace.cpp \
-	$(RISCY_HOME)/procs/connectal/cpp/ElfLoader.cpp \
-	$(RISCY_HOME)/procs/connectal/cpp/UartBridge.cpp \
+	$(RISCY_HOME)/backends/connectal/cpp/testproc.cpp \
+	$(RISCY_HOME)/backends/connectal/cpp/Platform.cpp \
+	$(RISCY_HOME)/backends/connectal/cpp/ProcControl.cpp \
+	$(RISCY_HOME)/backends/connectal/cpp/Verification.cpp \
+	$(RISCY_HOME)/backends/connectal/cpp/ExternalMMIO.cpp \
+	$(RISCY_HOME)/backends/connectal/cpp/SpikeTandemVerifier.cpp \
+	$(RISCY_HOME)/backends/connectal/cpp/PrintTrace.cpp \
+	$(RISCY_HOME)/backends/connectal/cpp/ElfLoader.cpp \
+	$(RISCY_HOME)/backends/connectal/cpp/UartBridge.cpp \
 	$(RISCY_HOME)/recycle-bsv-lib/src/cpp/PerfMonitor.cpp \
 	$(CONNECTALDIR)/cpp/DmaBuffer.cpp \
 
@@ -93,7 +93,7 @@ MEM_WRITE_INTERFACES = \
 
 NUMBER_OF_MASTERS = 1
 
-PINOUT_FILE += $(RISCY_HOME)/procs/connectal/pin_translation.json
+PINOUT_FILE += $(RISCY_HOME)/backends/connectal/pin_translation.json
 PIN_TYPE = ProcPins
 PIN_TYPE_INCLUDE = ProcPins
 AUTOTOP = --interface pins:ProcConnectal.pins

diff --git a/procs/connectal/bsv/ProcConnectal.bsv → backends/connectal/bsv/ProcConnectal.bsv b/procs/connectal/bsv/ProcConnectal.bsv → backends/connectal/bsv/ProcConnectal.bsv
diff --git a/procs/connectal/bsv/SharedMemoryBridge.bsv → ...ends/connectal/bsv/SharedMemoryBridge.bsv b/procs/connectal/bsv/SharedMemoryBridge.bsv → ...ends/connectal/bsv/SharedMemoryBridge.bsv
diff --git a/procs/connectal/bsv/UncachedBridge.bsv → backends/connectal/bsv/UncachedBridge.bsv b/procs/connectal/bsv/UncachedBridge.bsv → backends/connectal/bsv/UncachedBridge.bsv
diff --git a/procs/connectal/cpp/CircularBuffer.hpp → backends/connectal/cpp/CircularBuffer.hpp b/procs/connectal/cpp/CircularBuffer.hpp → backends/connectal/cpp/CircularBuffer.hpp
diff --git a/procs/connectal/cpp/DeviceTree.cpp → backends/connectal/cpp/DeviceTree.cpp b/procs/connectal/cpp/DeviceTree.cpp → backends/connectal/cpp/DeviceTree.cpp
diff --git a/procs/connectal/cpp/DeviceTree.hpp → backends/connectal/cpp/DeviceTree.hpp b/procs/connectal/cpp/DeviceTree.hpp → backends/connectal/cpp/DeviceTree.hpp
diff --git a/procs/connectal/cpp/Devices.hpp → backends/connectal/cpp/Devices.hpp b/procs/connectal/cpp/Devices.hpp → backends/connectal/cpp/Devices.hpp
diff --git a/procs/connectal/cpp/ElfLoader.cpp → backends/connectal/cpp/ElfLoader.cpp b/procs/connectal/cpp/ElfLoader.cpp → backends/connectal/cpp/ElfLoader.cpp
diff --git a/procs/connectal/cpp/ExternalMMIO.cpp → backends/connectal/cpp/ExternalMMIO.cpp b/procs/connectal/cpp/ExternalMMIO.cpp → backends/connectal/cpp/ExternalMMIO.cpp
diff --git a/procs/connectal/cpp/ExternalMMIO.hpp → backends/connectal/cpp/ExternalMMIO.hpp b/procs/connectal/cpp/ExternalMMIO.hpp → backends/connectal/cpp/ExternalMMIO.hpp
diff --git a/procs/connectal/cpp/HostInterface.cpp → backends/connectal/cpp/HostInterface.cpp b/procs/connectal/cpp/HostInterface.cpp → backends/connectal/cpp/HostInterface.cpp
diff --git a/procs/connectal/cpp/HostInterface.hpp → backends/connectal/cpp/HostInterface.hpp b/procs/connectal/cpp/HostInterface.hpp → backends/connectal/cpp/HostInterface.hpp
diff --git a/procs/connectal/cpp/NullTandemVerifier.hpp → ...ends/connectal/cpp/NullTandemVerifier.hpp b/procs/connectal/cpp/NullTandemVerifier.hpp → ...ends/connectal/cpp/NullTandemVerifier.hpp
diff --git a/procs/connectal/cpp/Platform.cpp → backends/connectal/cpp/Platform.cpp b/procs/connectal/cpp/Platform.cpp → backends/connectal/cpp/Platform.cpp
diff --git a/procs/connectal/cpp/Platform.hpp → backends/connectal/cpp/Platform.hpp b/procs/connectal/cpp/Platform.hpp → backends/connectal/cpp/Platform.hpp
diff --git a/procs/connectal/cpp/PrintTrace.cpp → backends/connectal/cpp/PrintTrace.cpp b/procs/connectal/cpp/PrintTrace.cpp → backends/connectal/cpp/PrintTrace.cpp
diff --git a/procs/connectal/cpp/PrintTrace.hpp → backends/connectal/cpp/PrintTrace.hpp b/procs/connectal/cpp/PrintTrace.hpp → backends/connectal/cpp/PrintTrace.hpp
diff --git a/procs/connectal/cpp/ProcControl.cpp → backends/connectal/cpp/ProcControl.cpp b/procs/connectal/cpp/ProcControl.cpp → backends/connectal/cpp/ProcControl.cpp
diff --git a/procs/connectal/cpp/ProcControl.hpp → backends/connectal/cpp/ProcControl.hpp b/procs/connectal/cpp/ProcControl.hpp → backends/connectal/cpp/ProcControl.hpp
diff --git a/procs/connectal/cpp/SpikeTandemVerifier.cpp → ...nds/connectal/cpp/SpikeTandemVerifier.cpp b/procs/connectal/cpp/SpikeTandemVerifier.cpp → ...nds/connectal/cpp/SpikeTandemVerifier.cpp
diff --git a/procs/connectal/cpp/SpikeTandemVerifier.hpp → ...nds/connectal/cpp/SpikeTandemVerifier.hpp b/procs/connectal/cpp/SpikeTandemVerifier.hpp → ...nds/connectal/cpp/SpikeTandemVerifier.hpp
diff --git a/procs/connectal/cpp/TandemVerifier.hpp → backends/connectal/cpp/TandemVerifier.hpp b/procs/connectal/cpp/TandemVerifier.hpp → backends/connectal/cpp/TandemVerifier.hpp
diff --git a/procs/connectal/cpp/UartBridge.cpp → backends/connectal/cpp/UartBridge.cpp b/procs/connectal/cpp/UartBridge.cpp → backends/connectal/cpp/UartBridge.cpp
diff --git a/procs/connectal/cpp/UartBridge.hpp → backends/connectal/cpp/UartBridge.hpp b/procs/connectal/cpp/UartBridge.hpp → backends/connectal/cpp/UartBridge.hpp
diff --git a/procs/connectal/cpp/Verification.cpp → backends/connectal/cpp/Verification.cpp b/procs/connectal/cpp/Verification.cpp → backends/connectal/cpp/Verification.cpp
diff --git a/procs/connectal/cpp/Verification.hpp → backends/connectal/cpp/Verification.hpp b/procs/connectal/cpp/Verification.hpp → backends/connectal/cpp/Verification.hpp
diff --git a/procs/connectal/cpp/testproc.cpp → backends/connectal/cpp/testproc.cpp b/procs/connectal/cpp/testproc.cpp → backends/connectal/cpp/testproc.cpp
diff --git a/procs/connectal/pin_translation.json → backends/connectal/pin_translation.json b/procs/connectal/pin_translation.json → backends/connectal/pin_translation.json
diff --git a/procs/verilator/Makefile → backends/verilator/Makefile b/procs/verilator/Makefile → backends/verilator/Makefile
@@ -33,7 +33,7 @@ endif
 VERILATOR_EXE=$(PROC).exe
 
 TOP_MODULE=mkProcVerilator
-TOP_BSV_FILE=$(RISCY_HOME)/procs/verilator/bsv/ProcVerilator.bsv
+TOP_BSV_FILE=$(RISCY_HOME)/backends/verilator/bsv/ProcVerilator.bsv
 
 # Build Directories
 BUILD_DIR=build
@@ -43,14 +43,14 @@ VERILATOR_DIR=$(BUILD_DIR)/verilator
 
 
 
-BSV_PATH = $(RISCY_HOME)/procs/riscy-lib:$(RISCY_HOME)/procs/$(PROC):$(RISCY_HOME)/procs/verilator/bsv:$(RISCY_HOME)/recycle-bsv-lib/src/bsv:+
+BSV_PATH = $(RISCY_HOME)/procs/riscy-lib:$(RISCY_HOME)/procs/$(PROC):$(RISCY_HOME)/backends/verilator/bsv:$(RISCY_HOME)/recycle-bsv-lib/src/bsv:+
 BSC_DEFINES += -D CONFIG_IDMEM_INIT_HEX_FILE=\"idmem.hex\"
 BSC_DEFINES += -D CONFIG_RAM_INIT_HEX_FILE=\"ram.hex\"
 BSC_FLAGS = -aggressive-conditions -keep-fires $(BSC_DEFINES) -p $(BSV_PATH) -bdir $(BSC_DIR) -fdir $(BSC_DIR) -info-dir $(BSC_DIR) -simdir $(BSC_DIR) -vdir $(VERILOG_DIR)
 
 VERILOG_PATH = -y $(BLUESPECDIR)/Verilog -y $(VERILOG_DIR)
 VERILATOR_FLAGS = -Mdir $(VERILATOR_DIR) -CFLAGS -O2 $(VERILOG_PATH) -Wno-fatal --trace
-VERILATOR_CPP = $(RISCY_HOME)/procs/verilator/cpp/verilator_top.cpp
+VERILATOR_CPP = $(RISCY_HOME)/backends/verilator/cpp/verilator_top.cpp
 
 .PHONY: verilator verilog clean
 

diff --git a/procs/verilator/bsv/ProcVerilator.bsv → backends/verilator/bsv/ProcVerilator.bsv b/procs/verilator/bsv/ProcVerilator.bsv → backends/verilator/bsv/ProcVerilator.bsv
diff --git a/procs/verilator/bsv/SimRam.bsv → backends/verilator/bsv/SimRam.bsv b/procs/verilator/bsv/SimRam.bsv → backends/verilator/bsv/SimRam.bsv
diff --git a/procs/verilator/cpp/verilator_top.cpp → backends/verilator/cpp/verilator_top.cpp b/procs/verilator/cpp/verilator_top.cpp → backends/verilator/cpp/verilator_top.cpp
diff --git a/procs/RV32IM_3stage/Makefile b/procs/RV32IM_3stage/Makefile
@@ -52,12 +52,12 @@ CONNECTALFLAGS += -D CONFIG_SPI
 
 ifdef RISCY_HOME
 ifeq ($(MAKECMDGOALS),verilator)
-include $(RISCY_HOME)/procs/verilator/Makefile
+include $(RISCY_HOME)/backends/verilator/Makefile
 else ifeq ($(MAKECMDGOALS),verilog)
-include $(RISCY_HOME)/procs/verilator/Makefile
+include $(RISCY_HOME)/backends/verilator/Makefile
 else
 # connectal backend
-include $(RISCY_HOME)/procs/connectal/Makefile
+include $(RISCY_HOME)/backends/connectal/Makefile
 endif
 else
 $(error RISCY_HOME is undefined)

diff --git a/procs/RV64G_multicycle/Makefile b/procs/RV64G_multicycle/Makefile
@@ -42,12 +42,12 @@ CONNECTALFLAGS += -D CONFIG_D
 
 ifdef RISCY_HOME
 ifeq ($(MAKECMDGOALS),verilator)
-include $(RISCY_HOME)/procs/verilator/Makefile
+include $(RISCY_HOME)/backends/verilator/Makefile
 else ifeq ($(MAKECMDGOALS),verilog)
-include $(RISCY_HOME)/procs/verilator/Makefile
+include $(RISCY_HOME)/backends/verilator/Makefile
 else
 # connectal backend
-include $(RISCY_HOME)/procs/connectal/Makefile
+include $(RISCY_HOME)/backends/connectal/Makefile
 endif
 else
 $(error RISCY_HOME is undefined)