Skip to content

Commit 087fb29

Browse files
deeppatdeeppat
authored
Release v1.4.21 (#528)
* Enable Xilinx 2021.1 tools * Update DCV instructions to 2021.1
1 parent f29834c commit 087fb29

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+228
-510
lines changed

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@
1111
[submodule "Vitis/examples/xilinx_2020.2"]
1212
path = Vitis/examples/xilinx_2020.2
1313
url = https://github.com/Xilinx/Vitis_Accel_Examples
14+
[submodule "Vitis/examples/xilinx_2021.1"]
15+
path = Vitis/examples/xilinx_2021.1
16+
url = https://github.com/Xilinx/Vitis_Accel_Examples

‎Jenkinsfile

Lines changed: 18 additions & 311 deletions
Large diffs are not rendered by default.

‎Jenkinsfile_int_sims

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,18 @@ task_label = [
3636
]
3737

3838
// Put the latest version last
39-
def xilinx_versions = [ '2020.2' ]
39+
def xilinx_versions = [ '2021.1' ]
4040

4141
// We want the default to be the latest.
4242
def default_xilinx_version = xilinx_versions.last()
4343

4444
def simulator_tool_default_map = [
45+
'2019.1' : [
46+
'vivado': 'xilinx/SDx/2019.1.op2552052',
47+
'vcs': 'synopsys/vcs-mx/N-2017.12-SP2',
48+
'questa': 'questa/10.6c_1',
49+
'ies': 'incisive/15.20.063'
50+
],
4551
'2019.2' : [
4652
'vivado': 'xilinx/Vivado/2019.2',
4753
'vcs': 'synopsys/vcs-mx/O-2018.09-SP2-1',
@@ -56,8 +62,14 @@ def simulator_tool_default_map = [
5662
],
5763
'2020.2' : [
5864
'vivado': 'xilinx/Vivado/2020.2',
59-
'vcs': 'synopsys/vcs/Q-2020.03',
60-
'questa': 'questa/2019.4_3',
65+
'vcs': 'synopsys/vcs-mx/Q-2020.03',
66+
'questa': 'questa/2020.2',
67+
'ies': 'incisive/15.20.083'
68+
],
69+
'2021.1' : [
70+
'vivado': 'xilinx/Vivado/2021.1',
71+
'vcs': 'synopsys/vcs/R-2020.12',
72+
'questa': 'questa/2020.4',
6173
'ies': 'incisive/15.20.083'
6274
]
6375
]

‎README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,18 @@ AWS marketplace offers multiple versions of the FPGA Developer AMI. The followin
5050

5151
| Developer Kit Version | Tool Version Supported | Compatible FPGA Developer AMI Version |
5252
|-----------|-----------|------|
53+
| 1.4.21+ | 2021.1 | v1.11.X (Xilinx Vivado/Vitis 2021.1) |
5354
| 1.4.18+ | 2020.2 | v1.10.X (Xilinx Vivado/Vitis 2020.2) |
5455
| 1.4.16+ | 2020.1 | v1.9.0-v1.9.X (Xilinx Vivado/Vitis 2020.1) |
5556
| 1.4.13+ | 2019.2 | v1.8.0-v1.8.X (Xilinx Vivado/Vitis 2019.2) |
5657
| 1.4.11+ | 2019.1 | v1.7.0-v1.7.X (Xilinx Vivado/SDx 2019.1) |
57-
| 1.4.8 - 1.4.15a | 2018.3 | v1.6.0-v1.6.X (Xilinx Vivado/SDx 2018.3) |
58-
| 1.4.3 - 1.4.15a | 2018.2 | v1.5.0-v1.5.X (Xilinx Vivado/SDx 2018.2) |
59-
| 1.3.7 - 1.4.15a | 2017.4 | v1.4.0-v1.4.X (Xilinx Vivado/SDx 2017.4) |
58+
| 1.4.8 - 1.4.15b | 2018.3 | v1.6.0-v1.6.X (Xilinx Vivado/SDx 2018.3) |
59+
| 1.4.3 - 1.4.15b | 2018.2 | v1.5.0-v1.5.X (Xilinx Vivado/SDx 2018.2) |
60+
| 1.3.7 - 1.4.15b | 2017.4 | v1.4.0-v1.4.X (Xilinx Vivado/SDx 2017.4) |
6061

6162
⚠️ Developer kit release v1.4.16 will remove support for Xilinx 2017.4, 2018.2, 2018.3 toolsets.
62-
While developer kit release v1.4.16 onwards will not support older Xilinx tools, you can still use them using HDK releases v1.4.15a or earlier.
63-
Please checkout [the latest v1.4.15a release tag from Github](https://github.com/aws/aws-fpga/releases/tag/v1.4.15a) to use Xilinx 2017.4, 2018.2, 2018.3 toolsets.
63+
While developer kit release v1.4.16 onwards will not support older Xilinx tools, you can still use them using HDK releases v1.4.15b or earlier.
64+
Please checkout [the latest v1.4.15b release tag from Github](https://github.com/aws/aws-fpga/releases/tag/v1.4.15b) to use Xilinx 2017.4, 2018.2, 2018.3 toolsets.
6465

6566
⚠️ Developer kit versions prior to v1.3.7 and Developer AMI prior to v1.4 (2017.1) reached end-of-life. See [AWS forum announcement](https://forums.aws.amazon.com/ann.jspa?annID=6068) for additional details.
6667

‎RELEASE_NOTES.md

Lines changed: 36 additions & 31 deletions
Large diffs are not rendered by default.

‎SDAccel/docs/SDAccel_Guide_AWS_F1.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ Conversely, code which is simply a few lines of basic operations, and has no tas
168168
* Xilinx web portal for [Xilinx SDAccel documentation](https://www.xilinx.com/products/design-tools/software-zone/sdaccel.html?resultsTablePreSelect=xlnxdocumenttypes:SeeAll#documentation)
169169
* [Xilinx SDAccel GitHub repository](https://github.com/Xilinx/SDAccel_Examples)
170170
* [Xilinx SDAccel landing page](https://www.xilinx.com/products/design-tools/software-zone/sdaccel.html)
171-
* [Vivado HLS landing page](https://www.xilinx.com/products/design-tools/vivado/integration/esl-design.html)
172171
* [Vivado landing page](https://www.xilinx.com/products/design-tools/vivado.html)
173172
* [SDAccel Environment User Guide](https://www.xilinx.com/support/documentation/sw_manuals/xilinx2017_4/ug1023-sdaccel-user-guide.pdf)
174173
* [SDAccel Intro Tutorial](https://www.xilinx.com/support/documentation/sw_manuals/xilinx2017_4/ug1021-sdaccel-intro-tutorial.pdf)

‎Vitis/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ The instructions below describe how to run the Vitis SW Emulation flow using the
8787
```
8888
$ cd $VITIS_DIR/examples/xilinx/hello_world
8989
$ make clean
90-
$ make check TARGET=sw_emu DEVICE=$AWS_PLATFORM all
90+
$ make run TARGET=sw_emu DEVICE=$AWS_PLATFORM all
9191
```
9292

9393
For more information on how to debug your application in a SW Emulation environment.
@@ -102,7 +102,7 @@ The instructions below describe how to run the HW Emulation flow using the Makef
102102
```
103103
$ cd $VITIS_DIR/examples/xilinx/hello_world
104104
$ make clean
105-
$ make check TARGET=hw_emu DEVICE=$AWS_PLATFORM all
105+
$ make run TARGET=hw_emu DEVICE=$AWS_PLATFORM all
106106
```
107107
For more information on how to debug your application in a HW Emulation environment.
108108

‎Vitis/Runtime/xrt_common_functions.sh

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,18 +100,22 @@ function setup_runtime {
100100
export PATH=$PATH:/opt/xilinx/xrt/bin
101101

102102
export LD_LIBRARY_PATH=$XILINX_XRT/lib:$LD_LIBRARY_PATH
103-
# copy libstdc++ from $XILINX_VITIS/lib
104-
if [[ $(lsb_release -si) == "Ubuntu" ]]; then
105-
sudo cp $XILINX_VITIS/lib/lnx64.o/Ubuntu/libstdc++.so* /opt/xilinx/xrt/lib/
106-
elif [[ $(lsb_release -si) == "CentOS" ]]; then
107-
sudo cp $XILINX_VITIS/lib/lnx64.o/Default/libstdc++.so* /opt/xilinx/xrt/lib/
108-
else
109-
info_msg "Unsupported OS."
110-
return 1
103+
104+
if [[ $RELEASE_VER =~ .*2019\.2.* ]]; then
105+
106+
# copy libstdc++ from $XILINX_VITIS/lib
107+
if [[ $(lsb_release -si) == "Ubuntu" ]]; then
108+
sudo cp $XILINX_VITIS/lib/lnx64.o/Ubuntu/libstdc++.so* /opt/xilinx/xrt/lib/
109+
elif [[ $(lsb_release -si) == "CentOS" ]]; then
110+
sudo cp $XILINX_VITIS/lib/lnx64.o/Default/libstdc++.so* /opt/xilinx/xrt/lib/
111+
elif [[ $(lsb_release -si) == "Amazon" ]]; then
112+
sudo cp /lib64/libstdc++.so* /opt/xilinx/xrt/lib/
113+
else
114+
info_msg "Unsupported OS."
115+
return 1
116+
fi
111117
fi
112118
else # No XRT available
113119
err_msg "Xilinx XRT runtime not installed - This is required if you are running on an F1 instance."
114-
# Placeholder for code to download pre-compiled RPM/DEB package and remove above message
115-
# install_xrt_package <Path to RPM/DEB>
116120
fi
117121
}

‎Vitis/docs/Create_Runtime_AMI.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
| Vitis Version used for AFI Development | Compatible Xilinx Runtime |
66
|--------------------------------------|-----------------------------|
7+
| 2021.1 | AWS FPGA Developer AMI 1.10.x (XRT is pre-installed) or [XRT](https://xilinx.github.io/XRT/2021.1/html/build.html) |
78
| 2020.2 | AWS FPGA Developer AMI 1.10.x (XRT is pre-installed) or [XRT](https://xilinx.github.io/XRT/2020.2/html/build.html) |
89
| 2020.1 | AWS FPGA Developer AMI 1.9.x (XRT is pre-installed) or [XRT](https://xilinx.github.io/XRT/2020.1/html/build.html) |
910
| 2019.2 | AWS FPGA Developer AMI 1.8.x (XRT is pre-installed) or [XRT](https://xilinx.github.io/XRT/2019.2/html/build.html) |

‎Vitis/docs/XRT_installation_instructions.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
| Xilinx Vitis Tool Version | XRT Release Tag | SHA | `xrt` or `xrt-aws` RPM's (Centos/RHEL) |`xrt` or`xrt-aws` RPM's (AL2) |
88
|---|---|---|---|---|
9+
|2021.1| [202110.2.11.634](https://github.com/Xilinx/XRT/releases/tag/202110.2.11.634) | 5ad5998d67080f00bca5bf15b3838cf35e0a7b26 | [xrt_202110.2.11.0_7.9.2009-x86_64-xrt.rpm](https://aws-fpga-developer-ami.s3.amazonaws.com/1.11.0/Patches/XRT_2021_1/xrt_202110.2.11.0_7.9.2009-x86_64-xrt.rpm) [xrt_202110.2.11.0_7.9.2009-x86_64-aws.rpm](https://aws-fpga-developer-ami.s3.amazonaws.com/1.11.0/Patches/XRT_2021_1/xrt_202110.2.11.0_7.9.2009-x86_64-aws.rpm) | [xrt_202110.2.11.0_2-x86_64-xrt.rpm](https://aws-fpga-developer-ami.s3.amazonaws.com/1.11.0/Patches/XRT_2021_1/xrt_202110.2.11.0_2-x86_64-xrt.rpm) [xrt_202110.2.11.0_2-x86_64-aws.rpm](https://aws-fpga-developer-ami.s3.amazonaws.com/1.11.0/Patches/XRT_2021_1/xrt_202110.2.11.0_2-x86_64-aws.rpm)|
910
|2020.2| [202020.2.8.743](https://github.com/Xilinx/XRT/releases/tag/202020.2.8.743) | 77d5484b5c4daa691a7f78235053fb036829b1e9 | [xrt_202020.2.8.0_7.9.2009-x86_64-xrt.rpm](https://aws-fpga-developer-ami.s3.amazonaws.com/1.10.0/Patches/XRT_2020_2/xrt_202020.2.8.0_7.9.2009-x86_64-xrt.rpm) [xrt_202020.2.8.0_7.9.2009-x86_64-aws.rpm](https://aws-fpga-developer-ami.s3.amazonaws.com/1.10.0/Patches/XRT_2020_2/xrt_202020.2.8.0_7.9.2009-x86_64-aws.rpm) | [xrt_202020.2.8.0_2-x86_64-xrt.rpm](https://aws-fpga-developer-ami.s3.amazonaws.com/1.10.0/Patches/XRT_2020_2/xrt_202020.2.8.0_2-x86_64-xrt.rpm) [xrt_202020.2.8.0_2-x86_64-aws.rpm](https://aws-fpga-developer-ami.s3.amazonaws.com/1.10.0/Patches/XRT_2020_2/xrt_202020.2.8.0_2-x86_64-aws.rpm)|
1011
|2020.1| [202010.2.6.AWS](https://github.com/Xilinx/XRT/releases/tag/202010.2.6.AWS) | d09c4a458c16e8d843b3165dcf929c38f7a32b6f | [xrt_202010.2.6.0_7.7.1908-x86_64-xrt.rpm](https://aws-fpga-developer-ami.s3.amazonaws.com/1.9.0/Patches/XRT_2020_1/xrt_202010.2.6.0_7.7.1908-x86_64-xrt.rpm) [xrt_202010.2.6.0_7.7.1908-x86_64-aws.rpm](https://aws-fpga-developer-ami.s3.amazonaws.com/1.9.0/Patches/XRT_2020_1/xrt_202010.2.6.0_7.7.1908-x86_64-aws.rpm) | [xrt_202010.2.6.0_2-x86_64-xrt.rpm](https://aws-fpga-developer-ami.s3.amazonaws.com/1.9.0/Patches/XRT_2020_1/xrt_202010.2.6.0_2-x86_64-xrt.rpm) [xrt_202010.2.6.0_2-x86_64-aws.rpm](https://aws-fpga-developer-ami.s3.amazonaws.com/1.9.0/Patches/XRT_2020_1/xrt_202010.2.6.0_2-x86_64-aws.rpm)|
1112
|2019.2| [2019.2.0.3](https://github.com/Xilinx/XRT/releases/tag/2019.2.0.3) | 9e13d57c4563e2c19bf5f518993f6e5a8dadc18a | [xrt_201920.2.3.0_7.7.1908-xrt.rpm](https://aws-fpga-developer-ami.s3.amazonaws.com/1.8.0/Patches/XRT_2019_2/xrt_201920.2.3.0_7.7.1908-xrt.rpm) [xrt_201920.2.3.0_7.7.1908-aws.rpm](https://aws-fpga-developer-ami.s3.amazonaws.com/1.8.0/Patches/XRT_2019_2/xrt_201920.2.3.0_7.7.1908-aws.rpm) | N/A |

0 commit comments

Comments
 (0)