Squashed 'utils' changes from f43b781..9361096 (#842)

9361096 Merge pull request Xilinx#310 from liyuanz/update_makefile_hls b36d9fa update 742c178 Merge pull request Xilinx#308 from liyuanz/update_makefile f9cc67a update makefile 269d83d Fix wrong buffer size in HLS tb (Xilinx#307) 6edd579 Add warning to headers; add notice in doc (Xilinx#306) ba4ca8b Merge pull request Xilinx#305 from liyuanz/add_memory2 15ffcdc update Co-authored-by: sdausr <[email protected]>
CRTejaswi · Apr 26, 2023 · 005095a · 005095a
1 parent c8e2afd
commit 005095a
Show file tree

Hide file tree

Showing 144 changed files with 2,383 additions and 2,001 deletions.
diff --git a/utils/L1/examples/load_balance_processing/Makefile b/utils/L1/examples/load_balance_processing/Makefile
@@ -1,5 +1,5 @@
-#
-# Copyright 2019-2020 Xilinx, Inc.
+# Copyright (C) 2019-2022, Xilinx, Inc.
+# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
+# vitis hls makefile-generator v2.0.0
 
 MK_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
 CUR_DIR := $(patsubst %/,%,$(dir $(MK_PATH)))
@@ -61,7 +61,7 @@ export PATH := $(XILINX_VIVADO)/bin:$(PATH)
 
 # MK_INC_END vivado.mk
 
-DEVICE ?= u200
+PLATFORM ?= xilinx_u200_gen3x16_xdma_2_202110_1
 
 # MK_INC_BEGIN vitis_set_part.mk
 
@@ -116,12 +116,21 @@ endif # 1.2
 endif # 1
 # 2. search Vitis installation
 ifeq (,$(XPLATFORM))
-# 2.1 as exact name
+# 2.1 as exact name vitis < 2022.2
 XPLATFORM := $(strip $(wildcard $(XILINX_VITIS)/platforms/$(DEVICE_L)/$(DEVICE_L).xpfm))
-# 2.2 as a pattern
+ifeq (,$(XPLATFORM))
+# 2.2 as exact name vitis >= 2022.2
+XPLATFORM := $(strip $(wildcard $(XILINX_VITIS)/base_platforms/$(DEVICE_L)/$(DEVICE_L).xpfm))
+# 2.3 as a pattern vitis < 2022.2
 ifeq (,$(XPLATFORM))
 XPLATFORMS := $(wildcard $(XILINX_VITIS)/platforms/*/*.xpfm)
 XPLATFORM := $(strip $(foreach p, $(XPLATFORMS), $(shell echo $(p) | awk '$$1 ~ /$(DEVICE_L)/')))
+# 2.4 as a pattern vitis > 2022.2
+ifeq (,$(XPLATFORM))
+XPLATFORMS := $(wildcard $(XILINX_VITIS)/base_platforms/*/*.xpfm)
+XPLATFORM := $(strip $(foreach p, $(XPLATFORMS), $(shell echo $(p) | awk '$$1 ~ /$(DEVICE_L)/')))
+endif # 2.4
+endif # 2.3
 endif # 2.2
 endif # 2
 # 3. search default locations

diff --git a/utils/L1/examples/load_balance_processing/run_hls.tcl b/utils/L1/examples/load_balance_processing/run_hls.tcl
@@ -1,5 +1,5 @@
-#
-# Copyright 2019 Xilinx, Inc.
+# Copyright (C) 2019-2022, Xilinx, Inc.
+# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
+# vitis hls makefile-generator v2.0.0
 
 source settings.tcl
 
@@ -33,7 +33,6 @@ open_solution -reset $SOLN
 
 
 
-
 set_part $XPART
 create_clock -period $CLKP
 

diff --git a/utils/L1/examples/multi_pu_kernel/Makefile b/utils/L1/examples/multi_pu_kernel/Makefile
@@ -1,5 +1,5 @@
-#
-# Copyright 2019-2020 Xilinx, Inc.
+# Copyright (C) 2019-2022, Xilinx, Inc.
+# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
+# vitis hls makefile-generator v2.0.0
 
 MK_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
 CUR_DIR := $(patsubst %/,%,$(dir $(MK_PATH)))
@@ -61,7 +61,7 @@ export PATH := $(XILINX_VIVADO)/bin:$(PATH)
 
 # MK_INC_END vivado.mk
 
-DEVICE ?= u200
+PLATFORM ?= xilinx_u200_gen3x16_xdma_2_202110_1
 
 # MK_INC_BEGIN vitis_set_part.mk
 
@@ -116,12 +116,21 @@ endif # 1.2
 endif # 1
 # 2. search Vitis installation
 ifeq (,$(XPLATFORM))
-# 2.1 as exact name
+# 2.1 as exact name vitis < 2022.2
 XPLATFORM := $(strip $(wildcard $(XILINX_VITIS)/platforms/$(DEVICE_L)/$(DEVICE_L).xpfm))
-# 2.2 as a pattern
+ifeq (,$(XPLATFORM))
+# 2.2 as exact name vitis >= 2022.2
+XPLATFORM := $(strip $(wildcard $(XILINX_VITIS)/base_platforms/$(DEVICE_L)/$(DEVICE_L).xpfm))
+# 2.3 as a pattern vitis < 2022.2
 ifeq (,$(XPLATFORM))
 XPLATFORMS := $(wildcard $(XILINX_VITIS)/platforms/*/*.xpfm)
 XPLATFORM := $(strip $(foreach p, $(XPLATFORMS), $(shell echo $(p) | awk '$$1 ~ /$(DEVICE_L)/')))
+# 2.4 as a pattern vitis > 2022.2
+ifeq (,$(XPLATFORM))
+XPLATFORMS := $(wildcard $(XILINX_VITIS)/base_platforms/*/*.xpfm)
+XPLATFORM := $(strip $(foreach p, $(XPLATFORMS), $(shell echo $(p) | awk '$$1 ~ /$(DEVICE_L)/')))
+endif # 2.4
+endif # 2.3
 endif # 2.2
 endif # 2
 # 3. search default locations

diff --git a/utils/L1/examples/multi_pu_kernel/run_hls.tcl b/utils/L1/examples/multi_pu_kernel/run_hls.tcl
@@ -1,5 +1,5 @@
-#
-# Copyright 2019 Xilinx, Inc.
+# Copyright (C) 2019-2022, Xilinx, Inc.
+# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
+# vitis hls makefile-generator v2.0.0
 
 source settings.tcl
 
@@ -33,7 +33,6 @@ open_solution -reset $SOLN
 
 
 
-
 set_part $XPART
 create_clock -period $CLKP
 

diff --git a/utils/L1/examples/round_robin_processing/Makefile b/utils/L1/examples/round_robin_processing/Makefile
@@ -1,5 +1,5 @@
-#
-# Copyright 2019-2020 Xilinx, Inc.
+# Copyright (C) 2019-2022, Xilinx, Inc.
+# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
+# vitis hls makefile-generator v2.0.0
 
 MK_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
 CUR_DIR := $(patsubst %/,%,$(dir $(MK_PATH)))
@@ -61,7 +61,7 @@ export PATH := $(XILINX_VIVADO)/bin:$(PATH)
 
 # MK_INC_END vivado.mk
 
-DEVICE ?= u200
+PLATFORM ?= xilinx_u200_gen3x16_xdma_2_202110_1
 
 # MK_INC_BEGIN vitis_set_part.mk
 
@@ -116,12 +116,21 @@ endif # 1.2
 endif # 1
 # 2. search Vitis installation
 ifeq (,$(XPLATFORM))
-# 2.1 as exact name
+# 2.1 as exact name vitis < 2022.2
 XPLATFORM := $(strip $(wildcard $(XILINX_VITIS)/platforms/$(DEVICE_L)/$(DEVICE_L).xpfm))
-# 2.2 as a pattern
+ifeq (,$(XPLATFORM))
+# 2.2 as exact name vitis >= 2022.2
+XPLATFORM := $(strip $(wildcard $(XILINX_VITIS)/base_platforms/$(DEVICE_L)/$(DEVICE_L).xpfm))
+# 2.3 as a pattern vitis < 2022.2
 ifeq (,$(XPLATFORM))
 XPLATFORMS := $(wildcard $(XILINX_VITIS)/platforms/*/*.xpfm)
 XPLATFORM := $(strip $(foreach p, $(XPLATFORMS), $(shell echo $(p) | awk '$$1 ~ /$(DEVICE_L)/')))
+# 2.4 as a pattern vitis > 2022.2
+ifeq (,$(XPLATFORM))
+XPLATFORMS := $(wildcard $(XILINX_VITIS)/base_platforms/*/*.xpfm)
+XPLATFORM := $(strip $(foreach p, $(XPLATFORMS), $(shell echo $(p) | awk '$$1 ~ /$(DEVICE_L)/')))
+endif # 2.4
+endif # 2.3
 endif # 2.2
 endif # 2
 # 3. search default locations

diff --git a/utils/L1/examples/round_robin_processing/run_hls.tcl b/utils/L1/examples/round_robin_processing/run_hls.tcl
@@ -1,5 +1,5 @@
-#
-# Copyright 2019 Xilinx, Inc.
+# Copyright (C) 2019-2022, Xilinx, Inc.
+# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
+# vitis hls makefile-generator v2.0.0
 
 source settings.tcl
 
@@ -33,7 +33,6 @@ open_solution -reset $SOLN
 
 
 
-
 set_part $XPART
 create_clock -period $CLKP
 

diff --git a/utils/L1/examples/tag_select_processing/Makefile b/utils/L1/examples/tag_select_processing/Makefile
@@ -1,5 +1,5 @@
-#
-# Copyright 2019-2020 Xilinx, Inc.
+# Copyright (C) 2019-2022, Xilinx, Inc.
+# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
+# vitis hls makefile-generator v2.0.0
 
 MK_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
 CUR_DIR := $(patsubst %/,%,$(dir $(MK_PATH)))
@@ -61,7 +61,7 @@ export PATH := $(XILINX_VIVADO)/bin:$(PATH)
 
 # MK_INC_END vivado.mk
 
-DEVICE ?= u200
+PLATFORM ?= xilinx_u200_gen3x16_xdma_2_202110_1
 
 # MK_INC_BEGIN vitis_set_part.mk
 
@@ -116,12 +116,21 @@ endif # 1.2
 endif # 1
 # 2. search Vitis installation
 ifeq (,$(XPLATFORM))
-# 2.1 as exact name
+# 2.1 as exact name vitis < 2022.2
 XPLATFORM := $(strip $(wildcard $(XILINX_VITIS)/platforms/$(DEVICE_L)/$(DEVICE_L).xpfm))
-# 2.2 as a pattern
+ifeq (,$(XPLATFORM))
+# 2.2 as exact name vitis >= 2022.2
+XPLATFORM := $(strip $(wildcard $(XILINX_VITIS)/base_platforms/$(DEVICE_L)/$(DEVICE_L).xpfm))
+# 2.3 as a pattern vitis < 2022.2
 ifeq (,$(XPLATFORM))
 XPLATFORMS := $(wildcard $(XILINX_VITIS)/platforms/*/*.xpfm)
 XPLATFORM := $(strip $(foreach p, $(XPLATFORMS), $(shell echo $(p) | awk '$$1 ~ /$(DEVICE_L)/')))
+# 2.4 as a pattern vitis > 2022.2
+ifeq (,$(XPLATFORM))
+XPLATFORMS := $(wildcard $(XILINX_VITIS)/base_platforms/*/*.xpfm)
+XPLATFORM := $(strip $(foreach p, $(XPLATFORMS), $(shell echo $(p) | awk '$$1 ~ /$(DEVICE_L)/')))
+endif # 2.4
+endif # 2.3
 endif # 2.2
 endif # 2
 # 3. search default locations

diff --git a/utils/L1/examples/tag_select_processing/run_hls.tcl b/utils/L1/examples/tag_select_processing/run_hls.tcl
@@ -1,5 +1,5 @@
-#
-# Copyright 2019 Xilinx, Inc.
+# Copyright (C) 2019-2022, Xilinx, Inc.
+# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
+# vitis hls makefile-generator v2.0.0
 
 source settings.tcl
 
@@ -33,7 +33,6 @@ open_solution -reset $SOLN
 
 
 
-
 set_part $XPART
 create_clock -period $CLKP
 

diff --git a/utils/L1/include/hw/xf_datamover/check_stream_with_master.hpp b/utils/L1/include/hw/xf_datamover/check_stream_with_master.hpp
@@ -17,6 +17,11 @@
 #ifndef DATAMOVER_CHECK_STREAM_WITH_MASTER_HPP
 #define DATAMOVER_CHECK_STREAM_WITH_MASTER_HPP
 
+#ifndef WARN_DEPR_UTILS_MOVER
+#define WARN_DEPR_UTILS_MOVER
+#warning Data Mover APIs in Utility Library have been moved to top-level Data Mover Library in 2023.1. Its files would be removed from Utility Library in future release.
+#endif
+
 #include "hls_stream.h"
 #include "ap_axi_sdata.h"
 #include "xf_datamover/types.hpp"

diff --git a/utils/L1/include/hw/xf_datamover/get_count.hpp b/utils/L1/include/hw/xf_datamover/get_count.hpp
@@ -17,6 +17,11 @@
 #ifndef DATAMOVER_GET_COUNTER_HPP
 #define DATAMOVER_GET_COUNTER_HPP
 
+#ifndef WARN_DEPR_UTILS_MOVER
+#define WARN_DEPR_UTILS_MOVER
+#warning Data Mover APIs in Utility Library have been moved to top-level Data Mover Library in 2023.1. Its files would be removed from Utility Library in future release.
+#endif
+
 #include "ap_int.h"
 #include "hls_stream.h"
 

diff --git a/utils/L1/include/hw/xf_datamover/load_master_to_stream.hpp b/utils/L1/include/hw/xf_datamover/load_master_to_stream.hpp
@@ -17,6 +17,11 @@
 #ifndef DATAMOVER_LOAD_MASTER_TO_STREAM_HPP
 #define DATAMOVER_LOAD_MASTER_TO_STREAM_HPP
 
+#ifndef WARN_DEPR_UTILS_MOVER
+#define WARN_DEPR_UTILS_MOVER
+#warning Data Mover APIs in Utility Library have been moved to top-level Data Mover Library in 2023.1. Its files would be removed from Utility Library in future release.
+#endif
+
 #include "ap_int.h"
 #include "ap_axi_sdata.h"
 #include "hls_stream.h"

diff --git a/utils/L1/include/hw/xf_datamover/preloadable_ram.hpp b/utils/L1/include/hw/xf_datamover/preloadable_ram.hpp
@@ -17,6 +17,11 @@
 #ifndef DATAMOVER_PRELOADABLE_RAM_HPP
 #define DATAMOVER_PRELOADABLE_RAM_HPP
 
+#ifndef WARN_DEPR_UTILS_MOVER
+#define WARN_DEPR_UTILS_MOVER
+#warning Data Mover APIs in Utility Library have been moved to top-level Data Mover Library in 2023.1. Its files would be removed from Utility Library in future release.
+#endif
+
 #include "xf_datamover/types.hpp"
 #include "ap_axi_sdata.h"
 #include <hls_stream.h>

diff --git a/utils/L1/include/hw/xf_datamover/read_const.hpp b/utils/L1/include/hw/xf_datamover/read_const.hpp
@@ -17,6 +17,11 @@
 #ifndef DATAMOVER_READ_CONST_HPP
 #define DATAMOVER_READ_CONST_HPP
 
+#ifndef WARN_DEPR_UTILS_MOVER
+#define WARN_DEPR_UTILS_MOVER
+#warning Data Mover APIs in Utility Library have been moved to top-level Data Mover Library in 2023.1. Its files would be removed from Utility Library in future release.
+#endif
+
 #include "xf_datamover/types.hpp"
 #include <hls_stream.h>
 

diff --git a/utils/L1/include/hw/xf_datamover/static_rom.hpp b/utils/L1/include/hw/xf_datamover/static_rom.hpp
@@ -17,6 +17,11 @@
 #ifndef DATAMOVER_STATIC_ROM_HPP
 #define DATAMOVER_STATIC_ROM_HPP
 
+#ifndef WARN_DEPR_UTILS_MOVER
+#define WARN_DEPR_UTILS_MOVER
+#warning Data Mover APIs in Utility Library have been moved to top-level Data Mover Library in 2023.1. Its files would be removed from Utility Library in future release.
+#endif
+
 #include "xf_datamover/types.hpp"
 #include "ap_axi_sdata.h"
 #include <hls_stream.h>

diff --git a/utils/L1/include/hw/xf_datamover/store_stream_to_master.hpp b/utils/L1/include/hw/xf_datamover/store_stream_to_master.hpp
@@ -17,6 +17,11 @@
 #ifndef DATAMOVER_STORE_STREAM_TO_MASTER_HPP
 #define DATAMOVER_STORE_STREAM_TO_MASTER_HPP
 
+#ifndef WARN_DEPR_UTILS_MOVER
+#define WARN_DEPR_UTILS_MOVER
+#warning Data Mover APIs in Utility Library have been moved to top-level Data Mover Library in 2023.1. Its files would be removed from Utility Library in future release.
+#endif
+
 #include "ap_int.h"
 #include "ap_axi_sdata.h"
 #include "hls_stream.h"

diff --git a/utils/L1/include/hw/xf_datamover/types.hpp b/utils/L1/include/hw/xf_datamover/types.hpp
@@ -17,6 +17,11 @@
 #ifndef DATAMOVER_TYPES_HPP
 #define DATAMOVER_TYPES_HPP
 
+#ifndef WARN_DEPR_UTILS_MOVER
+#define WARN_DEPR_UTILS_MOVER
+#warning Data Mover APIs in Utility Library have been moved to top-level Data Mover Library in 2023.1. Its files would be removed from Utility Library in future release.
+#endif
+
 #include <ap_int.h>
 #include <stdint.h>