From bec1caeb562ff4080987061c132097af698a9f69 Mon Sep 17 00:00:00 2001 From: SDA USR <1391+sdausr@users.noreply.gitenterprise.xilinx.com> Date: Wed, 29 Mar 2023 17:04:20 +0800 Subject: [PATCH] Squashed 'hpc' changes from 44f5cf2..dec5326 (#815) dec5326 Merge pull request #168 from liyuanz/add_mf bd25480 update aafb464 Merge pull request #167 from RepoOps/rep_8 4cf3aa1 Merge pull request #166 from changg/test_wa 01eb223 update mem ef681d1 Merge pull request #165 from changg/test_wa f84b72e test wa c2736ba Replace DEVICE with PLATFORM 7569ecd Merge pull request #163 from liyuanz/add_freq 66d3b32 add mem Co-authored-by: sdausr --- hpc/L1/tests/hw/cgSolver/test_gemv/Makefile | 36 +++++++++++------- hpc/L1/tests/hw/cgSolver/update_pk/Makefile | 36 +++++++++++------- .../hw/cgSolver/update_rk_jacobi/Makefile | 36 +++++++++++------- .../tests/data_h128_w128_t10_pe2/Makefile | 36 +++++++++++------- .../tests/data_h128_w128_t15_pe2/Makefile | 36 +++++++++++------- .../tests/data_h128_w128_t10_pe2/Makefile | 36 +++++++++++------- .../tests/data_h128_w128_t15_pe4/Makefile | 36 +++++++++++------- .../tests/data_h128_w128_t2_pe2/Makefile | 36 +++++++++++------- .../tests/hw/rtm3d/forward_hbc/tests/Makefile | 38 +++++++++++-------- .../tests/RTM_x36_y60_z40_t4_p2/Makefile | 36 +++++++++++------- .../tests/RTM_x50_y60_z80_t4_p2/Makefile | 36 +++++++++++------- .../tests/RTM_x50_y60_z80_t9_p2/Makefile | 36 +++++++++++------- .../tests/RTM_x28_y25_z20_t1_p2/Makefile | 36 +++++++++++------- .../tests/RTM_x28_y36_z20_t_p2/Makefile | 36 +++++++++++------- hpc/L2/benchmarks/cg_gemv_jacobi/Readme.md | 8 ++-- hpc/L2/benchmarks/cg_spmv_jacobi/Readme.md | 6 +-- hpc/L2/tests/Readme.md | 2 +- hpc/L2/tests/mlp/fcn_1CU/description.json | 2 +- .../tests/dataset_h128_w128_t10_s1/Makefile | 18 ++++----- .../dataset_h128_w128_t10_s1/description.json | 4 +- .../dataset_h128_w128_t10/description.json | 2 +- .../tests/dataset_z90_y60_x80_t4/Makefile | 8 ++-- hpc/README.md | 6 +-- hpc/docs/src/user_guide/L1/L1_test.rst | 6 +-- .../L2/benchmark/cg_gemv_jacobi.rst | 8 ++-- .../L2/benchmark/cg_spmv_jacobi.rst | 6 +-- 26 files changed, 347 insertions(+), 235 deletions(-) diff --git a/hpc/L1/tests/hw/cgSolver/test_gemv/Makefile b/hpc/L1/tests/hw/cgSolver/test_gemv/Makefile index 2295cdbc50..b11abb70f4 100644 --- a/hpc/L1/tests/hw/cgSolver/test_gemv/Makefile +++ b/hpc/L1/tests/hw/cgSolver/test_gemv/Makefile @@ -26,13 +26,13 @@ help:: @echo "" @echo "Makefile Usage:" @echo "" - @echo " make run CSIM=1 CSYNTH=1 COSIM=1 DEVICE= PLATFORM_REPO_PATHS=" + @echo " make run CSIM=1 CSYNTH=1 COSIM=1 PLATFORM= PLATFORM_REPO_PATHS=" @echo " Command to run the selected tasks for specified device." @echo "" @echo " Valid tasks are CSIM, CSYNTH, COSIM, VIVADO_SYN, VIVADO_IMPL" @echo "" - @echo " DEVICE is case-insensitive and support awk regex." - @echo " For example, \`make run DEVICE='u200.*xdma' COSIM=1\`" + @echo " PLATFORM is case-insensitive and support awk regex." + @echo " For example, \`make run PLATFORM='u200.*xdma' COSIM=1\`" @echo " It can also be an absolute path to platform file." @echo "" @echo " PLATFORM_REPO_PATHS variable is used to specify the paths in which the platform files will be" @@ -41,7 +41,7 @@ help:: @echo " make run CSIM=1 CSYNTH=1 COSIM=1 XPART=" @echo " Alternatively, the FPGA part can be speficied via XPART." @echo " For example, \`make run XPART='xcu200-fsgd2104-2-e' COSIM=1\`" - @echo " When XPART is set, DEVICE will be ignored." + @echo " When XPART is set, PLATFORM will be ignored." @echo "" @echo " make clean " @echo " Command to remove the generated files." @@ -79,6 +79,7 @@ ifeq (,$(wildcard $(XILINX_XRT)/lib/libxilinxopencl.so)) @echo "Cannot locate XRT installation. Please set XILINX_XRT variable." && false endif + export PATH := $(XILINX_VITIS)/bin:$(XILINX_XRT)/bin:$(PATH) ifeq (,$(LD_LIBRARY_PATH)) @@ -97,12 +98,12 @@ endif ifeq (,$(XPART)) # MK_INC_BEGIN vitis_set_platform.mk -ifneq (,$(wildcard $(DEVICE))) -# Use DEVICE as a file path -XPLATFORM := $(DEVICE) +ifneq (,$(wildcard $(PLATFORM))) +# Use PLATFORM as a file path +XPLATFORM := $(PLATFORM) else -# Use DEVICE as a file name pattern -DEVICE_L := $(shell echo $(DEVICE) | tr A-Z a-z) +# Use PLATFORM as a file name pattern +DEVICE_L := $(shell echo $(PLATFORM) | tr A-Z a-z) # 1. search paths specified by variable ifneq (,$(PLATFORM_REPO_PATHS)) # 1.1 as exact name @@ -136,15 +137,15 @@ endif # 3 endif define MSG_PLATFORM -No platform matched pattern '$(DEVICE)'. +No platform matched pattern '$(PLATFORM)'. Available platforms are: $(XPLATFORMS) -To add more platform directories, set the PLATFORM_REPO_PATHS variable or point DEVICE variable to the full path of platform .xpfm file. +To add more platform directories, set the PLATFORM_REPO_PATHS variable or point PLATFORM variable to the full path of platform .xpfm file. endef export MSG_PLATFORM define MSG_DEVICE More than one platform matched: $(XPLATFORM) -Please set DEVICE variable more accurately to select only one platform file, or set DEVICE variable to the full path of the platform .xpfm file. +Please set PLATFORM variable more accurately to select only one platform file, or set PLATFORM variable to the full path of the platform .xpfm file. endef export MSG_DEVICE @@ -178,6 +179,13 @@ endif # XPART # MK_INC_END vitis_set_part.mk # MK_INC_BEGIN hls_test_rules.mk +# + +gen_instances: $(INSTANCE_FILES) + @echo "Nothing to generate." + +valid_params: + @echo "Nothing to validate." .PHONY: run setup runhls clean cleanall check @@ -216,7 +224,7 @@ endif data: @true -run: data setup runhls +run: gen_instances data setup runhls setup: | check_part @rm -f ./settings.tcl @@ -239,7 +247,7 @@ runhls: data setup | check_vivado check_vpp $(HLS) -f run_hls.tcl; clean: - rm -rf settings.tcl *_hls.log cg_test_gemv_test.prj + rm -rf settings.tcl *_hls.log cg_test_gemv_test.prj $(INSTANCE_FILES) # Used by Jenkins test cleanall: clean diff --git a/hpc/L1/tests/hw/cgSolver/update_pk/Makefile b/hpc/L1/tests/hw/cgSolver/update_pk/Makefile index 8e8082842d..b1988ed8e8 100644 --- a/hpc/L1/tests/hw/cgSolver/update_pk/Makefile +++ b/hpc/L1/tests/hw/cgSolver/update_pk/Makefile @@ -26,13 +26,13 @@ help:: @echo "" @echo "Makefile Usage:" @echo "" - @echo " make run CSIM=1 CSYNTH=1 COSIM=1 DEVICE= PLATFORM_REPO_PATHS=" + @echo " make run CSIM=1 CSYNTH=1 COSIM=1 PLATFORM= PLATFORM_REPO_PATHS=" @echo " Command to run the selected tasks for specified device." @echo "" @echo " Valid tasks are CSIM, CSYNTH, COSIM, VIVADO_SYN, VIVADO_IMPL" @echo "" - @echo " DEVICE is case-insensitive and support awk regex." - @echo " For example, \`make run DEVICE='u200.*xdma' COSIM=1\`" + @echo " PLATFORM is case-insensitive and support awk regex." + @echo " For example, \`make run PLATFORM='u200.*xdma' COSIM=1\`" @echo " It can also be an absolute path to platform file." @echo "" @echo " PLATFORM_REPO_PATHS variable is used to specify the paths in which the platform files will be" @@ -41,7 +41,7 @@ help:: @echo " make run CSIM=1 CSYNTH=1 COSIM=1 XPART=" @echo " Alternatively, the FPGA part can be speficied via XPART." @echo " For example, \`make run XPART='xcu200-fsgd2104-2-e' COSIM=1\`" - @echo " When XPART is set, DEVICE will be ignored." + @echo " When XPART is set, PLATFORM will be ignored." @echo "" @echo " make clean " @echo " Command to remove the generated files." @@ -79,6 +79,7 @@ ifeq (,$(wildcard $(XILINX_XRT)/lib/libxilinxopencl.so)) @echo "Cannot locate XRT installation. Please set XILINX_XRT variable." && false endif + export PATH := $(XILINX_VITIS)/bin:$(XILINX_XRT)/bin:$(PATH) ifeq (,$(LD_LIBRARY_PATH)) @@ -97,12 +98,12 @@ endif ifeq (,$(XPART)) # MK_INC_BEGIN vitis_set_platform.mk -ifneq (,$(wildcard $(DEVICE))) -# Use DEVICE as a file path -XPLATFORM := $(DEVICE) +ifneq (,$(wildcard $(PLATFORM))) +# Use PLATFORM as a file path +XPLATFORM := $(PLATFORM) else -# Use DEVICE as a file name pattern -DEVICE_L := $(shell echo $(DEVICE) | tr A-Z a-z) +# Use PLATFORM as a file name pattern +DEVICE_L := $(shell echo $(PLATFORM) | tr A-Z a-z) # 1. search paths specified by variable ifneq (,$(PLATFORM_REPO_PATHS)) # 1.1 as exact name @@ -136,15 +137,15 @@ endif # 3 endif define MSG_PLATFORM -No platform matched pattern '$(DEVICE)'. +No platform matched pattern '$(PLATFORM)'. Available platforms are: $(XPLATFORMS) -To add more platform directories, set the PLATFORM_REPO_PATHS variable or point DEVICE variable to the full path of platform .xpfm file. +To add more platform directories, set the PLATFORM_REPO_PATHS variable or point PLATFORM variable to the full path of platform .xpfm file. endef export MSG_PLATFORM define MSG_DEVICE More than one platform matched: $(XPLATFORM) -Please set DEVICE variable more accurately to select only one platform file, or set DEVICE variable to the full path of the platform .xpfm file. +Please set PLATFORM variable more accurately to select only one platform file, or set PLATFORM variable to the full path of the platform .xpfm file. endef export MSG_DEVICE @@ -178,6 +179,13 @@ endif # XPART # MK_INC_END vitis_set_part.mk # MK_INC_BEGIN hls_test_rules.mk +# + +gen_instances: $(INSTANCE_FILES) + @echo "Nothing to generate." + +valid_params: + @echo "Nothing to validate." .PHONY: run setup runhls clean cleanall check @@ -216,7 +224,7 @@ endif data: @true -run: data setup runhls +run: gen_instances data setup runhls setup: | check_part @rm -f ./settings.tcl @@ -239,7 +247,7 @@ runhls: data setup | check_vivado check_vpp $(HLS) -f run_hls.tcl; clean: - rm -rf settings.tcl *_hls.log cg_update_pk_test.prj + rm -rf settings.tcl *_hls.log cg_update_pk_test.prj $(INSTANCE_FILES) # Used by Jenkins test cleanall: clean diff --git a/hpc/L1/tests/hw/cgSolver/update_rk_jacobi/Makefile b/hpc/L1/tests/hw/cgSolver/update_rk_jacobi/Makefile index a883a20a7a..fe2d16d7a5 100644 --- a/hpc/L1/tests/hw/cgSolver/update_rk_jacobi/Makefile +++ b/hpc/L1/tests/hw/cgSolver/update_rk_jacobi/Makefile @@ -26,13 +26,13 @@ help:: @echo "" @echo "Makefile Usage:" @echo "" - @echo " make run CSIM=1 CSYNTH=1 COSIM=1 DEVICE= PLATFORM_REPO_PATHS=" + @echo " make run CSIM=1 CSYNTH=1 COSIM=1 PLATFORM= PLATFORM_REPO_PATHS=" @echo " Command to run the selected tasks for specified device." @echo "" @echo " Valid tasks are CSIM, CSYNTH, COSIM, VIVADO_SYN, VIVADO_IMPL" @echo "" - @echo " DEVICE is case-insensitive and support awk regex." - @echo " For example, \`make run DEVICE='u200.*xdma' COSIM=1\`" + @echo " PLATFORM is case-insensitive and support awk regex." + @echo " For example, \`make run PLATFORM='u200.*xdma' COSIM=1\`" @echo " It can also be an absolute path to platform file." @echo "" @echo " PLATFORM_REPO_PATHS variable is used to specify the paths in which the platform files will be" @@ -41,7 +41,7 @@ help:: @echo " make run CSIM=1 CSYNTH=1 COSIM=1 XPART=" @echo " Alternatively, the FPGA part can be speficied via XPART." @echo " For example, \`make run XPART='xcu200-fsgd2104-2-e' COSIM=1\`" - @echo " When XPART is set, DEVICE will be ignored." + @echo " When XPART is set, PLATFORM will be ignored." @echo "" @echo " make clean " @echo " Command to remove the generated files." @@ -79,6 +79,7 @@ ifeq (,$(wildcard $(XILINX_XRT)/lib/libxilinxopencl.so)) @echo "Cannot locate XRT installation. Please set XILINX_XRT variable." && false endif + export PATH := $(XILINX_VITIS)/bin:$(XILINX_XRT)/bin:$(PATH) ifeq (,$(LD_LIBRARY_PATH)) @@ -97,12 +98,12 @@ endif ifeq (,$(XPART)) # MK_INC_BEGIN vitis_set_platform.mk -ifneq (,$(wildcard $(DEVICE))) -# Use DEVICE as a file path -XPLATFORM := $(DEVICE) +ifneq (,$(wildcard $(PLATFORM))) +# Use PLATFORM as a file path +XPLATFORM := $(PLATFORM) else -# Use DEVICE as a file name pattern -DEVICE_L := $(shell echo $(DEVICE) | tr A-Z a-z) +# Use PLATFORM as a file name pattern +DEVICE_L := $(shell echo $(PLATFORM) | tr A-Z a-z) # 1. search paths specified by variable ifneq (,$(PLATFORM_REPO_PATHS)) # 1.1 as exact name @@ -136,15 +137,15 @@ endif # 3 endif define MSG_PLATFORM -No platform matched pattern '$(DEVICE)'. +No platform matched pattern '$(PLATFORM)'. Available platforms are: $(XPLATFORMS) -To add more platform directories, set the PLATFORM_REPO_PATHS variable or point DEVICE variable to the full path of platform .xpfm file. +To add more platform directories, set the PLATFORM_REPO_PATHS variable or point PLATFORM variable to the full path of platform .xpfm file. endef export MSG_PLATFORM define MSG_DEVICE More than one platform matched: $(XPLATFORM) -Please set DEVICE variable more accurately to select only one platform file, or set DEVICE variable to the full path of the platform .xpfm file. +Please set PLATFORM variable more accurately to select only one platform file, or set PLATFORM variable to the full path of the platform .xpfm file. endef export MSG_DEVICE @@ -178,6 +179,13 @@ endif # XPART # MK_INC_END vitis_set_part.mk # MK_INC_BEGIN hls_test_rules.mk +# + +gen_instances: $(INSTANCE_FILES) + @echo "Nothing to generate." + +valid_params: + @echo "Nothing to validate." .PHONY: run setup runhls clean cleanall check @@ -216,7 +224,7 @@ endif data: @true -run: data setup runhls +run: gen_instances data setup runhls setup: | check_part @rm -f ./settings.tcl @@ -239,7 +247,7 @@ runhls: data setup | check_vivado check_vpp $(HLS) -f run_hls.tcl; clean: - rm -rf settings.tcl *_hls.log cg_update_rk_jacobi_test.prj + rm -rf settings.tcl *_hls.log cg_update_rk_jacobi_test.prj $(INSTANCE_FILES) # Used by Jenkins test cleanall: clean diff --git a/hpc/L1/tests/hw/rtm2d/backward/tests/data_h128_w128_t10_pe2/Makefile b/hpc/L1/tests/hw/rtm2d/backward/tests/data_h128_w128_t10_pe2/Makefile index 313ced5fb3..771f590bfe 100644 --- a/hpc/L1/tests/hw/rtm2d/backward/tests/data_h128_w128_t10_pe2/Makefile +++ b/hpc/L1/tests/hw/rtm2d/backward/tests/data_h128_w128_t10_pe2/Makefile @@ -26,13 +26,13 @@ help:: @echo "" @echo "Makefile Usage:" @echo "" - @echo " make run CSIM=1 CSYNTH=1 COSIM=1 DEVICE= PLATFORM_REPO_PATHS=" + @echo " make run CSIM=1 CSYNTH=1 COSIM=1 PLATFORM= PLATFORM_REPO_PATHS=" @echo " Command to run the selected tasks for specified device." @echo "" @echo " Valid tasks are CSIM, CSYNTH, COSIM, VIVADO_SYN, VIVADO_IMPL" @echo "" - @echo " DEVICE is case-insensitive and support awk regex." - @echo " For example, \`make run DEVICE='u200.*xdma' COSIM=1\`" + @echo " PLATFORM is case-insensitive and support awk regex." + @echo " For example, \`make run PLATFORM='u200.*xdma' COSIM=1\`" @echo " It can also be an absolute path to platform file." @echo "" @echo " PLATFORM_REPO_PATHS variable is used to specify the paths in which the platform files will be" @@ -41,7 +41,7 @@ help:: @echo " make run CSIM=1 CSYNTH=1 COSIM=1 XPART=" @echo " Alternatively, the FPGA part can be speficied via XPART." @echo " For example, \`make run XPART='xcu200-fsgd2104-2-e' COSIM=1\`" - @echo " When XPART is set, DEVICE will be ignored." + @echo " When XPART is set, PLATFORM will be ignored." @echo "" @echo " make clean " @echo " Command to remove the generated files." @@ -79,6 +79,7 @@ ifeq (,$(wildcard $(XILINX_XRT)/lib/libxilinxopencl.so)) @echo "Cannot locate XRT installation. Please set XILINX_XRT variable." && false endif + export PATH := $(XILINX_VITIS)/bin:$(XILINX_XRT)/bin:$(PATH) ifeq (,$(LD_LIBRARY_PATH)) @@ -97,12 +98,12 @@ endif ifeq (,$(XPART)) # MK_INC_BEGIN vitis_set_platform.mk -ifneq (,$(wildcard $(DEVICE))) -# Use DEVICE as a file path -XPLATFORM := $(DEVICE) +ifneq (,$(wildcard $(PLATFORM))) +# Use PLATFORM as a file path +XPLATFORM := $(PLATFORM) else -# Use DEVICE as a file name pattern -DEVICE_L := $(shell echo $(DEVICE) | tr A-Z a-z) +# Use PLATFORM as a file name pattern +DEVICE_L := $(shell echo $(PLATFORM) | tr A-Z a-z) # 1. search paths specified by variable ifneq (,$(PLATFORM_REPO_PATHS)) # 1.1 as exact name @@ -136,15 +137,15 @@ endif # 3 endif define MSG_PLATFORM -No platform matched pattern '$(DEVICE)'. +No platform matched pattern '$(PLATFORM)'. Available platforms are: $(XPLATFORMS) -To add more platform directories, set the PLATFORM_REPO_PATHS variable or point DEVICE variable to the full path of platform .xpfm file. +To add more platform directories, set the PLATFORM_REPO_PATHS variable or point PLATFORM variable to the full path of platform .xpfm file. endef export MSG_PLATFORM define MSG_DEVICE More than one platform matched: $(XPLATFORM) -Please set DEVICE variable more accurately to select only one platform file, or set DEVICE variable to the full path of the platform .xpfm file. +Please set PLATFORM variable more accurately to select only one platform file, or set PLATFORM variable to the full path of the platform .xpfm file. endef export MSG_DEVICE @@ -178,6 +179,13 @@ endif # XPART # MK_INC_END vitis_set_part.mk # MK_INC_BEGIN hls_test_rules.mk +# + +gen_instances: $(INSTANCE_FILES) + @echo "Nothing to generate." + +valid_params: + @echo "Nothing to validate." .PHONY: run setup runhls clean cleanall check @@ -216,7 +224,7 @@ endif data: @true -run: data setup runhls +run: gen_instances data setup runhls setup: | check_part @rm -f ./settings.tcl @@ -239,7 +247,7 @@ runhls: data setup | check_vivado check_vpp $(HLS) -f run_hls.tcl; clean: - rm -rf settings.tcl *_hls.log backward_data_h128_w128_t10_pe2_test.prj + rm -rf settings.tcl *_hls.log backward_data_h128_w128_t10_pe2_test.prj $(INSTANCE_FILES) # Used by Jenkins test cleanall: clean diff --git a/hpc/L1/tests/hw/rtm2d/backward/tests/data_h128_w128_t15_pe2/Makefile b/hpc/L1/tests/hw/rtm2d/backward/tests/data_h128_w128_t15_pe2/Makefile index 281bf9d697..714218036f 100644 --- a/hpc/L1/tests/hw/rtm2d/backward/tests/data_h128_w128_t15_pe2/Makefile +++ b/hpc/L1/tests/hw/rtm2d/backward/tests/data_h128_w128_t15_pe2/Makefile @@ -26,13 +26,13 @@ help:: @echo "" @echo "Makefile Usage:" @echo "" - @echo " make run CSIM=1 CSYNTH=1 COSIM=1 DEVICE= PLATFORM_REPO_PATHS=" + @echo " make run CSIM=1 CSYNTH=1 COSIM=1 PLATFORM= PLATFORM_REPO_PATHS=" @echo " Command to run the selected tasks for specified device." @echo "" @echo " Valid tasks are CSIM, CSYNTH, COSIM, VIVADO_SYN, VIVADO_IMPL" @echo "" - @echo " DEVICE is case-insensitive and support awk regex." - @echo " For example, \`make run DEVICE='u200.*xdma' COSIM=1\`" + @echo " PLATFORM is case-insensitive and support awk regex." + @echo " For example, \`make run PLATFORM='u200.*xdma' COSIM=1\`" @echo " It can also be an absolute path to platform file." @echo "" @echo " PLATFORM_REPO_PATHS variable is used to specify the paths in which the platform files will be" @@ -41,7 +41,7 @@ help:: @echo " make run CSIM=1 CSYNTH=1 COSIM=1 XPART=" @echo " Alternatively, the FPGA part can be speficied via XPART." @echo " For example, \`make run XPART='xcu200-fsgd2104-2-e' COSIM=1\`" - @echo " When XPART is set, DEVICE will be ignored." + @echo " When XPART is set, PLATFORM will be ignored." @echo "" @echo " make clean " @echo " Command to remove the generated files." @@ -79,6 +79,7 @@ ifeq (,$(wildcard $(XILINX_XRT)/lib/libxilinxopencl.so)) @echo "Cannot locate XRT installation. Please set XILINX_XRT variable." && false endif + export PATH := $(XILINX_VITIS)/bin:$(XILINX_XRT)/bin:$(PATH) ifeq (,$(LD_LIBRARY_PATH)) @@ -97,12 +98,12 @@ endif ifeq (,$(XPART)) # MK_INC_BEGIN vitis_set_platform.mk -ifneq (,$(wildcard $(DEVICE))) -# Use DEVICE as a file path -XPLATFORM := $(DEVICE) +ifneq (,$(wildcard $(PLATFORM))) +# Use PLATFORM as a file path +XPLATFORM := $(PLATFORM) else -# Use DEVICE as a file name pattern -DEVICE_L := $(shell echo $(DEVICE) | tr A-Z a-z) +# Use PLATFORM as a file name pattern +DEVICE_L := $(shell echo $(PLATFORM) | tr A-Z a-z) # 1. search paths specified by variable ifneq (,$(PLATFORM_REPO_PATHS)) # 1.1 as exact name @@ -136,15 +137,15 @@ endif # 3 endif define MSG_PLATFORM -No platform matched pattern '$(DEVICE)'. +No platform matched pattern '$(PLATFORM)'. Available platforms are: $(XPLATFORMS) -To add more platform directories, set the PLATFORM_REPO_PATHS variable or point DEVICE variable to the full path of platform .xpfm file. +To add more platform directories, set the PLATFORM_REPO_PATHS variable or point PLATFORM variable to the full path of platform .xpfm file. endef export MSG_PLATFORM define MSG_DEVICE More than one platform matched: $(XPLATFORM) -Please set DEVICE variable more accurately to select only one platform file, or set DEVICE variable to the full path of the platform .xpfm file. +Please set PLATFORM variable more accurately to select only one platform file, or set PLATFORM variable to the full path of the platform .xpfm file. endef export MSG_DEVICE @@ -178,6 +179,13 @@ endif # XPART # MK_INC_END vitis_set_part.mk # MK_INC_BEGIN hls_test_rules.mk +# + +gen_instances: $(INSTANCE_FILES) + @echo "Nothing to generate." + +valid_params: + @echo "Nothing to validate." .PHONY: run setup runhls clean cleanall check @@ -216,7 +224,7 @@ endif data: @true -run: data setup runhls +run: gen_instances data setup runhls setup: | check_part @rm -f ./settings.tcl @@ -239,7 +247,7 @@ runhls: data setup | check_vivado check_vpp $(HLS) -f run_hls.tcl; clean: - rm -rf settings.tcl *_hls.log backward_data_h128_w128_t15_pe2_test.prj + rm -rf settings.tcl *_hls.log backward_data_h128_w128_t15_pe2_test.prj $(INSTANCE_FILES) # Used by Jenkins test cleanall: clean diff --git a/hpc/L1/tests/hw/rtm2d/forward/tests/data_h128_w128_t10_pe2/Makefile b/hpc/L1/tests/hw/rtm2d/forward/tests/data_h128_w128_t10_pe2/Makefile index 744cc800ef..1e11bb7c60 100644 --- a/hpc/L1/tests/hw/rtm2d/forward/tests/data_h128_w128_t10_pe2/Makefile +++ b/hpc/L1/tests/hw/rtm2d/forward/tests/data_h128_w128_t10_pe2/Makefile @@ -26,13 +26,13 @@ help:: @echo "" @echo "Makefile Usage:" @echo "" - @echo " make run CSIM=1 CSYNTH=1 COSIM=1 DEVICE= PLATFORM_REPO_PATHS=" + @echo " make run CSIM=1 CSYNTH=1 COSIM=1 PLATFORM= PLATFORM_REPO_PATHS=" @echo " Command to run the selected tasks for specified device." @echo "" @echo " Valid tasks are CSIM, CSYNTH, COSIM, VIVADO_SYN, VIVADO_IMPL" @echo "" - @echo " DEVICE is case-insensitive and support awk regex." - @echo " For example, \`make run DEVICE='u200.*xdma' COSIM=1\`" + @echo " PLATFORM is case-insensitive and support awk regex." + @echo " For example, \`make run PLATFORM='u200.*xdma' COSIM=1\`" @echo " It can also be an absolute path to platform file." @echo "" @echo " PLATFORM_REPO_PATHS variable is used to specify the paths in which the platform files will be" @@ -41,7 +41,7 @@ help:: @echo " make run CSIM=1 CSYNTH=1 COSIM=1 XPART=" @echo " Alternatively, the FPGA part can be speficied via XPART." @echo " For example, \`make run XPART='xcu200-fsgd2104-2-e' COSIM=1\`" - @echo " When XPART is set, DEVICE will be ignored." + @echo " When XPART is set, PLATFORM will be ignored." @echo "" @echo " make clean " @echo " Command to remove the generated files." @@ -79,6 +79,7 @@ ifeq (,$(wildcard $(XILINX_XRT)/lib/libxilinxopencl.so)) @echo "Cannot locate XRT installation. Please set XILINX_XRT variable." && false endif + export PATH := $(XILINX_VITIS)/bin:$(XILINX_XRT)/bin:$(PATH) ifeq (,$(LD_LIBRARY_PATH)) @@ -97,12 +98,12 @@ endif ifeq (,$(XPART)) # MK_INC_BEGIN vitis_set_platform.mk -ifneq (,$(wildcard $(DEVICE))) -# Use DEVICE as a file path -XPLATFORM := $(DEVICE) +ifneq (,$(wildcard $(PLATFORM))) +# Use PLATFORM as a file path +XPLATFORM := $(PLATFORM) else -# Use DEVICE as a file name pattern -DEVICE_L := $(shell echo $(DEVICE) | tr A-Z a-z) +# Use PLATFORM as a file name pattern +DEVICE_L := $(shell echo $(PLATFORM) | tr A-Z a-z) # 1. search paths specified by variable ifneq (,$(PLATFORM_REPO_PATHS)) # 1.1 as exact name @@ -136,15 +137,15 @@ endif # 3 endif define MSG_PLATFORM -No platform matched pattern '$(DEVICE)'. +No platform matched pattern '$(PLATFORM)'. Available platforms are: $(XPLATFORMS) -To add more platform directories, set the PLATFORM_REPO_PATHS variable or point DEVICE variable to the full path of platform .xpfm file. +To add more platform directories, set the PLATFORM_REPO_PATHS variable or point PLATFORM variable to the full path of platform .xpfm file. endef export MSG_PLATFORM define MSG_DEVICE More than one platform matched: $(XPLATFORM) -Please set DEVICE variable more accurately to select only one platform file, or set DEVICE variable to the full path of the platform .xpfm file. +Please set PLATFORM variable more accurately to select only one platform file, or set PLATFORM variable to the full path of the platform .xpfm file. endef export MSG_DEVICE @@ -178,6 +179,13 @@ endif # XPART # MK_INC_END vitis_set_part.mk # MK_INC_BEGIN hls_test_rules.mk +# + +gen_instances: $(INSTANCE_FILES) + @echo "Nothing to generate." + +valid_params: + @echo "Nothing to validate." .PHONY: run setup runhls clean cleanall check @@ -216,7 +224,7 @@ endif data: @true -run: data setup runhls +run: gen_instances data setup runhls setup: | check_part @rm -f ./settings.tcl @@ -239,7 +247,7 @@ runhls: data setup | check_vivado check_vpp $(HLS) -f run_hls.tcl; clean: - rm -rf settings.tcl *_hls.log forward_data_h128_w128_t10_pe2_test.prj + rm -rf settings.tcl *_hls.log forward_data_h128_w128_t10_pe2_test.prj $(INSTANCE_FILES) # Used by Jenkins test cleanall: clean diff --git a/hpc/L1/tests/hw/rtm2d/forward/tests/data_h128_w128_t15_pe4/Makefile b/hpc/L1/tests/hw/rtm2d/forward/tests/data_h128_w128_t15_pe4/Makefile index 610f46a5b9..d6b244ed29 100644 --- a/hpc/L1/tests/hw/rtm2d/forward/tests/data_h128_w128_t15_pe4/Makefile +++ b/hpc/L1/tests/hw/rtm2d/forward/tests/data_h128_w128_t15_pe4/Makefile @@ -26,13 +26,13 @@ help:: @echo "" @echo "Makefile Usage:" @echo "" - @echo " make run CSIM=1 CSYNTH=1 COSIM=1 DEVICE= PLATFORM_REPO_PATHS=" + @echo " make run CSIM=1 CSYNTH=1 COSIM=1 PLATFORM= PLATFORM_REPO_PATHS=" @echo " Command to run the selected tasks for specified device." @echo "" @echo " Valid tasks are CSIM, CSYNTH, COSIM, VIVADO_SYN, VIVADO_IMPL" @echo "" - @echo " DEVICE is case-insensitive and support awk regex." - @echo " For example, \`make run DEVICE='u200.*xdma' COSIM=1\`" + @echo " PLATFORM is case-insensitive and support awk regex." + @echo " For example, \`make run PLATFORM='u200.*xdma' COSIM=1\`" @echo " It can also be an absolute path to platform file." @echo "" @echo " PLATFORM_REPO_PATHS variable is used to specify the paths in which the platform files will be" @@ -41,7 +41,7 @@ help:: @echo " make run CSIM=1 CSYNTH=1 COSIM=1 XPART=" @echo " Alternatively, the FPGA part can be speficied via XPART." @echo " For example, \`make run XPART='xcu200-fsgd2104-2-e' COSIM=1\`" - @echo " When XPART is set, DEVICE will be ignored." + @echo " When XPART is set, PLATFORM will be ignored." @echo "" @echo " make clean " @echo " Command to remove the generated files." @@ -79,6 +79,7 @@ ifeq (,$(wildcard $(XILINX_XRT)/lib/libxilinxopencl.so)) @echo "Cannot locate XRT installation. Please set XILINX_XRT variable." && false endif + export PATH := $(XILINX_VITIS)/bin:$(XILINX_XRT)/bin:$(PATH) ifeq (,$(LD_LIBRARY_PATH)) @@ -97,12 +98,12 @@ endif ifeq (,$(XPART)) # MK_INC_BEGIN vitis_set_platform.mk -ifneq (,$(wildcard $(DEVICE))) -# Use DEVICE as a file path -XPLATFORM := $(DEVICE) +ifneq (,$(wildcard $(PLATFORM))) +# Use PLATFORM as a file path +XPLATFORM := $(PLATFORM) else -# Use DEVICE as a file name pattern -DEVICE_L := $(shell echo $(DEVICE) | tr A-Z a-z) +# Use PLATFORM as a file name pattern +DEVICE_L := $(shell echo $(PLATFORM) | tr A-Z a-z) # 1. search paths specified by variable ifneq (,$(PLATFORM_REPO_PATHS)) # 1.1 as exact name @@ -136,15 +137,15 @@ endif # 3 endif define MSG_PLATFORM -No platform matched pattern '$(DEVICE)'. +No platform matched pattern '$(PLATFORM)'. Available platforms are: $(XPLATFORMS) -To add more platform directories, set the PLATFORM_REPO_PATHS variable or point DEVICE variable to the full path of platform .xpfm file. +To add more platform directories, set the PLATFORM_REPO_PATHS variable or point PLATFORM variable to the full path of platform .xpfm file. endef export MSG_PLATFORM define MSG_DEVICE More than one platform matched: $(XPLATFORM) -Please set DEVICE variable more accurately to select only one platform file, or set DEVICE variable to the full path of the platform .xpfm file. +Please set PLATFORM variable more accurately to select only one platform file, or set PLATFORM variable to the full path of the platform .xpfm file. endef export MSG_DEVICE @@ -178,6 +179,13 @@ endif # XPART # MK_INC_END vitis_set_part.mk # MK_INC_BEGIN hls_test_rules.mk +# + +gen_instances: $(INSTANCE_FILES) + @echo "Nothing to generate." + +valid_params: + @echo "Nothing to validate." .PHONY: run setup runhls clean cleanall check @@ -216,7 +224,7 @@ endif data: @true -run: data setup runhls +run: gen_instances data setup runhls setup: | check_part @rm -f ./settings.tcl @@ -239,7 +247,7 @@ runhls: data setup | check_vivado check_vpp $(HLS) -f run_hls.tcl; clean: - rm -rf settings.tcl *_hls.log forward_data_h128_w128_t15_pe4_test.prj + rm -rf settings.tcl *_hls.log forward_data_h128_w128_t15_pe4_test.prj $(INSTANCE_FILES) # Used by Jenkins test cleanall: clean diff --git a/hpc/L1/tests/hw/rtm2d/laplacian/tests/data_h128_w128_t2_pe2/Makefile b/hpc/L1/tests/hw/rtm2d/laplacian/tests/data_h128_w128_t2_pe2/Makefile index b7b94315a2..2abb0240ef 100644 --- a/hpc/L1/tests/hw/rtm2d/laplacian/tests/data_h128_w128_t2_pe2/Makefile +++ b/hpc/L1/tests/hw/rtm2d/laplacian/tests/data_h128_w128_t2_pe2/Makefile @@ -26,13 +26,13 @@ help:: @echo "" @echo "Makefile Usage:" @echo "" - @echo " make run CSIM=1 CSYNTH=1 COSIM=1 DEVICE= PLATFORM_REPO_PATHS=" + @echo " make run CSIM=1 CSYNTH=1 COSIM=1 PLATFORM= PLATFORM_REPO_PATHS=" @echo " Command to run the selected tasks for specified device." @echo "" @echo " Valid tasks are CSIM, CSYNTH, COSIM, VIVADO_SYN, VIVADO_IMPL" @echo "" - @echo " DEVICE is case-insensitive and support awk regex." - @echo " For example, \`make run DEVICE='u200.*xdma' COSIM=1\`" + @echo " PLATFORM is case-insensitive and support awk regex." + @echo " For example, \`make run PLATFORM='u200.*xdma' COSIM=1\`" @echo " It can also be an absolute path to platform file." @echo "" @echo " PLATFORM_REPO_PATHS variable is used to specify the paths in which the platform files will be" @@ -41,7 +41,7 @@ help:: @echo " make run CSIM=1 CSYNTH=1 COSIM=1 XPART=" @echo " Alternatively, the FPGA part can be speficied via XPART." @echo " For example, \`make run XPART='xcu200-fsgd2104-2-e' COSIM=1\`" - @echo " When XPART is set, DEVICE will be ignored." + @echo " When XPART is set, PLATFORM will be ignored." @echo "" @echo " make clean " @echo " Command to remove the generated files." @@ -79,6 +79,7 @@ ifeq (,$(wildcard $(XILINX_XRT)/lib/libxilinxopencl.so)) @echo "Cannot locate XRT installation. Please set XILINX_XRT variable." && false endif + export PATH := $(XILINX_VITIS)/bin:$(XILINX_XRT)/bin:$(PATH) ifeq (,$(LD_LIBRARY_PATH)) @@ -97,12 +98,12 @@ endif ifeq (,$(XPART)) # MK_INC_BEGIN vitis_set_platform.mk -ifneq (,$(wildcard $(DEVICE))) -# Use DEVICE as a file path -XPLATFORM := $(DEVICE) +ifneq (,$(wildcard $(PLATFORM))) +# Use PLATFORM as a file path +XPLATFORM := $(PLATFORM) else -# Use DEVICE as a file name pattern -DEVICE_L := $(shell echo $(DEVICE) | tr A-Z a-z) +# Use PLATFORM as a file name pattern +DEVICE_L := $(shell echo $(PLATFORM) | tr A-Z a-z) # 1. search paths specified by variable ifneq (,$(PLATFORM_REPO_PATHS)) # 1.1 as exact name @@ -136,15 +137,15 @@ endif # 3 endif define MSG_PLATFORM -No platform matched pattern '$(DEVICE)'. +No platform matched pattern '$(PLATFORM)'. Available platforms are: $(XPLATFORMS) -To add more platform directories, set the PLATFORM_REPO_PATHS variable or point DEVICE variable to the full path of platform .xpfm file. +To add more platform directories, set the PLATFORM_REPO_PATHS variable or point PLATFORM variable to the full path of platform .xpfm file. endef export MSG_PLATFORM define MSG_DEVICE More than one platform matched: $(XPLATFORM) -Please set DEVICE variable more accurately to select only one platform file, or set DEVICE variable to the full path of the platform .xpfm file. +Please set PLATFORM variable more accurately to select only one platform file, or set PLATFORM variable to the full path of the platform .xpfm file. endef export MSG_DEVICE @@ -178,6 +179,13 @@ endif # XPART # MK_INC_END vitis_set_part.mk # MK_INC_BEGIN hls_test_rules.mk +# + +gen_instances: $(INSTANCE_FILES) + @echo "Nothing to generate." + +valid_params: + @echo "Nothing to validate." .PHONY: run setup runhls clean cleanall check @@ -216,7 +224,7 @@ endif data: @true -run: data setup runhls +run: gen_instances data setup runhls setup: | check_part @rm -f ./settings.tcl @@ -239,7 +247,7 @@ runhls: data setup | check_vivado check_vpp $(HLS) -f run_hls.tcl; clean: - rm -rf settings.tcl *_hls.log laplacian_data_h128_w128_t2_pe2_test.prj + rm -rf settings.tcl *_hls.log laplacian_data_h128_w128_t2_pe2_test.prj $(INSTANCE_FILES) # Used by Jenkins test cleanall: clean diff --git a/hpc/L1/tests/hw/rtm3d/forward_hbc/tests/Makefile b/hpc/L1/tests/hw/rtm3d/forward_hbc/tests/Makefile index 5cbdef1c0a..45739411b1 100644 --- a/hpc/L1/tests/hw/rtm3d/forward_hbc/tests/Makefile +++ b/hpc/L1/tests/hw/rtm3d/forward_hbc/tests/Makefile @@ -26,13 +26,13 @@ help:: @echo "" @echo "Makefile Usage:" @echo "" - @echo " make run CSIM=1 CSYNTH=1 COSIM=1 DEVICE= PLATFORM_REPO_PATHS=" + @echo " make run CSIM=1 CSYNTH=1 COSIM=1 PLATFORM= PLATFORM_REPO_PATHS=" @echo " Command to run the selected tasks for specified device." @echo "" @echo " Valid tasks are CSIM, CSYNTH, COSIM, VIVADO_SYN, VIVADO_IMPL" @echo "" - @echo " DEVICE is case-insensitive and support awk regex." - @echo " For example, \`make run DEVICE='u200.*xdma' COSIM=1\`" + @echo " PLATFORM is case-insensitive and support awk regex." + @echo " For example, \`make run PLATFORM='u200.*xdma' COSIM=1\`" @echo " It can also be an absolute path to platform file." @echo "" @echo " PLATFORM_REPO_PATHS variable is used to specify the paths in which the platform files will be" @@ -41,7 +41,7 @@ help:: @echo " make run CSIM=1 CSYNTH=1 COSIM=1 XPART=" @echo " Alternatively, the FPGA part can be speficied via XPART." @echo " For example, \`make run XPART='xcu200-fsgd2104-2-e' COSIM=1\`" - @echo " When XPART is set, DEVICE will be ignored." + @echo " When XPART is set, PLATFORM will be ignored." @echo "" @echo " make clean " @echo " Command to remove the generated files." @@ -79,6 +79,7 @@ ifeq (,$(wildcard $(XILINX_XRT)/lib/libxilinxopencl.so)) @echo "Cannot locate XRT installation. Please set XILINX_XRT variable." && false endif + export PATH := $(XILINX_VITIS)/bin:$(XILINX_XRT)/bin:$(PATH) ifeq (,$(LD_LIBRARY_PATH)) @@ -97,12 +98,12 @@ endif ifeq (,$(XPART)) # MK_INC_BEGIN vitis_set_platform.mk -ifneq (,$(wildcard $(DEVICE))) -# Use DEVICE as a file path -XPLATFORM := $(DEVICE) +ifneq (,$(wildcard $(PLATFORM))) +# Use PLATFORM as a file path +XPLATFORM := $(PLATFORM) else -# Use DEVICE as a file name pattern -DEVICE_L := $(shell echo $(DEVICE) | tr A-Z a-z) +# Use PLATFORM as a file name pattern +DEVICE_L := $(shell echo $(PLATFORM) | tr A-Z a-z) # 1. search paths specified by variable ifneq (,$(PLATFORM_REPO_PATHS)) # 1.1 as exact name @@ -136,15 +137,15 @@ endif # 3 endif define MSG_PLATFORM -No platform matched pattern '$(DEVICE)'. +No platform matched pattern '$(PLATFORM)'. Available platforms are: $(XPLATFORMS) -To add more platform directories, set the PLATFORM_REPO_PATHS variable or point DEVICE variable to the full path of platform .xpfm file. +To add more platform directories, set the PLATFORM_REPO_PATHS variable or point PLATFORM variable to the full path of platform .xpfm file. endef export MSG_PLATFORM define MSG_DEVICE More than one platform matched: $(XPLATFORM) -Please set DEVICE variable more accurately to select only one platform file, or set DEVICE variable to the full path of the platform .xpfm file. +Please set PLATFORM variable more accurately to select only one platform file, or set PLATFORM variable to the full path of the platform .xpfm file. endef export MSG_DEVICE @@ -178,6 +179,13 @@ endif # XPART # MK_INC_END vitis_set_part.mk # MK_INC_BEGIN hls_test_rules.mk +# + +gen_instances: $(INSTANCE_FILES) + @echo "Nothing to generate." + +valid_params: + @echo "Nothing to validate." .PHONY: run setup runhls clean cleanall check @@ -216,7 +224,7 @@ endif data: @true -run: data setup runhls +run: gen_instances data setup runhls setup: | check_part @rm -f ./settings.tcl @@ -239,9 +247,9 @@ runhls: data setup | check_vivado check_vpp $(HLS) -f run_hls.tcl; clean: - rm -rf settings.tcl *_hls.log forward_test.prj + rm -rf settings.tcl *_hls.log forward_RTM_x60_y70_z60_t6_p4_test.prj $(INSTANCE_FILES) # Used by Jenkins test cleanall: clean -# MK_INC_END hls_test_rules.mk +# MK_INC_END hls_test_rules.mk \ No newline at end of file diff --git a/hpc/L1/tests/hw/rtm3d/forward_rbc/tests/RTM_x36_y60_z40_t4_p2/Makefile b/hpc/L1/tests/hw/rtm3d/forward_rbc/tests/RTM_x36_y60_z40_t4_p2/Makefile index dd71a8a087..bb42038581 100644 --- a/hpc/L1/tests/hw/rtm3d/forward_rbc/tests/RTM_x36_y60_z40_t4_p2/Makefile +++ b/hpc/L1/tests/hw/rtm3d/forward_rbc/tests/RTM_x36_y60_z40_t4_p2/Makefile @@ -26,13 +26,13 @@ help:: @echo "" @echo "Makefile Usage:" @echo "" - @echo " make run CSIM=1 CSYNTH=1 COSIM=1 DEVICE= PLATFORM_REPO_PATHS=" + @echo " make run CSIM=1 CSYNTH=1 COSIM=1 PLATFORM= PLATFORM_REPO_PATHS=" @echo " Command to run the selected tasks for specified device." @echo "" @echo " Valid tasks are CSIM, CSYNTH, COSIM, VIVADO_SYN, VIVADO_IMPL" @echo "" - @echo " DEVICE is case-insensitive and support awk regex." - @echo " For example, \`make run DEVICE='u200.*xdma' COSIM=1\`" + @echo " PLATFORM is case-insensitive and support awk regex." + @echo " For example, \`make run PLATFORM='u200.*xdma' COSIM=1\`" @echo " It can also be an absolute path to platform file." @echo "" @echo " PLATFORM_REPO_PATHS variable is used to specify the paths in which the platform files will be" @@ -41,7 +41,7 @@ help:: @echo " make run CSIM=1 CSYNTH=1 COSIM=1 XPART=" @echo " Alternatively, the FPGA part can be speficied via XPART." @echo " For example, \`make run XPART='xcu200-fsgd2104-2-e' COSIM=1\`" - @echo " When XPART is set, DEVICE will be ignored." + @echo " When XPART is set, PLATFORM will be ignored." @echo "" @echo " make clean " @echo " Command to remove the generated files." @@ -79,6 +79,7 @@ ifeq (,$(wildcard $(XILINX_XRT)/lib/libxilinxopencl.so)) @echo "Cannot locate XRT installation. Please set XILINX_XRT variable." && false endif + export PATH := $(XILINX_VITIS)/bin:$(XILINX_XRT)/bin:$(PATH) ifeq (,$(LD_LIBRARY_PATH)) @@ -97,12 +98,12 @@ endif ifeq (,$(XPART)) # MK_INC_BEGIN vitis_set_platform.mk -ifneq (,$(wildcard $(DEVICE))) -# Use DEVICE as a file path -XPLATFORM := $(DEVICE) +ifneq (,$(wildcard $(PLATFORM))) +# Use PLATFORM as a file path +XPLATFORM := $(PLATFORM) else -# Use DEVICE as a file name pattern -DEVICE_L := $(shell echo $(DEVICE) | tr A-Z a-z) +# Use PLATFORM as a file name pattern +DEVICE_L := $(shell echo $(PLATFORM) | tr A-Z a-z) # 1. search paths specified by variable ifneq (,$(PLATFORM_REPO_PATHS)) # 1.1 as exact name @@ -136,15 +137,15 @@ endif # 3 endif define MSG_PLATFORM -No platform matched pattern '$(DEVICE)'. +No platform matched pattern '$(PLATFORM)'. Available platforms are: $(XPLATFORMS) -To add more platform directories, set the PLATFORM_REPO_PATHS variable or point DEVICE variable to the full path of platform .xpfm file. +To add more platform directories, set the PLATFORM_REPO_PATHS variable or point PLATFORM variable to the full path of platform .xpfm file. endef export MSG_PLATFORM define MSG_DEVICE More than one platform matched: $(XPLATFORM) -Please set DEVICE variable more accurately to select only one platform file, or set DEVICE variable to the full path of the platform .xpfm file. +Please set PLATFORM variable more accurately to select only one platform file, or set PLATFORM variable to the full path of the platform .xpfm file. endef export MSG_DEVICE @@ -178,6 +179,13 @@ endif # XPART # MK_INC_END vitis_set_part.mk # MK_INC_BEGIN hls_test_rules.mk +# + +gen_instances: $(INSTANCE_FILES) + @echo "Nothing to generate." + +valid_params: + @echo "Nothing to validate." .PHONY: run setup runhls clean cleanall check @@ -216,7 +224,7 @@ endif data: @true -run: data setup runhls +run: gen_instances data setup runhls setup: | check_part @rm -f ./settings.tcl @@ -239,7 +247,7 @@ runhls: data setup | check_vivado check_vpp $(HLS) -f run_hls.tcl; clean: - rm -rf settings.tcl *_hls.log forward_RTM_x36_y60_z40_t4_p2_test.prj + rm -rf settings.tcl *_hls.log forward_RTM_x36_y60_z40_t4_p2_test.prj $(INSTANCE_FILES) # Used by Jenkins test cleanall: clean diff --git a/hpc/L1/tests/hw/rtm3d/forward_rbc/tests/RTM_x50_y60_z80_t4_p2/Makefile b/hpc/L1/tests/hw/rtm3d/forward_rbc/tests/RTM_x50_y60_z80_t4_p2/Makefile index b50b5c7769..3b19eaef41 100644 --- a/hpc/L1/tests/hw/rtm3d/forward_rbc/tests/RTM_x50_y60_z80_t4_p2/Makefile +++ b/hpc/L1/tests/hw/rtm3d/forward_rbc/tests/RTM_x50_y60_z80_t4_p2/Makefile @@ -26,13 +26,13 @@ help:: @echo "" @echo "Makefile Usage:" @echo "" - @echo " make run CSIM=1 CSYNTH=1 COSIM=1 DEVICE= PLATFORM_REPO_PATHS=" + @echo " make run CSIM=1 CSYNTH=1 COSIM=1 PLATFORM= PLATFORM_REPO_PATHS=" @echo " Command to run the selected tasks for specified device." @echo "" @echo " Valid tasks are CSIM, CSYNTH, COSIM, VIVADO_SYN, VIVADO_IMPL" @echo "" - @echo " DEVICE is case-insensitive and support awk regex." - @echo " For example, \`make run DEVICE='u200.*xdma' COSIM=1\`" + @echo " PLATFORM is case-insensitive and support awk regex." + @echo " For example, \`make run PLATFORM='u200.*xdma' COSIM=1\`" @echo " It can also be an absolute path to platform file." @echo "" @echo " PLATFORM_REPO_PATHS variable is used to specify the paths in which the platform files will be" @@ -41,7 +41,7 @@ help:: @echo " make run CSIM=1 CSYNTH=1 COSIM=1 XPART=" @echo " Alternatively, the FPGA part can be speficied via XPART." @echo " For example, \`make run XPART='xcu200-fsgd2104-2-e' COSIM=1\`" - @echo " When XPART is set, DEVICE will be ignored." + @echo " When XPART is set, PLATFORM will be ignored." @echo "" @echo " make clean " @echo " Command to remove the generated files." @@ -79,6 +79,7 @@ ifeq (,$(wildcard $(XILINX_XRT)/lib/libxilinxopencl.so)) @echo "Cannot locate XRT installation. Please set XILINX_XRT variable." && false endif + export PATH := $(XILINX_VITIS)/bin:$(XILINX_XRT)/bin:$(PATH) ifeq (,$(LD_LIBRARY_PATH)) @@ -97,12 +98,12 @@ endif ifeq (,$(XPART)) # MK_INC_BEGIN vitis_set_platform.mk -ifneq (,$(wildcard $(DEVICE))) -# Use DEVICE as a file path -XPLATFORM := $(DEVICE) +ifneq (,$(wildcard $(PLATFORM))) +# Use PLATFORM as a file path +XPLATFORM := $(PLATFORM) else -# Use DEVICE as a file name pattern -DEVICE_L := $(shell echo $(DEVICE) | tr A-Z a-z) +# Use PLATFORM as a file name pattern +DEVICE_L := $(shell echo $(PLATFORM) | tr A-Z a-z) # 1. search paths specified by variable ifneq (,$(PLATFORM_REPO_PATHS)) # 1.1 as exact name @@ -136,15 +137,15 @@ endif # 3 endif define MSG_PLATFORM -No platform matched pattern '$(DEVICE)'. +No platform matched pattern '$(PLATFORM)'. Available platforms are: $(XPLATFORMS) -To add more platform directories, set the PLATFORM_REPO_PATHS variable or point DEVICE variable to the full path of platform .xpfm file. +To add more platform directories, set the PLATFORM_REPO_PATHS variable or point PLATFORM variable to the full path of platform .xpfm file. endef export MSG_PLATFORM define MSG_DEVICE More than one platform matched: $(XPLATFORM) -Please set DEVICE variable more accurately to select only one platform file, or set DEVICE variable to the full path of the platform .xpfm file. +Please set PLATFORM variable more accurately to select only one platform file, or set PLATFORM variable to the full path of the platform .xpfm file. endef export MSG_DEVICE @@ -178,6 +179,13 @@ endif # XPART # MK_INC_END vitis_set_part.mk # MK_INC_BEGIN hls_test_rules.mk +# + +gen_instances: $(INSTANCE_FILES) + @echo "Nothing to generate." + +valid_params: + @echo "Nothing to validate." .PHONY: run setup runhls clean cleanall check @@ -216,7 +224,7 @@ endif data: @true -run: data setup runhls +run: gen_instances data setup runhls setup: | check_part @rm -f ./settings.tcl @@ -239,7 +247,7 @@ runhls: data setup | check_vivado check_vpp $(HLS) -f run_hls.tcl; clean: - rm -rf settings.tcl *_hls.log forward_RTM_x50_y60_z80_t4_p2_test.prj + rm -rf settings.tcl *_hls.log forward_RTM_x50_y60_z80_t4_p2_test.prj $(INSTANCE_FILES) # Used by Jenkins test cleanall: clean diff --git a/hpc/L1/tests/hw/rtm3d/forward_rbc/tests/RTM_x50_y60_z80_t9_p2/Makefile b/hpc/L1/tests/hw/rtm3d/forward_rbc/tests/RTM_x50_y60_z80_t9_p2/Makefile index 9d89214583..62e78979c2 100644 --- a/hpc/L1/tests/hw/rtm3d/forward_rbc/tests/RTM_x50_y60_z80_t9_p2/Makefile +++ b/hpc/L1/tests/hw/rtm3d/forward_rbc/tests/RTM_x50_y60_z80_t9_p2/Makefile @@ -26,13 +26,13 @@ help:: @echo "" @echo "Makefile Usage:" @echo "" - @echo " make run CSIM=1 CSYNTH=1 COSIM=1 DEVICE= PLATFORM_REPO_PATHS=" + @echo " make run CSIM=1 CSYNTH=1 COSIM=1 PLATFORM= PLATFORM_REPO_PATHS=" @echo " Command to run the selected tasks for specified device." @echo "" @echo " Valid tasks are CSIM, CSYNTH, COSIM, VIVADO_SYN, VIVADO_IMPL" @echo "" - @echo " DEVICE is case-insensitive and support awk regex." - @echo " For example, \`make run DEVICE='u200.*xdma' COSIM=1\`" + @echo " PLATFORM is case-insensitive and support awk regex." + @echo " For example, \`make run PLATFORM='u200.*xdma' COSIM=1\`" @echo " It can also be an absolute path to platform file." @echo "" @echo " PLATFORM_REPO_PATHS variable is used to specify the paths in which the platform files will be" @@ -41,7 +41,7 @@ help:: @echo " make run CSIM=1 CSYNTH=1 COSIM=1 XPART=" @echo " Alternatively, the FPGA part can be speficied via XPART." @echo " For example, \`make run XPART='xcu200-fsgd2104-2-e' COSIM=1\`" - @echo " When XPART is set, DEVICE will be ignored." + @echo " When XPART is set, PLATFORM will be ignored." @echo "" @echo " make clean " @echo " Command to remove the generated files." @@ -79,6 +79,7 @@ ifeq (,$(wildcard $(XILINX_XRT)/lib/libxilinxopencl.so)) @echo "Cannot locate XRT installation. Please set XILINX_XRT variable." && false endif + export PATH := $(XILINX_VITIS)/bin:$(XILINX_XRT)/bin:$(PATH) ifeq (,$(LD_LIBRARY_PATH)) @@ -97,12 +98,12 @@ endif ifeq (,$(XPART)) # MK_INC_BEGIN vitis_set_platform.mk -ifneq (,$(wildcard $(DEVICE))) -# Use DEVICE as a file path -XPLATFORM := $(DEVICE) +ifneq (,$(wildcard $(PLATFORM))) +# Use PLATFORM as a file path +XPLATFORM := $(PLATFORM) else -# Use DEVICE as a file name pattern -DEVICE_L := $(shell echo $(DEVICE) | tr A-Z a-z) +# Use PLATFORM as a file name pattern +DEVICE_L := $(shell echo $(PLATFORM) | tr A-Z a-z) # 1. search paths specified by variable ifneq (,$(PLATFORM_REPO_PATHS)) # 1.1 as exact name @@ -136,15 +137,15 @@ endif # 3 endif define MSG_PLATFORM -No platform matched pattern '$(DEVICE)'. +No platform matched pattern '$(PLATFORM)'. Available platforms are: $(XPLATFORMS) -To add more platform directories, set the PLATFORM_REPO_PATHS variable or point DEVICE variable to the full path of platform .xpfm file. +To add more platform directories, set the PLATFORM_REPO_PATHS variable or point PLATFORM variable to the full path of platform .xpfm file. endef export MSG_PLATFORM define MSG_DEVICE More than one platform matched: $(XPLATFORM) -Please set DEVICE variable more accurately to select only one platform file, or set DEVICE variable to the full path of the platform .xpfm file. +Please set PLATFORM variable more accurately to select only one platform file, or set PLATFORM variable to the full path of the platform .xpfm file. endef export MSG_DEVICE @@ -178,6 +179,13 @@ endif # XPART # MK_INC_END vitis_set_part.mk # MK_INC_BEGIN hls_test_rules.mk +# + +gen_instances: $(INSTANCE_FILES) + @echo "Nothing to generate." + +valid_params: + @echo "Nothing to validate." .PHONY: run setup runhls clean cleanall check @@ -216,7 +224,7 @@ endif data: @true -run: data setup runhls +run: gen_instances data setup runhls setup: | check_part @rm -f ./settings.tcl @@ -239,7 +247,7 @@ runhls: data setup | check_vivado check_vpp $(HLS) -f run_hls.tcl; clean: - rm -rf settings.tcl *_hls.log forward_RTM_x50_y60_z80_t9_p2_test.prj + rm -rf settings.tcl *_hls.log forward_RTM_x50_y60_z80_t9_p2_test.prj $(INSTANCE_FILES) # Used by Jenkins test cleanall: clean diff --git a/hpc/L1/tests/hw/rtm3d/laplacian/tests/RTM_x28_y25_z20_t1_p2/Makefile b/hpc/L1/tests/hw/rtm3d/laplacian/tests/RTM_x28_y25_z20_t1_p2/Makefile index 575e07fd74..1eaffd9dc8 100644 --- a/hpc/L1/tests/hw/rtm3d/laplacian/tests/RTM_x28_y25_z20_t1_p2/Makefile +++ b/hpc/L1/tests/hw/rtm3d/laplacian/tests/RTM_x28_y25_z20_t1_p2/Makefile @@ -26,13 +26,13 @@ help:: @echo "" @echo "Makefile Usage:" @echo "" - @echo " make run CSIM=1 CSYNTH=1 COSIM=1 DEVICE= PLATFORM_REPO_PATHS=" + @echo " make run CSIM=1 CSYNTH=1 COSIM=1 PLATFORM= PLATFORM_REPO_PATHS=" @echo " Command to run the selected tasks for specified device." @echo "" @echo " Valid tasks are CSIM, CSYNTH, COSIM, VIVADO_SYN, VIVADO_IMPL" @echo "" - @echo " DEVICE is case-insensitive and support awk regex." - @echo " For example, \`make run DEVICE='u200.*xdma' COSIM=1\`" + @echo " PLATFORM is case-insensitive and support awk regex." + @echo " For example, \`make run PLATFORM='u200.*xdma' COSIM=1\`" @echo " It can also be an absolute path to platform file." @echo "" @echo " PLATFORM_REPO_PATHS variable is used to specify the paths in which the platform files will be" @@ -41,7 +41,7 @@ help:: @echo " make run CSIM=1 CSYNTH=1 COSIM=1 XPART=" @echo " Alternatively, the FPGA part can be speficied via XPART." @echo " For example, \`make run XPART='xcu200-fsgd2104-2-e' COSIM=1\`" - @echo " When XPART is set, DEVICE will be ignored." + @echo " When XPART is set, PLATFORM will be ignored." @echo "" @echo " make clean " @echo " Command to remove the generated files." @@ -79,6 +79,7 @@ ifeq (,$(wildcard $(XILINX_XRT)/lib/libxilinxopencl.so)) @echo "Cannot locate XRT installation. Please set XILINX_XRT variable." && false endif + export PATH := $(XILINX_VITIS)/bin:$(XILINX_XRT)/bin:$(PATH) ifeq (,$(LD_LIBRARY_PATH)) @@ -97,12 +98,12 @@ endif ifeq (,$(XPART)) # MK_INC_BEGIN vitis_set_platform.mk -ifneq (,$(wildcard $(DEVICE))) -# Use DEVICE as a file path -XPLATFORM := $(DEVICE) +ifneq (,$(wildcard $(PLATFORM))) +# Use PLATFORM as a file path +XPLATFORM := $(PLATFORM) else -# Use DEVICE as a file name pattern -DEVICE_L := $(shell echo $(DEVICE) | tr A-Z a-z) +# Use PLATFORM as a file name pattern +DEVICE_L := $(shell echo $(PLATFORM) | tr A-Z a-z) # 1. search paths specified by variable ifneq (,$(PLATFORM_REPO_PATHS)) # 1.1 as exact name @@ -136,15 +137,15 @@ endif # 3 endif define MSG_PLATFORM -No platform matched pattern '$(DEVICE)'. +No platform matched pattern '$(PLATFORM)'. Available platforms are: $(XPLATFORMS) -To add more platform directories, set the PLATFORM_REPO_PATHS variable or point DEVICE variable to the full path of platform .xpfm file. +To add more platform directories, set the PLATFORM_REPO_PATHS variable or point PLATFORM variable to the full path of platform .xpfm file. endef export MSG_PLATFORM define MSG_DEVICE More than one platform matched: $(XPLATFORM) -Please set DEVICE variable more accurately to select only one platform file, or set DEVICE variable to the full path of the platform .xpfm file. +Please set PLATFORM variable more accurately to select only one platform file, or set PLATFORM variable to the full path of the platform .xpfm file. endef export MSG_DEVICE @@ -178,6 +179,13 @@ endif # XPART # MK_INC_END vitis_set_part.mk # MK_INC_BEGIN hls_test_rules.mk +# + +gen_instances: $(INSTANCE_FILES) + @echo "Nothing to generate." + +valid_params: + @echo "Nothing to validate." .PHONY: run setup runhls clean cleanall check @@ -216,7 +224,7 @@ endif data: @true -run: data setup runhls +run: gen_instances data setup runhls setup: | check_part @rm -f ./settings.tcl @@ -239,7 +247,7 @@ runhls: data setup | check_vivado check_vpp $(HLS) -f run_hls.tcl; clean: - rm -rf settings.tcl *_hls.log laplacian_RTM_x28_y25_z20_t1_p2_test.prj + rm -rf settings.tcl *_hls.log laplacian_RTM_x28_y25_z20_t1_p2_test.prj $(INSTANCE_FILES) # Used by Jenkins test cleanall: clean diff --git a/hpc/L1/tests/hw/rtm3d/propagate/tests/RTM_x28_y36_z20_t_p2/Makefile b/hpc/L1/tests/hw/rtm3d/propagate/tests/RTM_x28_y36_z20_t_p2/Makefile index 3e38d857a8..9225eedd83 100644 --- a/hpc/L1/tests/hw/rtm3d/propagate/tests/RTM_x28_y36_z20_t_p2/Makefile +++ b/hpc/L1/tests/hw/rtm3d/propagate/tests/RTM_x28_y36_z20_t_p2/Makefile @@ -26,13 +26,13 @@ help:: @echo "" @echo "Makefile Usage:" @echo "" - @echo " make run CSIM=1 CSYNTH=1 COSIM=1 DEVICE= PLATFORM_REPO_PATHS=" + @echo " make run CSIM=1 CSYNTH=1 COSIM=1 PLATFORM= PLATFORM_REPO_PATHS=" @echo " Command to run the selected tasks for specified device." @echo "" @echo " Valid tasks are CSIM, CSYNTH, COSIM, VIVADO_SYN, VIVADO_IMPL" @echo "" - @echo " DEVICE is case-insensitive and support awk regex." - @echo " For example, \`make run DEVICE='u200.*xdma' COSIM=1\`" + @echo " PLATFORM is case-insensitive and support awk regex." + @echo " For example, \`make run PLATFORM='u200.*xdma' COSIM=1\`" @echo " It can also be an absolute path to platform file." @echo "" @echo " PLATFORM_REPO_PATHS variable is used to specify the paths in which the platform files will be" @@ -41,7 +41,7 @@ help:: @echo " make run CSIM=1 CSYNTH=1 COSIM=1 XPART=" @echo " Alternatively, the FPGA part can be speficied via XPART." @echo " For example, \`make run XPART='xcu200-fsgd2104-2-e' COSIM=1\`" - @echo " When XPART is set, DEVICE will be ignored." + @echo " When XPART is set, PLATFORM will be ignored." @echo "" @echo " make clean " @echo " Command to remove the generated files." @@ -79,6 +79,7 @@ ifeq (,$(wildcard $(XILINX_XRT)/lib/libxilinxopencl.so)) @echo "Cannot locate XRT installation. Please set XILINX_XRT variable." && false endif + export PATH := $(XILINX_VITIS)/bin:$(XILINX_XRT)/bin:$(PATH) ifeq (,$(LD_LIBRARY_PATH)) @@ -97,12 +98,12 @@ endif ifeq (,$(XPART)) # MK_INC_BEGIN vitis_set_platform.mk -ifneq (,$(wildcard $(DEVICE))) -# Use DEVICE as a file path -XPLATFORM := $(DEVICE) +ifneq (,$(wildcard $(PLATFORM))) +# Use PLATFORM as a file path +XPLATFORM := $(PLATFORM) else -# Use DEVICE as a file name pattern -DEVICE_L := $(shell echo $(DEVICE) | tr A-Z a-z) +# Use PLATFORM as a file name pattern +DEVICE_L := $(shell echo $(PLATFORM) | tr A-Z a-z) # 1. search paths specified by variable ifneq (,$(PLATFORM_REPO_PATHS)) # 1.1 as exact name @@ -136,15 +137,15 @@ endif # 3 endif define MSG_PLATFORM -No platform matched pattern '$(DEVICE)'. +No platform matched pattern '$(PLATFORM)'. Available platforms are: $(XPLATFORMS) -To add more platform directories, set the PLATFORM_REPO_PATHS variable or point DEVICE variable to the full path of platform .xpfm file. +To add more platform directories, set the PLATFORM_REPO_PATHS variable or point PLATFORM variable to the full path of platform .xpfm file. endef export MSG_PLATFORM define MSG_DEVICE More than one platform matched: $(XPLATFORM) -Please set DEVICE variable more accurately to select only one platform file, or set DEVICE variable to the full path of the platform .xpfm file. +Please set PLATFORM variable more accurately to select only one platform file, or set PLATFORM variable to the full path of the platform .xpfm file. endef export MSG_DEVICE @@ -178,6 +179,13 @@ endif # XPART # MK_INC_END vitis_set_part.mk # MK_INC_BEGIN hls_test_rules.mk +# + +gen_instances: $(INSTANCE_FILES) + @echo "Nothing to generate." + +valid_params: + @echo "Nothing to validate." .PHONY: run setup runhls clean cleanall check @@ -216,7 +224,7 @@ endif data: @true -run: data setup runhls +run: gen_instances data setup runhls setup: | check_part @rm -f ./settings.tcl @@ -239,7 +247,7 @@ runhls: data setup | check_vivado check_vpp $(HLS) -f run_hls.tcl; clean: - rm -rf settings.tcl *_hls.log propagate_RTM_x28_y36_z20_t_p2_test.prj + rm -rf settings.tcl *_hls.log propagate_RTM_x28_y36_z20_t_p2_test.prj $(INSTANCE_FILES) # Used by Jenkins test cleanall: clean diff --git a/hpc/L2/benchmarks/cg_gemv_jacobi/Readme.md b/hpc/L2/benchmarks/cg_gemv_jacobi/Readme.md index 29c4fa92e2..bdca5c1349 100644 --- a/hpc/L2/benchmarks/cg_gemv_jacobi/Readme.md +++ b/hpc/L2/benchmarks/cg_gemv_jacobi/Readme.md @@ -15,7 +15,7 @@ Please follow the page [Benchmark Overview](../) to correctly setup the environm With the following commands, kernel bitstream `cgSolver.xclbin ` is built under the directory `./build_dir.hw.xilinx_u50_gen3x16_xdma_201920_3` ``` -$ make build TARGET=hw DEVICE=xilinx_u50_gen3x16_xdma_201920_3 +$ make build TARGET=hw PLATFORM=xilinx_u50_gen3x16_xdma_201920_3 ``` ### Prepare Data (Step 3) @@ -32,7 +32,7 @@ Here states the principle of how it works. With the following commands with giv Matrix `A` and vector `b` are used as inputs for the solver, and vector `x` is used as the golden reference. ``` -$ make data_gen TARGET=hw DEVICE=xilinx_u50_gen3x16_xdma_201920_3 N=1024 +$ make data_gen TARGET=hw PLATFORM=xilinx_u50_gen3x16_xdma_201920_3 N=1024 ``` where `N` is the vector size and must be multiple of 16. @@ -59,7 +59,7 @@ $ xbutil scan If you decide to use randomly generated data for benchmark in step 3, you could skip that step and run the following command with given vector size `N`, e.g. 1024 and maximum number of iterations for the solver e.g. 100. ``` -$ make run TARGET=hw DEVICE=xilinx_u50_gen3x16_xdma_201920_3 N=1024 maxIter=100 +$ make run TARGET=hw PLATFORM=xilinx_u50_gen3x16_xdma_201920_3 N=1024 maxIter=100 ``` Here lists the configurable parameters with the `make` command for the benchmark. @@ -115,5 +115,5 @@ FPGA Hardware Information Power data could be obtained by ``` -$ xbutil top -d +$ xbutil top -d ``` diff --git a/hpc/L2/benchmarks/cg_spmv_jacobi/Readme.md b/hpc/L2/benchmarks/cg_spmv_jacobi/Readme.md index 1a9aed758a..b35bf083df 100644 --- a/hpc/L2/benchmarks/cg_spmv_jacobi/Readme.md +++ b/hpc/L2/benchmarks/cg_spmv_jacobi/Readme.md @@ -13,7 +13,7 @@ Before starting to build the project, follow the page [Benchmark Overview](../) With the following commands, kernel bitstream `cgSolver.xclbin ` is built under the directory `./build_dir.hw.xilinx_u280_xdma_201920_3` ``` -$ make build TARGET=hw DEVICE=xilinx_u280_xdma_201920_3 +$ make build TARGET=hw PLATFORM=xilinx_u280_xdma_201920_3 ``` ### Prepare Data @@ -21,7 +21,7 @@ $ make build TARGET=hw DEVICE=xilinx_u280_xdma_201920_3 Here is a list of the URLs of **SPD** sparse matrices in the file `test.txt`. All these sparse matrices are from [SuiteSparse Matrix Collection](https://sparse.tamu.edu/). Users could add more links or trim the existing links in the file. With the following command, these matrices listed in the `test.txt` file are download from the given links and then are preprocessed. It may take some time to finish the downloading and preprocessing. ``` -$ make data_gen TARGET=hw DEVICE=xilinx_u280_xdma_201920_3 +$ make data_gen TARGET=hw PLATFORM=xilinx_u280_xdma_201920_3 ``` ### Run on FPGA @@ -38,7 +38,7 @@ $ xbutil scan With the following command, users could benchmark the CG solver with a given matrix. ``` -$ make run TARGET=hw DEVICE=xilinx_u280_xdma_201920_3 mtxName=ted_B +$ make run TARGET=hw PLATFORM=xilinx_u280_xdma_201920_3 mtxName=ted_B ``` Here lists the configurable parameters with the `make` command for the benchmark. diff --git a/hpc/L2/tests/Readme.md b/hpc/L2/tests/Readme.md index d2e5ed5270..c8df0740c8 100644 --- a/hpc/L2/tests/Readme.md +++ b/hpc/L2/tests/Readme.md @@ -27,7 +27,7 @@ For large dataset (as large as the Pluto model): Build bitstream ``` - make build TARGET=hw DEVICE=xilinx_u280_xdma_201920_1 + make build TARGET=hw PLATFORM=xilinx_u280_xdma_201920_1 ``` Shell xilinx_u280_xdma_201920_1 is installed on Nimbix. diff --git a/hpc/L2/tests/mlp/fcn_1CU/description.json b/hpc/L2/tests/mlp/fcn_1CU/description.json index 167c509023..13723a8353 100644 --- a/hpc/L2/tests/mlp/fcn_1CU/description.json +++ b/hpc/L2/tests/mlp/fcn_1CU/description.json @@ -89,7 +89,7 @@ "env": "", "cmd": "", "max_memory_MB": { - "vitis_hw_build": 40960, + "vitis_hw_build": 51200, "vitis_hw_emu": 32768, "vitis_sw_emu": 32768, "vitis_hw_run": 32768 diff --git a/hpc/L2/tests/rtm2d/rtm/tests/dataset_h128_w128_t10_s1/Makefile b/hpc/L2/tests/rtm2d/rtm/tests/dataset_h128_w128_t10_s1/Makefile index 6e8e198ce6..fcdf1f3d15 100644 --- a/hpc/L2/tests/rtm2d/rtm/tests/dataset_h128_w128_t10_s1/Makefile +++ b/hpc/L2/tests/rtm2d/rtm/tests/dataset_h128_w128_t10_s1/Makefile @@ -142,23 +142,23 @@ VPP_FLAGS += -I $(XFLIB_DIR)/L1/include/hw -I $(XFLIB_DIR)/L2/include/hw/rtm2d/ ######################### binary container global settings ########################## ifneq (,$(shell echo $(XPLATFORM) | awk '/u280/')) -VPP_FLAGS_rtmforward += --hls.clock 300000000:rtmforward -VPP_FLAGS_rtmbackward += --hls.clock 300000000:rtmbackward +VPP_FLAGS_rtmforward += --hls.clock 200000000:rtmforward +VPP_FLAGS_rtmbackward += --hls.clock 200000000:rtmbackward ifneq ($(HOST_ARCH_temp), x86) -VPP_LDFLAGS_rtm += --clock.defaultFreqHz 300000000 +VPP_LDFLAGS_rtm += --clock.defaultFreqHz 200000000 else -VPP_LDFLAGS_rtm += --kernel_frequency 300 +VPP_LDFLAGS_rtm += --kernel_frequency 200 endif VPP_LDFLAGS_rtm_temp := --config $(CUR_DIR)/conn_u280.cfg VPP_LDFLAGS_rtm += $(VPP_LDFLAGS_rtm_temp) else -VPP_FLAGS_rtmforward += --hls.clock 300000000:rtmforward -VPP_FLAGS_rtmbackward += --hls.clock 300000000:rtmbackward +VPP_FLAGS_rtmforward += --hls.clock 200000000:rtmforward +VPP_FLAGS_rtmbackward += --hls.clock 200000000:rtmbackward ifneq ($(HOST_ARCH_temp), x86) -VPP_LDFLAGS_rtm += --clock.defaultFreqHz 300000000 +VPP_LDFLAGS_rtm += --clock.defaultFreqHz 100000000 else -VPP_LDFLAGS_rtm += --kernel_frequency 300 +VPP_LDFLAGS_rtm += --kernel_frequency 200 endif VPP_LDFLAGS_rtm_temp := --config opts.cfg VPP_LDFLAGS_rtm += $(VPP_LDFLAGS_rtm_temp) @@ -346,4 +346,4 @@ cleanall: cleanh cleank -$(RMDIR) $(CUR_DIR)/Work $(CUR_DIR)/*.xpe $(CUR_DIR)/hw.o $(CUR_DIR)/*.xsa $(CUR_DIR)/xnwOut -$(RMDIR) -clean: cleanh \ No newline at end of file +clean: cleanh diff --git a/hpc/L2/tests/rtm2d/rtm/tests/dataset_h128_w128_t10_s1/description.json b/hpc/L2/tests/rtm2d/rtm/tests/dataset_h128_w128_t10_s1/description.json index 799339b697..775aa7241e 100644 --- a/hpc/L2/tests/rtm2d/rtm/tests/dataset_h128_w128_t10_s1/description.json +++ b/hpc/L2/tests/rtm2d/rtm/tests/dataset_h128_w128_t10_s1/description.json @@ -81,7 +81,7 @@ { "name": "rtm", "ldclflags": "--config opts.cfg", - "frequency": 300, + "frequency": 250, "accelerators": [ { "name": "rtmforward", @@ -105,7 +105,7 @@ "env": "", "cmd": "", "max_memory_MB": { - "vitis_hw_build": 46080, + "vitis_hw_build": 51200, "vitis_hw_emu": 28672, "vitis_sw_emu": 10240, "vitis_hw_run": 10240 diff --git a/hpc/L2/tests/rtm2d/rtmforward/tests/dataset_h128_w128_t10/description.json b/hpc/L2/tests/rtm2d/rtmforward/tests/dataset_h128_w128_t10/description.json index bad5d0644f..34048ed6c0 100644 --- a/hpc/L2/tests/rtm2d/rtmforward/tests/dataset_h128_w128_t10/description.json +++ b/hpc/L2/tests/rtm2d/rtmforward/tests/dataset_h128_w128_t10/description.json @@ -91,7 +91,7 @@ "env": "", "cmd": "", "max_memory_MB": { - "vitis_hw_build": 40960, + "vitis_hw_build": 51200, "vitis_hw_emu": 28672, "vitis_sw_emu": 10240, "vitis_hw_run": 10240 diff --git a/hpc/L2/tests/rtm3d/rtmforward_Domain_RBC/tests/dataset_z90_y60_x80_t4/Makefile b/hpc/L2/tests/rtm3d/rtmforward_Domain_RBC/tests/dataset_z90_y60_x80_t4/Makefile index 8759b4342b..ae36af9417 100755 --- a/hpc/L2/tests/rtm3d/rtmforward_Domain_RBC/tests/dataset_z90_y60_x80_t4/Makefile +++ b/hpc/L2/tests/rtm3d/rtmforward_Domain_RBC/tests/dataset_z90_y60_x80_t4/Makefile @@ -149,11 +149,11 @@ VPP_FLAGS += -I $(XFLIB_DIR)/L1/include/hw -I $(XFLIB_DIR)/L2/include/hw/ -I $( endif ######################### binary container global settings ########################## -VPP_FLAGS_rtmforward += --hls.clock 300000000:rtmforward +VPP_FLAGS_rtmforward += --hls.clock 200000000:rtmforward ifneq ($(HOST_ARCH_temp), x86) -VPP_LDFLAGS_rtmforward += --clock.defaultFreqHz 200000000 +VPP_LDFLAGS_rtmforward += --clock.defaultFreqHz 150000000 else -VPP_LDFLAGS_rtmforward += --kernel_frequency 200 +VPP_LDFLAGS_rtmforward += --kernel_frequency 150 endif VPP_LDFLAGS_rtmforward_temp := --config opts.cfg VPP_LDFLAGS_rtmforward += $(VPP_LDFLAGS_rtmforward_temp) @@ -335,4 +335,4 @@ cleanall: cleanh cleank -$(RMDIR) $(CUR_DIR)/Work $(CUR_DIR)/*.xpe $(CUR_DIR)/hw.o $(CUR_DIR)/*.xsa $(CUR_DIR)/xnwOut -$(RMDIR) -clean: cleanh \ No newline at end of file +clean: cleanh diff --git a/hpc/README.md b/hpc/README.md index 65bdc468d1..b7584c0d4b 100644 --- a/hpc/README.md +++ b/hpc/README.md @@ -82,7 +82,7 @@ Setup and build envrionment using the Vitis and XRT scripts: ```console cd L1/tests/hls_case_folder -make run CSIM=1 CSYNTH=1 COSIM=1 DEVICE= PLATFORM_REPO_PATHS= +make run CSIM=1 CSYNTH=1 COSIM=1 PLATFORM= PLATFORM_REPO_PATHS= ``` Test control variables are: @@ -98,7 +98,7 @@ Test control variables are: ```console cd L2/tests/vitis_case_folder -make run TARGET= DEVICE= PLATFORM_REPO_PATHS= +make run TARGET= PLATFORM= PLATFORM_REPO_PATHS= # delete generated files make cleanall @@ -109,7 +109,7 @@ make cleanall ```console cd L3/tests/vitis_case_folder -make run TARGET= DEVICE= PLATFORM_REPO_PATHS= +make run TARGET= PLATFORM= PLATFORM_REPO_PATHS= # delete generated files make cleanall diff --git a/hpc/docs/src/user_guide/L1/L1_test.rst b/hpc/docs/src/user_guide/L1/L1_test.rst index 77cfb3e280..2df832af92 100644 --- a/hpc/docs/src/user_guide/L1/L1_test.rst +++ b/hpc/docs/src/user_guide/L1/L1_test.rst @@ -58,16 +58,16 @@ Makefile usage example: .. code-block:: bash - make run CSIM=1 CSYNTH=1 COSIM=1 DEVICE= PLATFORM_REPO_PATHS= + make run CSIM=1 CSYNTH=1 COSIM=1 PLATFORM= PLATFORM_REPO_PATHS= Command to run the selected tasks for specified device. Valid tasks are 'CSIM', 'CSYNTH', 'COSIM', 'VIVADO_SYN', 'VIVADO_IMPL'. 'PLATFORM_REPO_PATHS' variable is used to specify the paths in which the platform files will be searched for. -'DEVICE' is case-insensitive and support awk regex. For example: +'PLATFORM' is case-insensitive and support awk regex. For example: .. code-block:: bash - make run DEVICE='u280.*xdma' COSIM=1 + make run PLATFORM='u280.*xdma' COSIM=1 It can also be an absolute path to a platform file. diff --git a/hpc/docs/src/user_guide/L2/benchmark/cg_gemv_jacobi.rst b/hpc/docs/src/user_guide/L2/benchmark/cg_gemv_jacobi.rst index 4d1ef252fb..f9850b2ab8 100644 --- a/hpc/docs/src/user_guide/L2/benchmark/cg_gemv_jacobi.rst +++ b/hpc/docs/src/user_guide/L2/benchmark/cg_gemv_jacobi.rst @@ -37,7 +37,7 @@ With the following commands, kernel bitstream *cgSolver.xclbin* is built under t .. code-block:: bash - $ make build TARGET=hw DEVICE=xilinx_u50_gen3x16_xdma_201920_3 + $ make build TARGET=hw PLATFORM=xilinx_u50_gen3x16_xdma_201920_3 Prepare Data (Step 3) ****************************** @@ -56,7 +56,7 @@ Matrix *A* and vector *b* are used as inputs for the solver, and vector *x* is u .. code-block:: bash - $ make data_gen TARGET=hw DEVICE=xilinx_u50_gen3x16_xdma_201920_3 N=1024 + $ make data_gen TARGET=hw PLATFORM=xilinx_u50_gen3x16_xdma_201920_3 N=1024 where *N* is the vector size and must be multiple of 16. @@ -89,7 +89,7 @@ If you decide to use randomly generated data for benchmark in step 3, you could .. code-block:: bash - $ make run TARGET=hw DEVICE=xilinx_u50_gen3x16_xdma_201920_3 N=1024 maxIter=100 deviceID=0 + $ make run TARGET=hw PLATFORM=xilinx_u50_gen3x16_xdma_201920_3 N=1024 maxIter=100 deviceID=0 Here lists the configurable parameters with the *make* command for the benchmark. @@ -181,5 +181,5 @@ Power data could be obtained by .. code-block:: bash - $ xbutil top -d + $ xbutil top -d diff --git a/hpc/docs/src/user_guide/L2/benchmark/cg_spmv_jacobi.rst b/hpc/docs/src/user_guide/L2/benchmark/cg_spmv_jacobi.rst index 4db70751ba..264d2db703 100644 --- a/hpc/docs/src/user_guide/L2/benchmark/cg_spmv_jacobi.rst +++ b/hpc/docs/src/user_guide/L2/benchmark/cg_spmv_jacobi.rst @@ -37,7 +37,7 @@ With the following commands, kernel bitstream *cgSolver.xclbin * is built under .. code-block:: bash - $ make build TARGET=hw DEVICE=xilinx_u280_xdma_201920_3 + $ make build TARGET=hw PLATFORM=xilinx_u280_xdma_201920_3 Prepare Data (Step 3) *********************** @@ -46,7 +46,7 @@ Here is a list of the URLs of **SPD** sparse matrices in the file *test.txt*. Al .. code-block:: bash - $ make data_gen TARGET=hw DEVICE=xilinx_u280_xdma_201920_3 + $ make data_gen TARGET=hw PLATFORM=xilinx_u280_xdma_201920_3 Run on FPGA (Step 4) ******************** @@ -67,7 +67,7 @@ With the following command, users could benchmark the CG solver with a given mat .. code-block:: bash - $ make run TARGET=hw DEVICE=xilinx_u280_xdma_201920_3 mtxName=ted_B + $ make run TARGET=hw PLATFORM=xilinx_u280_xdma_201920_3 mtxName=ted_B Here lists the configurable parameters with the *make* command for the benchmark.