From de2e118cc2f55c78ded5590b53e4d511d3cf5d2f Mon Sep 17 00:00:00 2001 From: Blaise Tine Date: Mon, 25 Jan 2021 02:32:49 -0800 Subject: [PATCH] move opae to /hw/syn/ --- hw/{ => syn}/opae/.gitignore | 0 hw/{ => syn}/opae/Makefile | 2 +- hw/{ => syn}/opae/README | 8 ++++---- hw/{ => syn}/opae/gen_sources.sh | 2 +- hw/{ => syn}/opae/run_ase.sh | 4 ++-- hw/{ => syn}/opae/sources_16c.txt | 0 hw/{ => syn}/opae/sources_1c.txt | 0 hw/{ => syn}/opae/sources_2c.txt | 0 hw/{ => syn}/opae/sources_32c.txt | 0 hw/{ => syn}/opae/sources_4c.txt | 0 hw/{ => syn}/opae/sources_64c.txt | 0 hw/{ => syn}/opae/sources_8c.txt | 0 hw/{ => syn}/opae/vortex_afu.json | 0 hw/{ => syn}/opae/vortex_afu.qsf | 0 14 files changed, 8 insertions(+), 8 deletions(-) rename hw/{ => syn}/opae/.gitignore (100%) rename hw/{ => syn}/opae/Makefile (99%) rename hw/{ => syn}/opae/README (93%) rename hw/{ => syn}/opae/gen_sources.sh (97%) rename hw/{ => syn}/opae/run_ase.sh (88%) rename hw/{ => syn}/opae/sources_16c.txt (100%) rename hw/{ => syn}/opae/sources_1c.txt (100%) rename hw/{ => syn}/opae/sources_2c.txt (100%) rename hw/{ => syn}/opae/sources_32c.txt (100%) rename hw/{ => syn}/opae/sources_4c.txt (100%) rename hw/{ => syn}/opae/sources_64c.txt (100%) rename hw/{ => syn}/opae/sources_8c.txt (100%) rename hw/{ => syn}/opae/vortex_afu.json (100%) rename hw/{ => syn}/opae/vortex_afu.qsf (100%) diff --git a/hw/opae/.gitignore b/hw/syn/opae/.gitignore similarity index 100% rename from hw/opae/.gitignore rename to hw/syn/opae/.gitignore diff --git a/hw/opae/Makefile b/hw/syn/opae/Makefile similarity index 99% rename from hw/opae/Makefile rename to hw/syn/opae/Makefile index e92628f3..097bcc97 100644 --- a/hw/opae/Makefile +++ b/hw/syn/opae/Makefile @@ -1,6 +1,6 @@ ASE_BUILD_DIR=build_ase FPGA_BUILD_DIR=build_fpga -RTL_DIR=../rtl +RTL_DIR=../../rtl ifeq (, $(shell which qsub-synth)) RUN_SYNTH=$(OPAE_PLATFORM_ROOT)/bin/run.sh > build.log 2>&1 & diff --git a/hw/opae/README b/hw/syn/opae/README similarity index 93% rename from hw/opae/README rename to hw/syn/opae/README index 09565f70..7208c785 100644 --- a/hw/opae/README +++ b/hw/syn/opae/README @@ -60,10 +60,10 @@ qsub-sim make ase # tests -./run_ase.sh build_ase_1c ../../driver/tests/basic/basic -n16 -./run_ase.sh build_ase_1c ../../driver/tests/demo/demo -n16 -./run_ase.sh build_ase_1c ../../driver/tests/dogfood/dogfood -n16 -./run_ase.sh build_ase_1c ../../benchmarks/opencl/vecadd/vecadd +./run_ase.sh build_ase_1c ../../../driver/tests/basic/basic -n16 +./run_ase.sh build_ase_1c ../../../driver/tests/demo/demo -n16 +./run_ase.sh build_ase_1c ../../../driver/tests/dogfood/dogfood -n16 +./run_ase.sh build_ase_1c ../../../benchmarks/opencl/vecadd/vecadd # modify "vsim_run.tcl" to dump VCD trace vcd file trace.vcd diff --git a/hw/opae/gen_sources.sh b/hw/syn/opae/gen_sources.sh similarity index 97% rename from hw/opae/gen_sources.sh rename to hw/syn/opae/gen_sources.sh index 04edf220..02c1a06b 100755 --- a/hw/opae/gen_sources.sh +++ b/hw/syn/opae/gen_sources.sh @@ -1,6 +1,6 @@ #!/bin/bash -rtl_dir="../rtl" +rtl_dir="../../rtl" exclude_list="VX_fpu_fpnew.v" file_list="" diff --git a/hw/opae/run_ase.sh b/hw/syn/opae/run_ase.sh similarity index 88% rename from hw/opae/run_ase.sh rename to hw/syn/opae/run_ase.sh index 866e1490..fcdd3172 100755 --- a/hw/opae/run_ase.sh +++ b/hw/syn/opae/run_ase.sh @@ -7,8 +7,8 @@ BUILD_DIR=$1 PROGRAM=$(basename "$2") PROGRAM_DIR=`dirname $2` -POCL_RT_PATH=$SCRIPT_DIR/../../benchmarks/opencl/runtime/lib -VORTEX_DRV_PATH=$SCRIPT_DIR/../../driver/opae/ase +POCL_RT_PATH=$SCRIPT_DIR/../../../benchmarks/opencl/runtime/lib +VORTEX_DRV_PATH=$SCRIPT_DIR/../../../driver/opae/ase # Export ASE_WORKDIR variable export ASE_WORKDIR=$SCRIPT_DIR/$BUILD_DIR/work diff --git a/hw/opae/sources_16c.txt b/hw/syn/opae/sources_16c.txt similarity index 100% rename from hw/opae/sources_16c.txt rename to hw/syn/opae/sources_16c.txt diff --git a/hw/opae/sources_1c.txt b/hw/syn/opae/sources_1c.txt similarity index 100% rename from hw/opae/sources_1c.txt rename to hw/syn/opae/sources_1c.txt diff --git a/hw/opae/sources_2c.txt b/hw/syn/opae/sources_2c.txt similarity index 100% rename from hw/opae/sources_2c.txt rename to hw/syn/opae/sources_2c.txt diff --git a/hw/opae/sources_32c.txt b/hw/syn/opae/sources_32c.txt similarity index 100% rename from hw/opae/sources_32c.txt rename to hw/syn/opae/sources_32c.txt diff --git a/hw/opae/sources_4c.txt b/hw/syn/opae/sources_4c.txt similarity index 100% rename from hw/opae/sources_4c.txt rename to hw/syn/opae/sources_4c.txt diff --git a/hw/opae/sources_64c.txt b/hw/syn/opae/sources_64c.txt similarity index 100% rename from hw/opae/sources_64c.txt rename to hw/syn/opae/sources_64c.txt diff --git a/hw/opae/sources_8c.txt b/hw/syn/opae/sources_8c.txt similarity index 100% rename from hw/opae/sources_8c.txt rename to hw/syn/opae/sources_8c.txt diff --git a/hw/opae/vortex_afu.json b/hw/syn/opae/vortex_afu.json similarity index 100% rename from hw/opae/vortex_afu.json rename to hw/syn/opae/vortex_afu.json diff --git a/hw/opae/vortex_afu.qsf b/hw/syn/opae/vortex_afu.qsf similarity index 100% rename from hw/opae/vortex_afu.qsf rename to hw/syn/opae/vortex_afu.qsf