Merge pull request #1 from beebdev/v2.0

Changes include:
-Replaced AXI-lite interface implementation
-Using AXIS-FIFO and FIFO-AXIS adapters to transfer data to and from FIFO
-Added Python testbench (cocotb) to verify behaviour of system
-Added driver repo as submodule

Author: beebdev

.gitignore

@@ -2,4 +2,4 @@ __pycache__
 results.xml
 sim_build
 venv
-
+*dbg*

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ip_driver"]
+	path = ip_driver
+	url = git@github.com:beebdev/sw__haru.git

Makefile

@@ -4,22 +4,40 @@
 SIM ?= icarus
 TOPLEVEL_LANG ?= verilog
 
+ifneq ($(TOPLEVEL_LANG),verilog)
+all:
+	@echo "Skipping; DTW accel does not support VHDL at the top-level"
+clean::
+
+else
+
+ifeq ($(SIM),icarus)
+COMPILE_ARGS+=-I$(PWD)/src/
+else
+COMPILE_ARGS+=+incdir+$(PWD)/src/
+endif
+
+#DUT
 VERILOG_SOURCES += $(PWD)/src/dtw_accel.v \
-				  $(PWD)/src/dtw_accel_M00_AXIS.v \
-				  $(PWD)/src/dtw_accel_S00_AXIS.v \
-				  $(PWD)/src/dtw_accel_S00_AXI.v \
-				  $(PWD)/src/dtw_core.v \
-				  $(PWD)/src/dtw_core_ref_mem.v \
-				  $(PWD)/src/dtw_core_datapath.v \
-				  $(PWD)/src/dtw_core_pe.v \
+				   $(PWD)/src/axi_lite_slave.v \
+				   $(PWD)/src/axis_2_fifo.v \
+				   $(PWD)/src/fifo.v \
+				   $(PWD)/src/fifo_2_axis.v \
+				   $(PWD)/src/dtw_core.v \
+				   $(PWD)/src/dtw_core_datapath.v \
+				   $(PWD)/src/dtw_core_ref_mem.v \
+				   $(PWD)/src/dtw_core_pe.v \
 
-# use VHDL_SOURCES for VHDL files
+#Test Bench
+VERILOG_SOURCES += $(PWD)/src/sim/tb_dtw_accel.v
 
-# TOPLEVEL is the name of the toplevel module in your Verilog or VHDL file
-TOPLEVEL = dtw_accel
+TOPLEVEL = tb_dtw_accel
+GPI_IMPL := vpi
 
-# MODULE is the basename of the Python test file
 MODULE = test_dut
 
-# include cocotb's make rules to take care of the simulator setup
 include $(shell cocotb-config --makefiles)/Makefile.sim
+
+# TODO: Add waveform generation
+
+endif

README.md

@@ -15,11 +15,23 @@ pip3 install cocotb
 pip3 install cocotbext-axi
 ```
 
-For icarus verilog, on mac:
+For icarus verilog:
 ```
+# ubuntu
+sudo apt install iverilog
+# mac
 brew install icarus-verilog
 ```
 
+Installing gtkwave:
+```
+# ubuntu
+sudo apt-get install gtkwave
+
+# mac
+brew install --cask gtkwave
+``` 
+
 # Running tests
 ```
 source venv/bin/activate