minor update

hw/opae/Makefile

@@ -2,7 +2,7 @@
 ASE_BUILD_DIR=build_ase
 FPGA_BUILD_DIR=build_fpga
 
-all: ase fpga fpga-1c
+all: ase ase-1c fpga fpga-1c
 
 ase: setup-ase
 	make -C $(ASE_BUILD_DIR)
@@ -12,6 +12,14 @@ setup-ase: $(ASE_BUILD_DIR)/Makefile
 $(ASE_BUILD_DIR)/Makefile:
 	afu_sim_setup -s sources.txt $(ASE_BUILD_DIR)
 
+ase-1c: setup-ase-1c
+	make -C $(ASE_BUILD_DIR)_1c
+
+setup-ase-1c: $(ASE_BUILD_DIR)_1c/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
 
@@ -31,6 +39,9 @@ $(FPGA_BUILD_DIR)_1c/build/dcp.qpf:
 run-ase:
 	cd $(ASE_BUILD_DIR) && make sim
 
+run-ase-1c:
+	cd $(ASE_BUILD_DIR)_1c && make sim
+
 wave:
 	vsim -view $(ASE_BUILD_DIR)/work/vsim.wlf -do wave.do
 
@@ -40,5 +51,11 @@ run-fpga:
 clean-ase:
 	rm -rf $(ASE_BUILD_DIR)
 
+clean-ase-1c:
+	rm -rf $(ASE_BUILD_DIR)_1c
+
 clean-fpga:
-	rm -rf $(FPGA_BUILD_DIR)
+	rm -rf $(FPGA_BUILD_DIR)
+
+clean-fpga-1c:
+	rm -rf $(FPGA_BUILD_DIR)_1c

hw/opae/README

@@ -58,8 +58,8 @@ source /export/fpga/bin/setup-fpga-env fpga-pac-a10
 qsub-sim
 
 # tests
-./run_ase.sh ../../driver/tests/basic/basic
-./run_ase.sh ../../driver/tests/demo/demo
+./run_ase.sh build_ase ../../driver/tests/basic/basic
+./run_ase.sh build_ase ../../driver/tests/demo/demo
 
 # modify "vsim_run.tcl" to dump VCD trace
 vcd file vortex.vcd

hw/opae/run_ase.sh

@@ -1,22 +1,25 @@
 #!/bin/bash
 
 SCRIPT_DIR=$PWD
-PROGRAM=$(basename "$1")
-PROGRAM_DIR=`dirname $1`
+
+BUILD_DIR=$1
+
+PROGRAM=$(basename "$2")
+PROGRAM_DIR=`dirname $2`
 
 # Export ASE_WORKDIR variable
-export ASE_WORKDIR=$SCRIPT_DIR/build_ase/work
+export ASE_WORKDIR=$SCRIPT_DIR/$BUILD_DIR/work
 
-shift 1
+shift 2
 
 # cleanup incomplete runs
 rm -f $ASE_WORKDIR/.app_lock.pid 
 rm -f $ASE_WORKDIR/.ase_ready.pid
-rm -f $SCRIPT_DIR/build_ase/nohup.out
+rm -f $SCRIPT_DIR/$BUILD_DIR/nohup.out
 
 # Start Simulator in background
-pushd $SCRIPT_DIR/build_ase 
-echo "  [DBG]  starting ASE simnulator (stdout saved to '$SCRIPT_DIR/build_ase/nohup.out')"
+pushd $SCRIPT_DIR/$BUILD_DIR 
+echo "  [DBG]  starting ASE simnulator (stdout saved to '$SCRIPT_DIR/$BUILD_DIR/nohup.out')"
 nohup make sim & 
 popd
 

hw/opae/sources.txt

@@ -2,7 +2,21 @@ vortex_afu.json
 
 +define+GLOBAL_BLOCK_SIZE=64
 
++define+DCACHE_SIZE=2048
++define+ICACHE_SIZE=1024
++define+SCACHE_SIZE=1024
+
 +define+NUM_CORES=2
++define+NUM_WARPS=4
++define+NUM_THREADS=4
+
++define+DNUM_BANKS=4
++define+INUM_BANKS=2
++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