OPAE rtl fixes

hw/opae/Makefile

@@ -1,61 +1,56 @@
-
 ASE_BUILD_DIR=build_ase
+
 FPGA_BUILD_DIR=build_fpga
 
-all: ase
-
-ase: setup-ase
-	make -C $(ASE_BUILD_DIR)
-
-setup-ase: $(ASE_BUILD_DIR)/Makefile
-
-$(ASE_BUILD_DIR)/Makefile:
-	afu_sim_setup -s sources.txt $(ASE_BUILD_DIR)
+all: ase-2c
 
 ase-1c: setup-ase-1c
 	make -C $(ASE_BUILD_DIR)_1c
 
+ase-2c: setup-ase-2c
+	make -C $(ASE_BUILD_DIR)_2c
+
 setup-ase-1c: $(ASE_BUILD_DIR)_1c/Makefile
 
+setup-ase-2c: $(ASE_BUILD_DIR)_2c/Makefile
+
 $(ASE_BUILD_DIR)_1c/Makefile:
 	afu_sim_setup -s sources_1c.txt $(ASE_BUILD_DIR)_1c
 
-fpga: setup-fpga
-	cd $(FPGA_BUILD_DIR) && qsub-synth
-
-setup-fpga: $(FPGA_BUILD_DIR)/build/dcp.qpf
-
-$(FPGA_BUILD_DIR)/build/dcp.qpf:
-	afu_synth_setup -s sources.txt $(FPGA_BUILD_DIR)
+$(ASE_BUILD_DIR)_2c/Makefile:
+	afu_sim_setup -s sources_2c.txt $(ASE_BUILD_DIR)_2c
 
 fpga-1c: setup-fpga-1c
 	cd $(FPGA_BUILD_DIR)_1c && qsub-synth
+
+fpga-2c: setup-fpga-2c
+	cd $(FPGA_BUILD_DIR)_2c && qsub-synth
 	
 setup-fpga-1c: $(FPGA_BUILD_DIR)_1c/build/dcp.qpf
 
+setup-fpga-2c: $(FPGA_BUILD_DIR)_2c/build/dcp.qpf
+
 $(FPGA_BUILD_DIR)_1c/build/dcp.qpf:
 	afu_synth_setup -s sources_1c.txt $(FPGA_BUILD_DIR)_1c
 
-run-ase:
-	cd $(ASE_BUILD_DIR) && make sim
+$(FPGA_BUILD_DIR)_2c/build/dcp.qpf:
+	afu_synth_setup -s sources_2c.txt $(FPGA_BUILD_DIR)_2c
 
 run-ase-1c:
 	cd $(ASE_BUILD_DIR)_1c && make sim
 
-wave:
-	vsim -view $(ASE_BUILD_DIR)/work/vsim.wlf -do wave.do
-
-run-fpga:
-	# TODO
-
-clean-ase:
-	rm -rf $(ASE_BUILD_DIR)
+run-ase-2c:
+	cd $(ASE_BUILD_DIR)_2c && make sim
 
 clean-ase-1c:
 	rm -rf $(ASE_BUILD_DIR)_1c
 
-clean-fpga:
-	rm -rf $(FPGA_BUILD_DIR)
+clean-ase-2c:
+	rm -rf $(ASE_BUILD_DIR)_2c
 
 clean-fpga-1c:
-	rm -rf $(FPGA_BUILD_DIR)_1c
+	rm -rf $(FPGA_BUILD_DIR)_1c
+	
+clean-fpga-2c:
+	rm -rf $(FPGA_BUILD_DIR)_2c
+

hw/opae/README

@@ -82,4 +82,4 @@ ps -u tinebp
 kill -9 <pid>
 
 # fixing device resource busy issue when deleting /build_ase/
--
+lsof +D build_ase

hw/opae/sources.txt

@@ -1,22 +1,5 @@
 vortex_afu.json
 
-+define+DCACHE_SIZE=4096
-+define+ICACHE_SIZE=2048
-+define+SCACHE_SIZE=1024
-
-+define+NUM_CORES=2
-+define+NUM_WARPS=4
-+define+NUM_THREADS=4
-+define+L2_ENABLE=1
-
-+define+DNUM_BANKS=4
-+define+INUM_BANKS=1
-+define+SNUM_BANKS=4
-
-+define+DDFPQ_SIZE=16
-+define+IDFPQ_SIZE=16
-+define+SDFPQ_SIZE=0
-
 #+define+DBG_PRINT_CORE_ICACHE
 #+define+DBG_PRINT_CORE_DCACHE
 #+define+DBG_PRINT_CACHE_BANK