Updated AWS tutorials

ryanvergel · ryanvergel · commit 05e5ea6debb0 · 2019-12-18T21:21:16.000-07:00
diff --git a/docs/aws-getting-started/CPP/README.md b/docs/aws-getting-started/CPP/README.md
@@ -64,12 +64,9 @@ This optional module will show you how to:
 You will need the following:
 - A Xilinx account — create one [here](https://www.xilinx.com/registration/create-account.html)
 - A Linux computer running either:
-  - Red Hat Enterprise Workstation/Server 7.3-7.4 (64-bit)
-  - CentOS 7.2
-  - CentOS 7.3-7.4 (64-bit)
-  - Ubuntu Linux 16.04.3 LTS (64-bit)
-    - Linux kernel 4.4.0 is supported
-    - Ubuntu LTS enablement (also called HWE or Hardware Enablement) is _not_ supported
+  - Ubuntu 16.04.5 LTS, 18.04.1 LTS
+  - CentOS 7.4, 7.5, 7.6
+  - RHEL 7.4, 7.5, 7.6
 
 [**FOLLOW THE INSTRUCTIONS**](STEP5.md)
 <br>
diff --git a/docs/aws-getting-started/CPP/STEP1.md b/docs/aws-getting-started/CPP/STEP1.md
@@ -95,8 +95,11 @@ source <(curl -s https://s3.amazonaws.com/aws-fpga-developer-ami/1.5.0/Scripts/s
 The script takes about 10 minutes to run and finishes by setting a password for the 'centos' user.
 
  **IMPORTANT**: Take note of the password generated by the script. You will need it to connect using RDP.
+
 2. Return to the **AWS EC2 dashboard** in your web browser.
+
 3. Select your instance, then from the **Actions** menu, select **Instance State** and then select **Reboot**.
+
 4. Wait a couple of minutes for the instance to complete the reboot cycle.
 
 After you have completed this step, you are ready to connect to the instance using a remote desktop client.
@@ -114,7 +117,7 @@ After you have completed this step, you are ready to connect to the instance usi
 * Click **Yes** to dismiss the message. The Remote Desktop Connection window opens with a login prompt.
 * Log in with the following credentials:
     - User: **centos**
-    - Password: *password generated by the `set_gui.sh` script*
+    - Password: *password generated by the `setup_gui.sh` script*
 * Click **Ok**.
 
 You are now connected to the instance running Centos 7 and the FPGA Developer AMI.
@@ -150,7 +153,7 @@ In this step, you install the necessary files to build and execute applications
 
 ## 4. Running the SDAccel 'Hello World' Example on AWS F1
 
-This final section explains how run the SDAccel `helloworld_ocl` example on AWS F1 and confirm that the environment is properly configured.
+This final section explains how run the SDAccel `helloworld_c` example on AWS F1 and confirm that the environment is properly configured.
 
 #### Step 1: Set Up the SDAccel Environment
 
@@ -167,14 +170,14 @@ The SDAccel emulation flows allows testing, profiling, and debugging the applica
 
 1. Run the SW Emulation flow for the SDAccel 'hello world' example:
 ```bash
-cd $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_ocl/
+cd $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_c/
 make clean
 make check TARGETS=sw_emu DEVICES=$AWS_PLATFORM all
 ```
 
 2. Run the HW Emulation flow for the SDAccel 'hello world' example:
 ```bash
-cd $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_ocl/
+cd $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_c/
 make clean
 make check TARGETS=hw_emu DEVICES=$AWS_PLATFORM all
 ```
@@ -190,7 +193,7 @@ Building these files is a two-step process. First SDAccel is used to build the h
 
 1. Build the host application and the &ast;.xclbin (Xilinx FPGA binary file):
 ```bash
-cd $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_ocl/
+cd $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_c/
 make clean
 make TARGETS=hw DEVICES=$AWS_PLATFORM all
 ```
@@ -237,9 +240,11 @@ aws ec2 describe-fpga-images --fpga-image-ids <AFI ID>
 
 #### Step 5: Execute the Host Application
 
+:warning: **IMPORTANT** :  The previous steps do not require an AWS EC2 F1 instance. They can be executed on other AWS EC2 instances such as C4 or C5. However, the steps that follow must be performed on an AWS EC2 F1 instance. You will receive error messages if you do not perform the following steps on an F1 instance.
+
 1. Execute the following commands in the instance terminal:
 ```bash
-cd $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_ocl/
+cd $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_c/
 sudo sh
 source /opt/xilinx/xrt/setup.sh   
 ./helloworld
diff --git a/docs/aws-getting-started/CPP/STEP3.md b/docs/aws-getting-started/CPP/STEP3.md
@@ -11,9 +11,6 @@ The following videos present key concepts needed to successfully run existing C/
 ### 3. Fundamental Concepts of Application Host Code
 [**WATCH VIDEO**](https://www.xilinx.com/video/hardware/concepts-of-application-host-code.html)
 
-### 4. OpenCL Memory Architecture
-[**WATCH VIDEO**](https://www.xilinx.com/video/hardware/opencl-memory-architecture.html)
-
 <hr/>
 <p align="center"><b>
 <a href="STEP4.md">NEXT: Practice and Experiment with C/C++ Kernels</a>
diff --git a/docs/aws-getting-started/CPP/STEP4.md b/docs/aws-getting-started/CPP/STEP4.md
@@ -1,30 +1,38 @@
-# Practice and Experiment with C/OpenCL Kernels
+# Practice and Experiment with C/C++ and OpenCL Kernels
 
 Apply and practice what you've learned in the earlier steps of this guide by running more hands-on examples. Familiarize yourself with online resources relating to the SDAccel™ environment, and make your way to the [AWS forum](https://forums.aws.amazon.com/forum.jspa?forumID=243) to search for knowledge and find answers.
 
+## Run the On-demand SDAccel AWS F1 Developer Labs
+
+By going through these labs you will learn how to develop accelerated applications using the Xilinx SDAccel development environment.
+
+[**START THE LABS**](https://github.com/Xilinx/SDAccel-AWS-F1-Developer-Labs)
+
+<br>
+
 ## Experiment with Other Examples
 
 Running and experimenting with these three examples of the C/OpenCL™ kernels allows you to further familiarize yourself with good coding practices and kernel optimization techniques.
 
 ### Loop Pipelining
 This example demonstrates how loop pipelining can be used to improve the performance of a kernel.
 
-Download and run [this example](https://github.com/Xilinx/SDAccel_Examples/tree/2018.2/getting_started/kernel_opt/loop_pipeline_ocl) from the SDAccel GitHub repository.
+Download and run [this example](https://github.com/Xilinx/SDAccel_Examples/tree/master/getting_started/kernel_opt/loop_pipeline_c) from the SDAccel GitHub repository.
 
 ### Reordering Loops
 This example demonstrates how loop reordering can be used to improve the performance of a kernel.
 
-Download and run [this example](https://github.com/Xilinx/SDAccel_Examples/tree/2018.2/getting_started/kernel_opt/loop_reorder_c) from the SDAccel GitHub repository.
+Download and run [this example](https://github.com/Xilinx/SDAccel_Examples/tree/master/getting_started/kernel_opt/loop_reorder_c) from the SDAccel GitHub repository.
 
 ### Loop Fusion
 This example demonstrates how to fuse two loops into one to improve the performance of an OpenCL kernel.
 
-Download and run [this example](https://github.com/Xilinx/SDAccel_Examples/tree/2018.2/getting_started/kernel_opt/loop_fusion_c) from the SDAccel GitHub repository.
+Download and run [this example](https://github.com/Xilinx/SDAccel_Examples/tree/master/getting_started/kernel_opt/loop_fusion_c) from the SDAccel GitHub repository.
 
 ### Additional Examples
 The Xilinx Github repository contains more than 80 examples to help you learn. Browse the repository to find more examples of interest, starting with more coding and optimization examples.
 
-Browse other [OpenCL kernel coding and optimization examples](https://github.com/Xilinx/SDAccel_Examples/tree/2018.2/getting_started/kernel_opt).
+Browse other [C/C++ and OpenCL kernel coding and optimization examples](https://github.com/Xilinx/SDAccel_Examples/tree/master/getting_started/kernel_opt).
 
 <br>
 
@@ -34,16 +42,12 @@ The [AWS F1 SDAccel Development forum](https://forums.aws.amazon.com/forum.jspa?
 <br>
 
 ## Learn More about the SDAccel Environment
-#### SDAccel QuickTake Video Tutorials
-[Fundamental Concepts of Application Host Code](https://www.xilinx.com/video/hardware/concepts-of-application-host-code.html)
-
 
-#### Documentation for SDAccel v2018.3
-* _SDx Development Environment Release Notes, Installation, and Licensing Guide_ ([UG1238](https://www.xilinx.com/cgi-bin/docs/rdoc?v=replace;d=ug1238-sdx-rnil.pdf))
-* _SDAccel Programmers Guide_ ([UG1277](https://www.xilinx.com/cgi-bin/docs/rdoc?v=replace;d=ug1277-sdaccel-programmers-guide.pdf))
-* _SDAccel Environment User Guide_ ([UG1023](https://www.xilinx.com/cgi-bin/docs/rdoc?v=replace;d=ug1023-sdaccel-user-guide.pdf))
-* _SDAccel Environment Optimization Guide_ ([UG1207](https://www.xilinx.com/cgi-bin/docs/rdoc?v=replace;d=ug1207-sdaccel-optimization-guide.pdf))
-* _SDAccel Environment Tutorial_ ([UG1021](https://www.xilinx.com/cgi-bin/docs/rdoc?v=replace;d=ug1021-sdaccel-intro-tutorial.pdf))
+#### Documentation for SDAccel v2019.1
+* _SDx Development Environment Release Notes, Installation, and Licensing Guide_ ([UG1238](https://www.xilinx.com/html_docs/xilinx2019_1/sdaccel_doc/gsv1547661552998.html#gsv1547661552998))
+* _SDAccel Programmers Guide_ ([UG127](https://www.xilinx.com/html_docs/xilinx2019_1/sdaccel_doc/vno1533881025717.html))
+* _SDAccel Environment User Guide_ ([UG1023](https://www.xilinx.com/html_docs/xilinx2019_1/sdaccel_doc/itd1534452174535.html))
+* _SDAccel Environment Optimization Guide_ ([UG1207](https://www.xilinx.com/html_docs/xilinx2019_1/sdaccel_doc/itd1534452174535.html))
 
 <hr/>
 <p align="center"><b>
diff --git a/docs/aws-getting-started/CPP/STEP5.md b/docs/aws-getting-started/CPP/STEP5.md
@@ -16,33 +16,26 @@ Before going through the steps described in this document, you should complete t
 
 ## Requirements
 The supported operating systems for SDaccel on-premise development are:
-  - Red Hat Enterprise Workstation/Server 7.3-7.4 (64-bit)
-  - CentOS 7.2
-  - CentOS 7.3-7.4 (64-bit)
-  - Ubuntu Linux 16.04.3 LTS (64-bit)
-    - Linux kernel 4.4.0 is supported
-    - Ubuntu LTS enablement (also called HWE or Hardware Enablement) is _not_ supported
+  - Ubuntu 16.04.5 LTS, 18.04.1 LTS
+  - CentOS 7.4, 7.5, 7.6
+  - RHEL 7.4, 7.5, 7.6
+
+Visit [this page](https://www.xilinx.com/html_docs/xilinx2019_1/sdaccel_doc/igz1531201833632.html#olw1504034315783) for a complete description of other system requirements.
 
 # 1. Installing and licensing SDAccel in your own environment
 
 ## Downloading the SDAccel Development Environment
-In order to develop any SDAccel application on-premise, you must install the same version of SDAccel as deployed on AWS F1.
-The SDAccel installer can be found here:
 
-* Xilinx Vivado v2018.2 or v2018.2.op (64-bit)
-* License: EF-VIVADO-SDX-VU9P-OP
-* SW Build 2258646 on Thu Jun 14 20:02:38 MDT 2018
-* IP Build 2256618 on Thu Jun 14 22:10:49 MDT 2018
-* URL: [https://www.xilinx.com/member/forms/download/xef.html?filename=Xilinx_SDx_op_Lin_2018.2_0614_1954_Lin64.bin&akdm=0](https://www.xilinx.com/member/forms/download/xef.html?filename=Xilinx_SDx_op_Lin_2018.2_0614_1954_Lin64.bin&akdm=0)
-* MD5 SUM Value: 6b6939e70d4fa90677d2c54a37ec25c7
+In order to develop any SDAccel application on-premise, you must install the same version of SDAccel as deployed on AWS F1. Refer to this page for tool version and download instructions: [enabling development on premises](https://github.com/aws/aws-fpga/edit/master/hdk/docs/on_premise_licensing_help.md)
+
 
 ## Requesting a License
 
 If you are a new user, you will also need to obtain an on-premise license of Vivado®. You can request both _node-locked_ and _floating licenses_ [here](https://www.xilinx.com/products/design-tools/acceleration-zone/ef-vivado-sdx-vu9p-op-fl-nl.html) (links are on the right side of the page).
 
 ## Installing SDAccel
 
-* To install the tool, refer to the instructions in the _SDAccel Environment Release Notes, Installation, and Licensing Guide_ [(UG1238)](https://www.xilinx.com/support/documentation/sw_manuals/xilinx2018_3/ug1238-sdx-rnil.pdf).
+* To install the tool, refer to the instructions in the _SDAccel Environment Release Notes, Installation, and Licensing Guide_ [(UG1238)](https://www.xilinx.com/html_docs/xilinx2019_1/sdaccel_doc/yrc1534452173645.html).
 
 ## Cloning the AWS-FPGA Git Repository
 
@@ -77,7 +70,7 @@ After you confirm that the GUI has opened successfully, close the GUI.
 Execute the following commands to run the SW Emulation step for the SDAccel `helloworld` example:
 
 ```bash
-cd $HOME/aws-fpga/SDAccel/examples/xilinx_2018.2/getting_started/host/helloworld_c/
+cd $HOME/aws-fpga/SDAccel/examples/xilinx_2019.1/getting_started/host/helloworld_c/
 make clean
 make check TARGETS=sw_emu DEVICES=$AWS_PLATFORM all
 ```
@@ -87,7 +80,7 @@ make check TARGETS=sw_emu DEVICES=$AWS_PLATFORM all
 Execute the following commands to run the HW Emulation step for the SDAccel `helloworld` example:
 
 ```bash
-cd $HOME/aws-fpga/SDAccel/examples/xilinx_2018.2/getting_started/host/helloworld_c/
+cd $HOME/aws-fpga/SDAccel/examples/xilinx_2019.1/getting_started/host/helloworld_c/
 make clean
 make check TARGETS=hw_emu DEVICES=$AWS_PLATFORM all
 ```
@@ -97,7 +90,7 @@ make check TARGETS=hw_emu DEVICES=$AWS_PLATFORM all
 * Execute the following commands to build the FPGA binary for the SDAccel `helloworld` example:
 
 ```bash
-cd $HOME/aws-fpga/SDAccel/examples/xilinx_2018.2/getting_started/host/helloworld_c/
+cd $HOME/aws-fpga/SDAccel/examples/xilinx_2019.1/getting_started/host/helloworld_c/
 make clean
 make TARGETS=hw DEVICES=$AWS_PLATFORM all
 ```
diff --git a/docs/aws-getting-started/RTL/README.md b/docs/aws-getting-started/RTL/README.md
@@ -64,12 +64,9 @@ This optional module will show you how to:
 You will need the following:
 - A Xilinx account — create one [here](https://www.xilinx.com/registration/create-account.html)
 - A Linux computer running either:
-  - Red Hat Enterprise Workstation/Server 7.3-7.4 (64-bit)
-  - CentOS 7.2
-  - CentOS 7.3-7.4 (64-bit)
-  - Ubuntu Linux 16.04.3 LTS (64-bit)
-    - Linux kernel 4.4.0 is supported
-    - Ubuntu LTS enablement (also called HWE or Hardware Enablement) is not supported
+  - Ubuntu 16.04.5 LTS, 18.04.1 LTS
+  - CentOS 7.4, 7.5, 7.6
+  - RHEL 7.4, 7.5, 7.6
 
 
 [**FOLLOW THE INSTRUCTIONS**](STEP5.md)
diff --git a/docs/aws-getting-started/RTL/STEP1.md b/docs/aws-getting-started/RTL/STEP1.md
@@ -1,4 +1,4 @@
-# Creating, Configuring, and Testing an AWS F1 Instance
+# Create, Configure, and Test an AWS F1 Instance
 
 This module guides you through the following steps:
 
@@ -95,15 +95,18 @@ source <(curl -s https://s3.amazonaws.com/aws-fpga-developer-ami/1.5.0/Scripts/s
 The script takes about 10 minutes to run and finishes by setting a password for the 'centos' user.
 
  **IMPORTANT**: Take note of the password generated by the script. You will need it to connect using RDP.
+
 2. Return to the **AWS EC2 dashboard** in your web browser.
+
 3. Select your instance, then from the **Actions** menu, select **Instance State** and then select **Reboot**.
+
 4. Wait a couple of minutes for the instance to complete the reboot cycle.
 
 After you have completed this step, you are ready to connect to the instance using a remote desktop client.
 
 #### Step 3: Connect to the Instance with a Remote Desktop Client
 
-1. From your local machine, start a remote desktop protocol (RDP) client
+1. From your local machine, start a remote desktop protocol (RDP) client.
   - On Windows: press the **Windows** key and type **mstsc.exe** in the Windows run prompt.
   - On Linux: use an RDP client, such as Remmina or Vinagre.
   - On macOS: use the Microsoft Remote Desktop v8.0.43 from the Mac App Store. That version offers color depth settings.
@@ -114,7 +117,7 @@ After you have completed this step, you are ready to connect to the instance usi
 * Click **Yes** to dismiss the message. The Remote Desktop Connection window opens with a login prompt.
 * Log in with the following credentials:
     - User: **centos**
-    - Password: *password generated by the `set_gui.sh` script*
+    - Password: *password generated by the `setup_gui.sh` script*
 * Click **Ok**.
 
 You are now connected to the instance running Centos 7 and the FPGA Developer AMI.
@@ -150,7 +153,7 @@ In this step, you install the necessary files to build and execute applications
 
 ## 4. Running the SDAccel 'Hello World' Example on AWS F1
 
-This final section explains how run the SDAccel `helloworld_ocl` example on AWS F1 and confirm that the environment is properly configured.
+This final section explains how run the SDAccel `helloworld_c` example on AWS F1 and confirm that the environment is properly configured.
 
 #### Step 1: Set Up the SDAccel Environment
 
@@ -167,14 +170,14 @@ The SDAccel emulation flows allows testing, profiling, and debugging the applica
 
 1. Run the SW Emulation flow for the SDAccel 'hello world' example:
 ```bash
-cd $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_ocl/
+cd $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_c/
 make clean
 make check TARGETS=sw_emu DEVICES=$AWS_PLATFORM all
 ```
 
 2. Run the HW Emulation flow for the SDAccel 'hello world' example:
 ```bash
-cd $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_ocl/
+cd $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_c/
 make clean
 make check TARGETS=hw_emu DEVICES=$AWS_PLATFORM all
 ```
@@ -190,12 +193,12 @@ Building these files is a two-step process. First SDAccel is used to build the h
 
 1. Build the host application and the &ast;.xclbin (Xilinx FPGA binary file):
 ```bash
-cd $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_ocl/
+cd $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_c/
 make clean
 make TARGETS=hw DEVICES=$AWS_PLATFORM all
 ```
 
-2. Create the AWS FPGA binary and AFI from the `*.xclbin` (Xilinx FPGA binary file):
+2. Create the AWS FPGA binary and AFI from the &ast;.xclbin (Xilinx FPGA binary file):
 ```bash
 cd xclbin
 $SDACCEL_DIR/tools/create_sdaccel_afi.sh \
@@ -237,9 +240,11 @@ aws ec2 describe-fpga-images --fpga-image-ids <AFI ID>
 
 #### Step 5: Execute the Host Application
 
+:warning: **IMPORTANT** :  The previous steps do not require an AWS EC2 F1 instance. They can be executed on other AWS EC2 instances such as C4 or C5. However, the steps that follow must be performed on an AWS EC2 F1 instance. You will receive error messages if you do not perform the following steps on an F1 instance.
+
 1. Execute the following commands in the instance terminal:
 ```bash
-cd $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_ocl/
+cd $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_c/
 sudo sh
 source /opt/xilinx/xrt/setup.sh   
 ./helloworld
diff --git a/docs/aws-getting-started/RTL/STEP2.md b/docs/aws-getting-started/RTL/STEP2.md
@@ -245,7 +245,7 @@ The command will return **Available** when the AFI is created, registered, and r
 
 ```json
   State: {
-      "Code" : Available"
+      "Code" : Available
   }
 ```
 
diff --git a/docs/aws-getting-started/RTL/STEP4.md b/docs/aws-getting-started/RTL/STEP4.md
diff --git a/docs/aws-getting-started/RTL/STEP5.md b/docs/aws-getting-started/RTL/STEP5.md

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ The command will return Available when the AFI is created, registered, and r`
`245`	`245`
`246`	`246`	```json
`247`	`247`	`State: {`
`248`		`- "Code" : Available"`
	`248`	`+ "Code" : Available`
`249`	`249`	`}`
`250`	`250`	```
`251`	`251`