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 <[email protected]>
Xilinx · Mar 29, 2023 · bec1cae · bec1cae
1 parent f5602d4
commit bec1cae
Show file tree

Hide file tree

Showing 26 changed files with 347 additions and 235 deletions.
diff --git 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=<FPGA platform> PLATFORM_REPO_PATHS=<path to platform directories>"
+	@echo "  make run CSIM=1 CSYNTH=1 COSIM=1 PLATFORM=<FPGA platform> PLATFORM_REPO_PATHS=<path to platform directories>"
 	@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=<FPGA part name>"
 	@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
@@ -26,13 +26,13 @@ help::
 	@echo ""
 	@echo "Makefile Usage:"
 	@echo ""
-	@echo "  make run CSIM=1 CSYNTH=1 COSIM=1 DEVICE=<FPGA platform> PLATFORM_REPO_PATHS=<path to platform directories>"
+	@echo "  make run CSIM=1 CSYNTH=1 COSIM=1 PLATFORM=<FPGA platform> PLATFORM_REPO_PATHS=<path to platform directories>"
 	@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=<FPGA part name>"
 	@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
@@ -26,13 +26,13 @@ help::
 	@echo ""
 	@echo "Makefile Usage:"
 	@echo ""
-	@echo "  make run CSIM=1 CSYNTH=1 COSIM=1 DEVICE=<FPGA platform> PLATFORM_REPO_PATHS=<path to platform directories>"
+	@echo "  make run CSIM=1 CSYNTH=1 COSIM=1 PLATFORM=<FPGA platform> PLATFORM_REPO_PATHS=<path to platform directories>"
 	@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=<FPGA part name>"
 	@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