Release v1.4.21 (#528)

* Enable Xilinx 2021.1 tools
* Update DCV instructions to 2021.1

Author: deeppat

.gitmodules

@@ -11,3 +11,6 @@
 [submodule "Vitis/examples/xilinx_2020.2"]
 	path = Vitis/examples/xilinx_2020.2
 	url = https://github.com/Xilinx/Vitis_Accel_Examples
+[submodule "Vitis/examples/xilinx_2021.1"]
+	path = Vitis/examples/xilinx_2021.1
+	url = https://github.com/Xilinx/Vitis_Accel_Examples

Jenkinsfile

@@ -36,12 +36,18 @@ task_label = [
 ]
 
 // Put the latest version last
-def xilinx_versions = [ '2020.2' ]
+def xilinx_versions = [ '2021.1' ]
 
 // We want the default to be the latest.
 def default_xilinx_version = xilinx_versions.last()
 
 def simulator_tool_default_map = [
+     '2019.1' : [
+         'vivado': 'xilinx/SDx/2019.1.op2552052',
+         'vcs': 'synopsys/vcs-mx/N-2017.12-SP2',
+         'questa': 'questa/10.6c_1',
+         'ies': 'incisive/15.20.063'
+     ],
      '2019.2' : [
          'vivado': 'xilinx/Vivado/2019.2',
          'vcs': 'synopsys/vcs-mx/O-2018.09-SP2-1',
@@ -56,8 +62,14 @@ def simulator_tool_default_map = [
      ],
      '2020.2' : [
          'vivado': 'xilinx/Vivado/2020.2',
-         'vcs': 'synopsys/vcs/Q-2020.03',
-         'questa': 'questa/2019.4_3',
+         'vcs': 'synopsys/vcs-mx/Q-2020.03',
+         'questa': 'questa/2020.2',
+         'ies': 'incisive/15.20.083'
+     ],
+     '2021.1' : [
+         'vivado': 'xilinx/Vivado/2021.1',
+         'vcs': 'synopsys/vcs/R-2020.12',
+         'questa': 'questa/2020.4',
          'ies': 'incisive/15.20.083'
      ]
 ]

Jenkinsfile_int_sims

@@ -50,17 +50,18 @@ AWS marketplace offers multiple versions of the FPGA Developer AMI. The followin
 
 | Developer Kit Version | Tool Version Supported | Compatible FPGA Developer AMI Version |
 |-----------|-----------|------|
+| 1.4.21+ | 2021.1 | v1.11.X (Xilinx Vivado/Vitis 2021.1) |
 | 1.4.18+ | 2020.2 | v1.10.X (Xilinx Vivado/Vitis 2020.2) |
 | 1.4.16+ | 2020.1 | v1.9.0-v1.9.X (Xilinx Vivado/Vitis 2020.1) |
 | 1.4.13+ | 2019.2 | v1.8.0-v1.8.X (Xilinx Vivado/Vitis 2019.2) |
 | 1.4.11+ | 2019.1 | v1.7.0-v1.7.X (Xilinx Vivado/SDx 2019.1) |
-| 1.4.8 - 1.4.15a | 2018.3 | v1.6.0-v1.6.X (Xilinx Vivado/SDx 2018.3) |
-| 1.4.3 - 1.4.15a | 2018.2 | v1.5.0-v1.5.X (Xilinx Vivado/SDx 2018.2) |
-| 1.3.7 - 1.4.15a | 2017.4 | v1.4.0-v1.4.X (Xilinx Vivado/SDx 2017.4) |
+| 1.4.8 - 1.4.15b | 2018.3 | v1.6.0-v1.6.X (Xilinx Vivado/SDx 2018.3) |
+| 1.4.3 - 1.4.15b | 2018.2 | v1.5.0-v1.5.X (Xilinx Vivado/SDx 2018.2) |
+| 1.3.7 - 1.4.15b | 2017.4 | v1.4.0-v1.4.X (Xilinx Vivado/SDx 2017.4) |
 
 ⚠️ Developer kit release v1.4.16 will remove support for Xilinx 2017.4, 2018.2, 2018.3 toolsets. 
-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. 
-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.
+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. 
+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.
 
 ⚠️ 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.
 

README.md

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

RELEASE_NOTES.md

@@ -87,7 +87,7 @@ The instructions below describe how to run the Vitis SW Emulation flow using the
 ```
     $ cd $VITIS_DIR/examples/xilinx/hello_world          
     $ make clean                                                                 
-    $ make check TARGET=sw_emu DEVICE=$AWS_PLATFORM all     
+    $ make run TARGET=sw_emu DEVICE=$AWS_PLATFORM all     
 ```
 
 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
 ```
     $ cd $VITIS_DIR/examples/xilinx/hello_world             
     $ make clean                                                                   
-    $ make check TARGET=hw_emu DEVICE=$AWS_PLATFORM all      
+    $ make run TARGET=hw_emu DEVICE=$AWS_PLATFORM all      
 ```
 For more information on how to debug your application in a HW Emulation environment.
 

SDAccel/docs/SDAccel_Guide_AWS_F1.md

@@ -100,18 +100,22 @@ function setup_runtime {
         export PATH=$PATH:/opt/xilinx/xrt/bin
 
         export LD_LIBRARY_PATH=$XILINX_XRT/lib:$LD_LIBRARY_PATH
-        # copy libstdc++ from $XILINX_VITIS/lib
-        if [[ $(lsb_release -si) == "Ubuntu" ]]; then
-            sudo cp $XILINX_VITIS/lib/lnx64.o/Ubuntu/libstdc++.so* /opt/xilinx/xrt/lib/
-        elif [[ $(lsb_release -si) == "CentOS" ]]; then
-            sudo cp $XILINX_VITIS/lib/lnx64.o/Default/libstdc++.so* /opt/xilinx/xrt/lib/
-        else
-            info_msg "Unsupported OS."
-            return 1
+
+        if [[ $RELEASE_VER =~ .*2019\.2.* ]]; then
+
+          # copy libstdc++ from $XILINX_VITIS/lib
+          if [[ $(lsb_release -si) == "Ubuntu" ]]; then
+              sudo cp $XILINX_VITIS/lib/lnx64.o/Ubuntu/libstdc++.so* /opt/xilinx/xrt/lib/
+          elif [[ $(lsb_release -si) == "CentOS" ]]; then
+              sudo cp $XILINX_VITIS/lib/lnx64.o/Default/libstdc++.so* /opt/xilinx/xrt/lib/
+          elif [[ $(lsb_release -si) == "Amazon" ]]; then
+              sudo cp /lib64/libstdc++.so* /opt/xilinx/xrt/lib/
+          else
+              info_msg "Unsupported OS."
+              return 1
+          fi
         fi
     else # No XRT available
         err_msg "Xilinx XRT runtime not installed - This is required if you are running on an F1 instance."
-        # Placeholder for code to download pre-compiled RPM/DEB package and remove above message
-        # install_xrt_package <Path to RPM/DEB>
     fi
 }

Vitis/README.md

@@ -4,6 +4,7 @@
 
 | Vitis Version used for AFI Development | Compatible Xilinx Runtime |
 |--------------------------------------|-----------------------------|
+| 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) |
 | 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) |
 | 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) |
 | 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/Runtime/xrt_common_functions.sh

@@ -6,6 +6,7 @@
 
 | Xilinx Vitis Tool Version | XRT Release Tag | SHA | `xrt` or `xrt-aws` RPM's (Centos/RHEL) |`xrt` or`xrt-aws` RPM's (AL2) |
 |---|---|---|---|---|
+|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)|
 |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)|
 |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)|
 |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 |