Skip to content

Commit

Permalink
Squashed 'dsp/' changes from 74660f5..0d85fda
Browse files Browse the repository at this point in the history
0d85fda Merge pull request #83 from leol/fix-regression
703740a Fix HW_EMU stall issue by adding disable_auto_rewind properly
7b6c312 Merge pull request #82 from changg/fix_timeout
103a671 fix mem limit
8a31e6f Merge pull request #78 from mlechtan/next
d712471 Fix for CR-1100957.
450d34c update utils.mk to fix CR-1099846 (#77)
825ca3e Regen Makefile + fix for CR-1099846
1ef68a4 Regen Makefiles + fix for CR-1099846
be70647 Adding FFT defaults for backwards compatibility
e3ffd95 Fix for ADL-601
8d90b3e Reverting FFT's aiecompiler option: "-Xchess=main:noodle.optim.olbb=20", as it is causing a significant QoR degradation.
7547c50 Regenerating Makefiles
cf67891 Minor tidy up
4ba7618 Renaming FFT testcases
9e412ae Fix for Matrix Multiply - ADL-575 & ADL-577
6756386 Fix for issues: ADL-598 & ADL-599
40734b6 Fix for CR-1099828 and CR-1099835.
83a3f23 Fix for CR-1099658.
9b3c4d0 Syncing testcases names.
a189e03 Merge pull request #76 from mlechtan/cr_1098791
c1ce566 Renaming testcases.
991b31c Adding description.json for widget components
1ca81c1 Merge pull request #2 from FaaSApps/next
6f715d9 Merge pull request #71 from mlechtan/cr_1098791
d635a15 Removing duplicate --use-phy-shim
2650486 Merge pull request #75 from changg/fix_timeout
8e1c24e fix timemout
aa045d3 Merge branch 'next' into cr_1098791
4af7af5 Updating DSPLib to 05/12/2021 P4 CL: 3214238. Fixing failures in FFT, FIR and MM testcases. (#68)
e854e7e Merge pull request #74 from changg/fix_timeout
96bf5aa fix memlimit
807909b Updated Makefiles with fix for issue #242
8ab3cd2 Regenerated Makefiles
07dcc3a Changing "option" to "options"
4510221 Merge pull request #73 from leol/fix-CR-1099304
59a1267 Add configs during link time
c6acd69 Add connectivity files
bd7e558 Merge pull request #72 from leol/fix-CR-1099304
e1a8f16 Remove redundant xrt initialization files
a503a8a Adding connectivities for aws-vu9p-f1
e417ef7 Fix connection issue by adding connectivity constraints (#69)
a619bfd Fix for CR-1098791.
46bb7c1 Merge pull request #66 from mlechtan/next
6fd4535 Update description.json
c072d6c Update description.json
ce07774 Merge pull request #61 from mlechtan/next
448c8aa Merge branch 'next' into next
e57681e Merge pull request #65 from changg/0417
3216344 fix coding style error
83562fc fix matric
3f82160 Delete dds_mixer.cpp
953e6b2 fft and matric_mul
254682b test update
483af6d Appending target list with vitis_aie_x86sim
4f21761 Enabling x86sim target on xf_dsp_aie
7eb8a14 Add readme for explaining the input/output order for 1D/2D FFT (#59)
a64c9b1 Remove rewind option as no 2nd data ingressed (#57)
35741a2 Merge pull request #56 from yuanqian/L1_aws
c2f2613 hls cases support aws-vu9p-f1
bc81c26 Merge pull request #52 from yuanqian/vck190_aws
44d7e75 add pl script for embedded
d0eab99 port vitis cases to vck190 and aws
5e017d7 Merge pull request #51 from leol/L2-benchmark
74e719e Remove conlict pragma (PIPELINE/INLINE)
66b2a43 Merge pull request #46 from changg/6DSPcases
9fd92dc fix token in matrix_mult
9cb3f4c Merge pull request #50 from leol/L2-benchmark
9561f3f Correct path in readme
491236f Merge pull request #49 from leol/L2-benchmark
87fe6e1 Add descriptions for AIE graphs in readme
5a66285 Merge pull request #48 from leol/L2-benchmark
d5f3576 Improve readme
73e0a10 Merge pull request #47 from leol/L2-benchmark
34591c2 Add readmes
513f851 Merge pull request #45 from leol/L2-benchmark
0151849 Host code standardization
6dd5a90 add all left 6 cases
5d85f11 add fir_decimate_asym
305d63d refine fir_sr_sym
ada7282 add five cases and one hang
5d01190 Merge pull request #44 from changg/reorg_And_newcases
03d621b re-org project and add two more cases
9696681 Merge pull request #42 from leol/L2-benchmark
70a5f40 Merge remote-tracking branch 'upstream/next' into L2-benchmark
d7b27f9 Fix for Cosim stall by disabling auto-rewind
26f4801 Disable auto-rewind to fix Cosim stalls
9db0d22 Merge pull request #43 from changg/fir_interpolate_asym
be99df1 fix multi_params.json
94433e2 add vitis_aie_sim in Jenkinsfile
ac82e94 add fir_sr_sym
8b70c17 Fix CR-1087277
f02c0cd add L1/tests/aie
7201b31 add fir_interpolate_asym
eb1d7ae Merge remote-tracking branch 'upstream/next' into L2-benchmark
d504d13 Change default test size for 2D fixed hw run
91744f7 Reference design for 2D FFT
ac15092 Merge pull request #41 from changg/rm_unused_file
6b61b03 remove unused files
4d6577c Merge pull request #39 from changg/merge_aiedsplib
388a9bd merge aie dsp code
3d5adb0 Ref designs for 1D FFT (fixed+float)
bead7fa Merge pull request #37 from changg/jenkinsfile
54bbf5a fix libname in Jenkinsfile
65b1311 Merge pull request #36 from leol/remove-dim
134f4e3 Remove dim option in stream pragmas
cdb562b change 2020.2_stable_latest to 2021.1_stable_latest

git-subtree-dir: dsp
git-subtree-split: 0d85fdaa4077ee0bef8aaf9fac3924cd0999afb8
  • Loading branch information
sdausr committed Jun 1, 2021
1 parent bd5edb3 commit 66e192b
Show file tree
Hide file tree
Showing 537 changed files with 105,238 additions and 376 deletions.
5 changes: 3 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@Library('pipeline-library')_

VitisLibPipeline (branch: 'next', libname: 'xf_fft', TARGETS: 'hls_csim:hls_csynth:hls_cosim:vitis_sw_emu:vitis_hw_emu:vitis_hw_build',
email: 'lingl@xilinx.com', devtest: 'RunDeploy.sh', TOOLVERSION: '2020.2_stable_latest')
VitisLibPipeline (branch: 'next', libname: 'xf_dsp', TARGETS: 'hls_csim:hls_csynth:hls_cosim:vitis_sw_emu:vitis_hw_emu:vitis_hw_build:vitis_aie_sim:vitis_aie_x86sim',
upstream_dependencies: 'xf_utils_hw,next,../utils',
email: 'lingl@xilinx.com', devtest: 'RunDeploy.sh', TOOLVERSION: '2021.1_stable_latest')
2 changes: 1 addition & 1 deletion L1/examples/1Dfix_impluse/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ XDEVICE := $(basename $(notdir $(firstword $(XPLATFORM))))
ifeq (1, $(words $(XPLATFORM)))
# Query the part name of device
ifneq (,$(wildcard $(XILINX_VITIS)/bin/platforminfo))
override XPART := $(shell $(XILINX_VITIS)/bin/platforminfo --json="hardwarePlatform.board.part" --platform $(firstword $(XPLATFORM)))
override XPART := $(shell $(XILINX_VITIS)/bin/platforminfo --json="hardwarePlatform.devices[0].fpgaPart" --platform $(firstword $(XPLATFORM)) | sed 's/^[^:]*://g' | sed 's/[^a-zA-Z0-9]/-/g' | sed 's/-\+/-/g')
endif
endif
check_part: check_platform check_vpp
Expand Down
4 changes: 3 additions & 1 deletion L1/examples/1Dfix_impluse/description.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"description": "HLS case",
"flow": "hls",
"platform_whitelist": [
"u200"
"u200",
"aws-vu9p-f1",
"vck190"
],
"platform_blacklist": [],
"part_whitelist": [],
Expand Down
2 changes: 1 addition & 1 deletion L1/examples/1Dfloat_impluse/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ XDEVICE := $(basename $(notdir $(firstword $(XPLATFORM))))
ifeq (1, $(words $(XPLATFORM)))
# Query the part name of device
ifneq (,$(wildcard $(XILINX_VITIS)/bin/platforminfo))
override XPART := $(shell $(XILINX_VITIS)/bin/platforminfo --json="hardwarePlatform.board.part" --platform $(firstword $(XPLATFORM)))
override XPART := $(shell $(XILINX_VITIS)/bin/platforminfo --json="hardwarePlatform.devices[0].fpgaPart" --platform $(firstword $(XPLATFORM)) | sed 's/^[^:]*://g' | sed 's/[^a-zA-Z0-9]/-/g' | sed 's/-\+/-/g')
endif
endif
check_part: check_platform check_vpp
Expand Down
4 changes: 3 additions & 1 deletion L1/examples/1Dfloat_impluse/description.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"description": "HLS case",
"flow": "hls",
"platform_whitelist": [
"u200"
"u200",
"aws-vu9p-f1",
"vck190"
],
"platform_blacklist": [],
"part_whitelist": [],
Expand Down
2 changes: 1 addition & 1 deletion L1/examples/2Dfix_impulse/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ XDEVICE := $(basename $(notdir $(firstword $(XPLATFORM))))
ifeq (1, $(words $(XPLATFORM)))
# Query the part name of device
ifneq (,$(wildcard $(XILINX_VITIS)/bin/platforminfo))
override XPART := $(shell $(XILINX_VITIS)/bin/platforminfo --json="hardwarePlatform.board.part" --platform $(firstword $(XPLATFORM)))
override XPART := $(shell $(XILINX_VITIS)/bin/platforminfo --json="hardwarePlatform.devices[0].fpgaPart" --platform $(firstword $(XPLATFORM)) | sed 's/^[^:]*://g' | sed 's/[^a-zA-Z0-9]/-/g' | sed 's/-\+/-/g')
endif
endif
check_part: check_platform check_vpp
Expand Down
6 changes: 4 additions & 2 deletions L1/examples/2Dfix_impulse/description.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"description": "HLS case",
"flow": "hls",
"platform_whitelist": [
"u200"
"u200",
"aws-vu9p-f1",
"vck190"
],
"platform_blacklist": [],
"part_whitelist": [],
Expand Down Expand Up @@ -61,4 +63,4 @@
],
"category": "canary"
}
}
}
2 changes: 1 addition & 1 deletion L1/examples/2Dfloat_impluse/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ XDEVICE := $(basename $(notdir $(firstword $(XPLATFORM))))
ifeq (1, $(words $(XPLATFORM)))
# Query the part name of device
ifneq (,$(wildcard $(XILINX_VITIS)/bin/platforminfo))
override XPART := $(shell $(XILINX_VITIS)/bin/platforminfo --json="hardwarePlatform.board.part" --platform $(firstword $(XPLATFORM)))
override XPART := $(shell $(XILINX_VITIS)/bin/platforminfo --json="hardwarePlatform.devices[0].fpgaPart" --platform $(firstword $(XPLATFORM)) | sed 's/^[^:]*://g' | sed 's/[^a-zA-Z0-9]/-/g' | sed 's/-\+/-/g')
endif
endif
check_part: check_platform check_vpp
Expand Down
12 changes: 7 additions & 5 deletions L1/examples/2Dfloat_impluse/description.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"description": "HLS case",
"flow": "hls",
"platform_whitelist": [
"u200"
"u200",
"aws-vu9p-f1",
"vck190"
],
"platform_blacklist": [],
"part_whitelist": [],
Expand Down Expand Up @@ -37,10 +39,10 @@
"env": "",
"cmd": "",
"max_memory_MB": {
"hls_vivado_syn": 16384,
"hls_vivado_syn": 40960,
"hls_csim": 10240,
"hls_cosim": 16384,
"hls_vivado_impl": 16384,
"hls_cosim": 40960,
"hls_vivado_impl": 40960,
"hls_csynth": 10240
},
"max_time_min": {
Expand All @@ -61,4 +63,4 @@
],
"category": "canary"
}
}
}
Loading

0 comments on commit 66e192b

Please sign in to comment.