Squashed 'dsp' changes from 31507fe..fb5b006 (#828)

fb5b006 Merge pull request #685 from mlechtan/next
c6ac016 Updating DDS benchmark - moving AIE_VARIANT to front
b739dde Updating benchmark csvs
b56ad46 Merge pull request #682 from gordono/next
77a46dc Merge pull request #684 from mlechtan/next
e202993 Fixing Sym FIRs meta window size validation.
77d1711 Fixing FFT meta point size validation
d2e169b Fixing helper make wrt io buffer inputs in SSR mode
224df3b Merge pull request #683 from wesleyl/next
37ea0fd Set max input window size to 2^31-2 for Stream FIR blocks
3b524c9 adding chess_memory_fence to prevent lockup in FFT ML parallel dynamic mode
ede7053 Merge pull request #679 from wesleyl/next
73d3cda Merge pull request #680 from liyuanz/update_makefile
a07fd4c update
4310811 Added checks to make sure parallel power is valid
175501e Merge pull request #675 from mlechtan/next
10cc4bf Merge pull request #671 from gordono/next
12ec71f Updating message for FFT cascade meta check
6942635 Tsetbench update for AIE-ML cases
caadb2f Reducing window sizefor testcases targeting AIE-ML streaming interfaces
628b582 Regen Makefiles
5dbd39a Fixing meta constraint related to window size in SSR mode.
ec6a492 Restoring scripts comments
c075093 Updating docs wrt rebranding.
89e601e Merge pull request #674 from wesleyl/next
aad0540 Updated FFT maximum cascade length on vmc to reflect changes in low level validator
428dcf9 Merge pull request #672 from mlechtan/next
73fda24 Merge pull request #673 from changg/fix_copyright
e18c293 fix copyright
98926e8 Merge pull request #665 from uvimalku/AIEML-QOR-Updates
72430a1 Rewording static_assert to avoid doxygen parsing issue.
c15f9e6 Adding missing doxygen comments
24efc83 Rebranding updates
0ed8b0b Docs formatting updates.
fe8e248 FFT AIE-ML Qor Improvement by rewriting casc/stream to window functions for 256b granularity
838c3d3 Merge pull request #666 from gordono/next
1d05de0 Merge branch 'FaaSApps:next' into next
1d5146d Merge pull request #668 from mlechtan/desciption_update
ece77f1 Merge pull request #669 from mlechtan/next
49a1c60 Merge pull request #670 from liyuanz/remove_stacksize
1910929 update
293fe85 Rewording static_assert to avoid doxygen parsing issue.
942344f revert dds mixer lanes
04664f3 Reinstating testinfo params
070de91 Removing superfluous empty params
b2e39f5 Removing superfluous stacksize param
4409b94 Merge pull request #667 from mlechtan/next
b0cd097 Updating description fields in json files
6aaf13a Fix for FIR Dec Asym incorrect arch selection.
b7ebc90 opening up TP_CASC_LEN limit on FFT to allow fully piped max length cfloat
3a966a6 extending fft metadata check for TP_CASC_LEN to accommodate TP_PARALLEL_POWER
fc99988 AIE-ML change register widths
cf36321 Merge pull request #664 from liyuanz/next
bc31298 Merge pull request #660 from FaaSApps/delete_obsolete_files
d27f645 Merge pull request #663 from wesleyl/next
48e0266 update
22f6c83 update
b86a313 update
7f1a7cc update
fea5160 Merge branch 'next' of https://gitenterprise.xilinx.com/wesleyl/xf_dsp into next
28a513a Merge pull request #662 from mlechtan/next
3701326 Formatting FIR benchmark table
e870960 Merge pull request #661 from mlechtan/next
44ea0ab Updating README
1c73373 Merge pull request #659 from uvimalku/aie-ml_perf
0d55604 Delete utils.hpp
e7777f5 Merge pull request #641 from uvimalku/dds_lut_stacksize_upd
39512cb update float numlanes
91510dd cleanup
a87ce3d Update max casc_len to 40 in VMC FIR JSON files
45ee90d fifo updates for AIE-ML firs
f274c36 revert diff script call
41f5654 Merge pull request #657 from mlechtan/copyright_update
e9f849f Merge pull request #658 from mlechtan/next
c462d2a Updating Copyright notice
4b1983e Updating Copyright notice formatting
e3269b7 Merge branch 'next' of https://gitenterprise.xilinx.com/mlechtan/xf_dsp into next
8e7423a Updating Copyright notice
836b94f Merge pull request #656 from mlechtan/next
be9524b Merge branch 'next' of https://gitenterprise.xilinx.com/mlechtan/xf_dsp into next
2b01d89 Merge pull request #653 from mlechtan/next
b2c9216 Add device freq to benchmark.rst (#655)
78e389b Merge pull request #654 from liyuanz/add_m
7725951 update
b79f1b7 Docs fomatting fixes.
0fcd05b Updating FIR Graph's description wrt rounding modes. Recommendation to use define macros instead literal values.
c76013e Expanding support for AIE-ML specific rounding modes.
e85ba31 Add device freq to benchmark.rst (#652)
282d2ab Merge pull request #650 from wesleyl/next
79c5599 Merge pull request #649 from mlechtan/next
9f05a52 Merge pull request #651 from liyuanz/next
86a8fc5 update
fcd733a change to percent tolerance mode for dds_mixer
9ead7e5 Fixed CR_1158517 and CR_1111857 - DDS and DDS stream json file has been updated
a152065 Docs formatting fixes
c951080 Fixing FIR length meta checks for symmteric FIRs
94f7227 update call to helper.mk
376db40 Merge pull request #648 from mlechtan/fft_window_fns_docs
3989b92 Merge pull request #647 from mlechtan/next
287dfa8 Removing superfluous doxygen comment
b93555c Fixing FIR docs. Table misalignment.
16f1d87 update call to helper.mk
64c4255 Merge pull request #646 from gordono/next
c6f934d Merge branch 'next' into next
789676b Merge pull request #645 from mlechtan/release_notes
b702533 Updating release notes with FIR Resampler SSR comment
77a57b0 Update func-fft.rst
701b413 Listing FIRs supported modes
5be4373 fix for cint32 dynamic error handling
5b90102 UTypo fix
290cba7 Updating release notes for 2023.1
57a4da8 Merge pull request #642 from mlechtan/meta_fixes
b050387 Merge pull request #643 from berry/new_doc_branch
fc0680f helper.mk updates
1d47317 docs fixes
96ffcbe Removing debug
8fd36fe Fixing Interpolation FIRs Max length checks
e61cbae dds lut updates for stacksize
b495c5a Fixing FIR length meta check

Co-authored-by: sdausr <[email protected]>

dsp/L1/examples/1Dfix_impluse/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

dsp/L1/examples/1Dfix_impluse/run_hls.tcl

@@ -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
 
 source settings.tcl
 
@@ -33,7 +33,6 @@ open_solution -reset $SOLN
 
 
 
-
 set_part $XPART
 create_clock -period $CLKP
 

dsp/L1/examples/1Dfloat_impluse/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

dsp/L1/examples/1Dfloat_impluse/description.json

@@ -43,7 +43,7 @@
                     "vivado_syn": 40960, 
                     "hls_csim": 10240, 
                     "hls_cosim": 16384, 
-                    "vivado_impl": 16384, 
+                    "vivado_impl": 32768, 
                     "hls_csynth": 10240
                 }, 
                 "max_time_min": {

dsp/L1/examples/1Dfloat_impluse/run_hls.tcl

@@ -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
 
 source settings.tcl
 
@@ -33,7 +33,6 @@ open_solution -reset $SOLN
 
 
 
-
 set_part $XPART
 create_clock -period $CLKP
 

dsp/L1/examples/2Dfix_impulse/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

dsp/L1/examples/2Dfix_impulse/run_hls.tcl

@@ -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
 
 source settings.tcl
 
@@ -33,7 +33,6 @@ open_solution -reset $SOLN
 
 
 
-
 set_part $XPART
 create_clock -period $CLKP
 

dsp/L1/examples/2Dfloat_impluse/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

dsp/L1/examples/2Dfloat_impluse/run_hls.tcl

@@ -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
 
 source settings.tcl
 
@@ -33,7 +33,6 @@ open_solution -reset $SOLN
 
 
 
-
 set_part $XPART
 create_clock -period $CLKP
 

dsp/L1/include/aie/dds_luts.h

@@ -1,5 +1,7 @@
 /*
- * Copyright 2022 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.
  * You may obtain a copy of the License at

dsp/L1/include/aie/dds_luts_floats.h

@@ -1,5 +1,7 @@
 /*
- * Copyright 2022 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.
  * You may obtain a copy of the License at

dsp/L1/include/aie/dds_mixer.hpp

@@ -1,5 +1,7 @@
 /*
- * Copyright 2022 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.
  * You may obtain a copy of the License at
@@ -63,8 +65,7 @@ class kernelDdsMixerClass {
     // 0 = rnd_floor, 1 = rnd_ceil, 2 = rnd_pos_inf, 3 = rnd_neg_inf, 4 = rnd_sym_inf, 5 = rnd_sym_zero, 6 =
     // rnd_conv_even, 7 = rnd_conv_odd
     static constexpr unsigned int kRoundMode = 0; // mode used in point designs.
-    static constexpr unsigned int m_kNumLanes = TP_API == 0 ? ddsMulVecScalarLanes<TT_DATA, USE_INBUILT_SINCOS>()
-                                                            : ddsMulVecScalarLanesStream<TT_DATA, USE_INBUILT_SINCOS>();
+    static constexpr unsigned int m_kNumLanes = ddsMulVecScalarLanes<TT_DATA, USE_INBUILT_SINCOS>();
     static constexpr unsigned int m_kDOutEachLoop = m_kNumLanes;
 #if __SUPPORTS_CFLOAT__ == 1
     static constexpr unsigned int m_kDdsShift = std::is_same<TT_DATA, cfloat>::value ? 0 : 15;
@@ -120,9 +121,7 @@ class kernelDdsMixerClass<TT_DATA, TP_INPUT_WINDOW_VSIZE, TP_MIXER_MODE, TP_API,
     // 0 = rnd_floor, 1 = rnd_ceil, 2 = rnd_pos_inf, 3 = rnd_neg_inf, 4 = rnd_sym_inf, 5 = rnd_sym_zero, 6 =
     // rnd_conv_even, 7 = rnd_conv_odd
     static constexpr unsigned int kRoundMode = 0; // mode used in point designs.
-    static constexpr unsigned int m_kNumLanes =
-        TP_API == 0 ? ddsMulVecScalarLanes<TT_DATA, USE_LUT_SINCOS>()
-                    : ddsMulVecScalarLanesStream<TT_DATA, USE_LUT_SINCOS>(); // todo - calculate for other types
+    static constexpr unsigned int m_kNumLanes = ddsMulVecScalarLanes<TT_DATA, USE_LUT_SINCOS>();
     // todo, make these parameters in future release.
 
     static constexpr unsigned int m_kDOutEachLoop = m_kNumLanes * m_kNumLanes;