Skip to content

Commit b42b91d

Browse files
authored
Pulling in PR: 466, 468, 470, 471 from aws-fpga (#586)
* Remove duplicate line (#468) * Correct path for helloworld example (#466) In xilinx_2019.1 @ 0ec1aef (and not previous versions) the hello world example is located in $SDACCEL_DIR/examples/xilinx/getting_started/hello_world/helloworld_ocl/ rather than $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_ocl/ * Update path (#470) * Update path Attempting to change directories into this path (i.e., `/home/centos/src/project_data/aws-fpga/SDAccel/examples/xilinx_2017.4/getting_started/host/helloworld_ocl`) draws an error because the `xilinx_2017.4` directory is empty, now, and `xilinx` is a symbolic link that points to the latest release (i.e., `/home/centos/src/project_data/aws-fpga/SDAccel/examples/xilinx_2019.1`). Additionally: `helloworld_ocl` is no longer a sub-directory of `host`; it's now a sub-directory of `hello_world`: so this part of the path should be updated as well. * Fix unset flags The alphanumeric part of these flags (i.e., `f`) are preceded by en dashes, when they should be hyphens; as using the former instead of the later results in errors (`-bash: unset: ``–f': not a valid identifier`). * Update path to workspace directory This change is consistent with 48c3048, and the basename of the image, but has a different filename extension because of the transparency. * Update figures 1, 2, and 3 for SDx 2019.1 (#471) * Update gui_fig_2.png and gui_fig_3.png to SDx 2019.1 SDx's welcome screen has stratified the option (read: clickable button) to `Create SDx Project` into two new ones: `Create Platform Project` and `Create Library Project`. These changes are rendered in Figure 2, while Figure 3 captures cosmetic differences to the user interface. * Add Figure 2 * Add Figure 3
1 parent 0af7c19 commit b42b91d

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

SDAccel/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ For CPU-based (SW) emulation, both the host code and the FPGA binary code are co
8989
The instructions below describe how to run the SDAccel SW Emulation flow using the Makefile provided with a simple "hello world" example
9090

9191
```
92-
$ cd $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_ocl/
92+
$ cd $SDACCEL_DIR/examples/xilinx/getting_started/hello_world/helloworld_ocl/
9393
$ make clean
9494
$ make check TARGETS=sw_emu DEVICES=$AWS_PLATFORM all
9595
```
@@ -104,7 +104,7 @@ The SDAccel hardware emulation flow enables the developer to check the correctne
104104
The instructions below describe how to run the HW Emulation flow using the Makefile provided with a simple "hello world" example:
105105

106106
```
107-
$ cd $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_ocl/
107+
$ cd $SDACCEL_DIR/examples/xilinx/getting_started/hello_world/helloworld_ocl/
108108
$ make clean
109109
$ make check TARGETS=hw_emu DEVICES=$AWS_PLATFORM all
110110
```
@@ -118,7 +118,7 @@ The SDAccel system build flow enables the developer to build their host applicat
118118
The instructions below describe how to build the Xilinx FPGA Binary and host application using the Makefile provided with a simple "hello world" example:
119119

120120
```
121-
$ cd $SDACCEL_DIR/examples/xilinx/getting_started/host/helloworld_ocl/
121+
$ cd $SDACCEL_DIR/examples/xilinx/getting_started/hello_world/helloworld_ocl/
122122
$ make clean
123123
$ make TARGETS=hw DEVICES=$AWS_PLATFORM all
124124
```
@@ -198,7 +198,7 @@ For help with AFI creation issues, see [create-fpga-image error codes](../hdk/do
198198
* Depending on the host code, the \*.awsxclbin may need to named \<hostcodename>.hw.\<platformname>.awsxclbin .For Example: ```vector_addition.hw.xilinx_aws-vu9p-f1-04261818_dynamic_5_0.awsxclbin```
199199
* Copy any data files required for execution to the new instance
200200
* [Clone the github repository to the new F1 instance and install runtime drivers](#gitsetenv)
201-
* Clone the github repository to the new F1 instance and install runtime drivers
201+
202202
```
203203
$ git clone https://github.com/aws/aws-fpga.git $AWS_FPGA_REPO_DIR
204204
$ cd $AWS_FPGA_REPO_DIR

SDAccel/docs/README_GUI.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The SDAccel examples from the github are downloaded by the above steps. However,
2929

3030
First change directory to **helloworld_ocl** example.
3131
```
32-
$ cd <git area>/SDAccel/examples/xilinx_2017.4/getting_started/host/helloworld_ocl
32+
$ cd <git area>/SDAccel/examples/xilinx/getting_started/hello_world/helloworld_ocl
3333
```
3434
The github examples use common header files and those needs to be copied in the local project source folder to make it easier to use.
3535
Type the command **make local-files** to copy all necessary files in the local directory.
@@ -46,9 +46,9 @@ To debug using gdb inside from SDX gui few additional commands are needed to exe
4646

4747
```
4848
$ mv /usr/local/Modules/init init.bak
49-
$ unset f switchml
50-
$ unset f _moduleraw
51-
$ unset f module
49+
$ unset -f switchml
50+
$ unset -f _moduleraw
51+
$ unset -f module
5252
$ sdx
5353
```
5454

@@ -62,7 +62,7 @@ We will now cover the following steps:
6262
Add workspace inside the current directory named "GUI_test" as shown below. A new directory **GUI_test** will be created and used to store all logfiles of our runs.
6363

6464

65-
![](./figure/gui_fig_1.JPG)
65+
![](./figure/gui_fig_1.png)
6666

6767
<br>
6868

@@ -71,15 +71,15 @@ You will get a Welcome screen. You need to set Platform path by selecting **Add
7171

7272
<br>
7373

74-
![](./figure/gui_fig_2.JPG)
74+
![](./figure/gui_fig_2.png)
7575

7676

7777

7878
Click on the **plus** sign as shown below.
7979

8080

8181

82-
![](./figure/gui_fig_3.JPG)
82+
![](./figure/gui_fig_3.png)
8383

8484

8585

SDAccel/docs/figure/gui_fig_1.png

124 KB
Loading

SDAccel/docs/figure/gui_fig_2.png

186 KB
Loading

SDAccel/docs/figure/gui_fig_3.png

226 KB
Loading

0 commit comments

Comments
 (0)