Skip to content

Commit f404c5b

Browse files
authored
Merge pull request #722 from aws/submodule-doc-links-fix
IP Submodule Link Updates
2 parents b8f83a8 + 2e696b0 commit f404c5b

File tree

10 files changed

+22
-22
lines changed

10 files changed

+22
-22
lines changed

docs-rtd/source/hdk/README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ Verification
644644

645645
- Simulation libraries can be found in
646646
`hdk/common/ip/cl_ip/cl_ip.ip_user_files/sim_scripts
647-
<https://github.com/aws/aws-fpga/tree/f2/hdk/common/ip/cl_ip/cl_ip.ip_user_files/sim_scripts>`__
647+
<https://github.com/aws/aws-fpga-resources/blob/-/cl_ip/cl_ip.ip_user_files/sim_scripts>`__
648648
followed by ``"IP_NAME"/"SIMULATOR"/"IP_NAME".sh``
649649

650650
- Adding new IPs requires to recompile the simulation libraries
@@ -744,8 +744,8 @@ categorized under four subdirectories:
744744
ip/
745745
~~~
746746

747-
The `ip/ <https://github.com/aws/aws-fpga/tree/f2/hdk/common/ip>`__ directory
748-
includes all CL IPs .
747+
The `ip/ <https://github.com/aws/aws-fpga-resources>`__ directory
748+
includes all CL IPs.
749749

750750
lib/
751751
~~~~

docs-rtd/source/hdk/cl/examples/CL-TEMPLATE/README.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ design files.
255255

256256
Users may modify these files and add new ones as their designs grow.
257257
Xilinx IP's are available to all CL examples (found under
258-
`$AWS_FPGA_REPO_DIR/hdk/common/ip <https://github.com/aws/aws-fpga/tree/f2/hdk/common/ip>`__).
258+
`$AWS_FPGA_REPO_DIR/hdk/common/ip <https://github.com/aws/aws-fpga-resources/>`__).
259259

260260
STEP 3: Develop Design Verification Tests (OPTIONAL)
261261
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -285,7 +285,7 @@ This will first generate and compile the simulation libraries required for the
285285
requested SIMULATOR. Test results will be stored in the
286286
``$CL_DIR/verif/sim/<SIMULATOR>`` directory (created upon first simulation
287287
run). After adding new IP's to
288-
`$AWS_FPGA_REPO_DIR/hdk/common/ip <https://github.com/aws/aws-fpga/tree/f2/hdk/common/ip>`__, the simulation
288+
`$AWS_FPGA_REPO_DIR/hdk/common/ip <https://github.com/aws/aws-fpga-resources/>`__, the simulation
289289
libraries need to be recompiled: ``make regenerate_sim_libs <SIMULATOR>=1``.
290290

291291
File List Generation
@@ -318,7 +318,7 @@ Xilinx/AMD IP Discovery and Compilation
318318
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
319319

320320
When running your first test, all Xilinx IP's under
321-
`$AWS_FPGA_REPO_DIR/hdk/common/ip/cl_ip <https://github.com/aws/aws-fpga/tree/f2/hdk/common/ip/cl_ip>`__
321+
`$AWS_FPGA_REPO_DIR/hdk/common/ip/cl_ip <https://github.com/aws/aws-fpga-resources/blob/-/cl_ip>`__
322322
are automatically compiled
323323

324324
- You can find the ``xil_defaultlib`` library for each simulator in
@@ -335,7 +335,7 @@ to ``COMMON_LIBLISTS`` in:
335335
Simulation library names can be found under:
336336

337337
- `$AWS_FPGA_REPO_DIR/hdk/common/ip/cl_ip/cl_ip.ip_user_files/sim_scripts
338-
<https://github.com/aws/aws-fpga/tree/f2/hdk/common/ip/cl_ip/cl_ip.ip_user_files/sim_scripts>`__ followed
338+
<https://github.com/aws/aws-fpga-resources/blob/-/cl_ip/cl_ip.ip_user_files/sim_scripts>`__ followed
339339
by ``<IP_NAME>/<SIMULATOR>/<IP_NAME>.sh``
340340

341341
All verification work is located under the `verif <https://github.com/aws/aws-fpga/tree/f2/hdk/common/verif>`__
@@ -376,7 +376,7 @@ and build scripts can be found in other examples such as
376376
- IP's used in AWS example designs can uncommented be in
377377
`synth_CL_TEMPLATE.tcl <https://github.com/aws/aws-fpga/tree/f2/hdk/cl/examples/CL_TEMPLATE/build/scripts/synth_CL_TEMPLATE.tcl>`__
378378
and found under
379-
`$AWS_FPGA_REPO_DIR/hdk/common/ip/cl_ip <https://github.com/aws/aws-fpga/tree/f2/hdk/common/ip/cl_ip>`__
379+
`$AWS_FPGA_REPO_DIR/hdk/common/ip/cl_ip <https://github.com/aws/aws-fpga-resources/blob/-/cl_ip>`__
380380
- If a design adds new IP's, make sure to add the new ``xci`` files
381381
to the build script
382382
`$CL_DIR/build/scripts/synth_CL_TEMPLATE.tcl <https://github.com/aws/aws-fpga/tree/f2/hdk/cl/examples/CL_TEMPLATE/build/scripts/synth_CL_TEMPLATE.tcl>`__

docs-rtd/source/hdk/docs/AWS-Shell-Interface-Specification.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ to HBM:
771771
true
772772
773773
**NOTE:** This step can be skipped if the customer uses the
774-
``CL_HBM`` IP from the `CL examples <https://github.com/aws/aws-fpga/tree/f2/hdk/common/ip/cl_ip/cl_ip.runs>`__.
774+
``CL_HBM`` IP from the `CL examples <https://github.com/aws/aws-fpga-resources/blob/-/cl_ip/cl_ip.gen/sources_1/ip>`__.
775775
This IP has the ``MON_APB`` interface enabled and is ready to be
776776
integrated to a customer design as-is.
777777

@@ -938,7 +938,7 @@ Please see the `Shell Floorplan <./shell-floorplan.html>`__ for additional
938938
details on Shell-CL interface placements in SMALL_SHELL.
939939

940940
For the interfaces that are in both the MID/BOTTOM the recommendation is
941-
to use flops for pipelining, but dont constrain to an SLR. You can
941+
to use flops for pipelining, but don't constrain to an SLR. You can
942942
constrain logic to a particular SLR by creating PBLOCKs (one per SLR),
943943
and assigning logic to the PBLOCKs (refer to cl_dram_hbm_dma example
944944
`small_shell_cl_pnr_user.xdc <https://github.com/aws/aws-fpga/tree/f2/hdk/cl/examples/cl_dram_hbm_dma/build/constraints/small_shell_cl_pnr_user.xdc>`__).

docs-rtd/source/hdk/docs/Supported-DDR-Modes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Required Build Script Modifications
8181
-----------------------------------
8282

8383
AWS provides following DDR Core IPs as part of Vivado
84-
`cl_ip.xpr <https://github.com/aws/aws-fpga/tree/f2/hdk/common/ip/cl_ip/cl_ip.xpr>`__ project. Users are
84+
`cl_ip.xpr <https://github.com/aws/aws-fpga-resources/blob/-/cl_ip/cl_ip.xpr>`__ project. Users are
8585
required to enlist one of the following XCI files in the synthesis
8686
scripts, depending on the desired DDR configuration and macros defined:
8787

docs-rtd/source/hdk/docs/Virtual-JTAG-XVC.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ Embedded Debug Bridge in CL
212212
---------------------------
213213

214214
The `CL_Debug_Bridge
215-
<https://github.com/aws/aws-fpga/tree/f2/hdk/common/ip/cl_ip/cl_ip.srcs/sources_1/ip/cl_debug_bridge/cl_debug_bridge.xci>`__
215+
<https://github.com/aws/aws-fpga-resources/blob/-/cl_ip/cl_ip.srcs/sources_1/ip/cl_debug_bridge/cl_debug_bridge.xci>`__
216216
IP must be embedded in the CL design to enable the use of debug cores like ILA
217217
and VIO. According to the `AMD user guide
218218
<https://docs.amd.com/r/en-US/ug908-vivado-programming-debugging/Debug-Cores-Clocking-Guidelines>`__

hdk/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ After adding new design IPs, make sure to add the new simulation `COMMON_LIBLIST
439439

440440
- Make sure to add the new simulation libraries to `COMMON_LIBLISTS` in [$AWS_FPGA_REPO_DIR/hdk/common/verif/tb/scripts/Makefile.common.inc](./common/verif/tb/scripts/Makefile.common.inc)
441441
- This is required for XSIM and Questa simulations
442-
- These libraries can be found in [$AWS_FPGA_REPO_DIR/hdk/common/ip/cl_ip/cl_ip.ip_user_files/sim_scripts](./common/ip/cl_ip/cl_ip.ip_user_files/sim_scripts) followed by `"IP_NAME"/"SIMULATOR"/"IP_NAME".sh`
442+
- These libraries can be found in [$AWS_FPGA_REPO_DIR/hdk/common/ip/cl_ip/cl_ip.ip_user_files/sim_scripts](https://github.com/aws/aws-fpga-resources/blob/-/cl_ip/cl_ip.ip_user_files/sim_scripts) followed by `"IP_NAME"/"SIMULATOR"/"IP_NAME".sh`
443443
- After adding new IP's to [$AWS_FPGA_REPO_DIR/hdk/common/ip](./common/ip) the simulation libraries need to be recompiled
444444
- Run `make regenerate_sim_libs <XSIM/VCS/QUESTA>=1`
445445

@@ -491,7 +491,7 @@ The verif ip_simulation_libraries directory is created during runtime and includ
491491

492492
### [/ip](./common/ip)
493493

494-
The [ip directory](./common/ip) includes basic IP that is used by CL's.
494+
The [ip directory](https://github.com/aws/aws-fpga-resources) includes basic IP that is used by CL's.
495495

496496
### [/lib](./common/lib)
497497

hdk/cl/examples/CL_TEMPLATE/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ The result will be a directory containing everything in CL_TEMPLATE (renamed to
151151

152152
All CL design files should be placed under the [design](./design) directory. Please see the [Design](#design) section for information on the CL_TEMPLATE design files.
153153

154-
Users may modify these files and add new ones as their designs grow. Xilinx IP's are available to all CL examples (found under [$AWS_FPGA_REPO_DIR/hdk/common/ip](./../../../common/ip)).
154+
Users may modify these files and add new ones as their designs grow. Xilinx IP's are available to all CL examples (found under [$AWS_FPGA_REPO_DIR/hdk/common/ip](https://github.com/aws/aws-fpga-resources/tree/Vivado_2024.2-hdk/common/ip)).
155155

156156
### STEP 3: Develop Design Verification Tests (OPTIONAL)
157157

@@ -170,7 +170,7 @@ Or specify an [available simulator](./../../../../README.md#supported-tools-vers
170170
make CL_TEMPLATE_base_test <SIMULATOR>=1
171171
```
172172

173-
This will first generate and compile the simulation libraries required for the requested SIMULATOR. Test results will be stored in the `$CL_DIR/verif/sim/<SIMULATOR>` directory (created upon first simulation run). After adding new IP's to [`$AWS_FPGA_REPO_DIR/hdk/common/ip`](./../../../common/ip) the simulation libraries need to be recompiled: `make regenerate_sim_libs <SIMULATOR>=1`.
173+
This will first generate and compile the simulation libraries required for the requested SIMULATOR. Test results will be stored in the `$CL_DIR/verif/sim/<SIMULATOR>` directory (created upon first simulation run). After adding new IP's to [`$AWS_FPGA_REPO_DIR/hdk/common/ip`](https://github.com/aws/aws-fpga-resources/tree/Vivado_2024.2-hdk/common/ip) the simulation libraries need to be recompiled: `make regenerate_sim_libs <SIMULATOR>=1`.
174174

175175
#### File List Generation
176176

@@ -197,7 +197,7 @@ $CL_DIR/design/CL_TEMPLATE.sv
197197

198198
#### Xilinx/AMD IP Discovery and Compilation
199199

200-
When running your first test, all Xilinx IP's under [$AWS_FPGA_REPO_DIR/hdk/common/ip/cl_ip](./../../../common/ip/cl_ip) are automatically compiled
200+
When running your first test, all Xilinx IP's under [$AWS_FPGA_REPO_DIR/hdk/common/ip/cl_ip](https://github.com/aws/aws-fpga-resources/tree/Vivado_2024.2-hdk/common/ip/cl_ip) are automatically compiled
201201

202202
- You can find the `xil_defaultlib` library for each simulator in [$AWS_FPGA_REPO_DIR/hdk/common/verif/ip_simulation_libraries/](./../../../common/verif) (created after first simulation run)
203203

@@ -207,7 +207,7 @@ If a design adds new IP's, make sure to add the new simulation libraries to `COM
207207

208208
Simulation library names can be found under:
209209

210-
- [$AWS_FPGA_REPO_DIR/hdk/common/ip/cl_ip/cl_ip.ip_user_files/sim_scripts](./../../../common/ip/cl_ip/cl_ip.ip_user_files/sim_scripts)
210+
- [$AWS_FPGA_REPO_DIR/hdk/common/ip/cl_ip/cl_ip.ip_user_files/sim_scripts](https://github.com/aws/aws-fpga-resources/tree/Vivado_2024.2-hdk/common/ip/cl_ip/cl_ip.ip_user_files/sim_scripts)
211211
followed by `<IP_NAME>/<SIMULATOR>/<IP_NAME>.sh`
212212

213213
All verification work is located under the [verif](./verif) directory. Please see the [Verification](#verification) section for the CL_TEMPLATE verification details.
@@ -226,7 +226,7 @@ Once design files have been added and tested, constraint and build script update
226226
- Additional constraint files to be applied during a build
227227
- Additional tcl scripts to synthesize the design
228228
- Xilinx IP's utilized in the design
229-
- IP's used in AWS example designs can uncommented be in [synth_CL_TEMPLATE.tcl](./build/scripts/synth_CL_TEMPLATE.tcl) and found under [$AWS_FPGA_REPO_DIR/hdk/common/ip/cl_ip](./../../../common/ip/cl_ip)
229+
- IP's used in AWS example designs can uncommented be in [synth_CL_TEMPLATE.tcl](./build/scripts/synth_CL_TEMPLATE.tcl) and found under [$AWS_FPGA_REPO_DIR/hdk/common/ip/cl_ip](https://github.com/aws/aws-fpga-resources/tree/Vivado_2024.2-hdk/common/ip/cl_ip)
230230
- If a design adds new IP's, make sure to add the new `xci` files to the build script [$CL_DIR/build/scripts/synth_CL_TEMPLATE.tcl](./build/scripts/synth_CL_TEMPLATE.tcl)
231231
3. Run [aws_build_dcp_from_cl.py](./build/scripts/aws_build_dcp_from_cl.py). All defaults can be found by running `aws_build_dcp_from_cl.py --help`
232232

hdk/docs/AWS_Shell_Interface_Specification.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ These steps must be followed to properly connect the monitor interfaces to HBM:
440440
true
441441
```
442442
443-
**NOTE:** This step can be skipped if the customer uses the `CL_HBM` IP from the [CL examples](./../../hdk/common/ip/cl_ip/). This IP has the `MON_APB` interface enabled and is ready to be integrated to a customer design as-is.
443+
**NOTE:** This step can be skipped if the customer uses the `CL_HBM` IP from the [CL examples](https://github.com/aws/aws-fpga-resources/blob/-/cl_ip/cl_ip.gen/sources_1/ip). This IP has the `MON_APB` interface enabled and is ready to be integrated to a customer design as-is.
444444
445445
2. Connect the HBM monitor interface from the shell to the HBM IP. The customer can leave the interface floating if the corresponding HBM rack is not used. For example, the `hbm_apb_p<xx>_1` signals can be left unconnected if HBM rack 1 is unused.
446446

hdk/docs/Supported_DDR_Modes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ make TEST=${TEST_NAME} USE_AP_64GB_DDR_DIMM=1
4444

4545
## Required Build Script Modifications
4646

47-
AWS provides following DDR Core IPs as part of Vivado [cl_ip.xpr](./../common/ip/cl_ip/cl_ip.xpr) project. Users are required to enlist one of the following XCI files in the synthesis scripts, depending on the desired DDR configuration and macros defined:
47+
AWS provides following DDR Core IPs as part of Vivado [cl_ip.xpr](https://github.com/aws/aws-fpga-resources/blob/-/cl_ip/cl_ip.xpr) project. Users are required to enlist one of the following XCI files in the synthesis scripts, depending on the desired DDR configuration and macros defined:
4848

4949
| Macro definition in top level CL | Description | DDR XCI file to read in synthesis script |
5050
|----------------------------------|--------------------------------------------------------------------|------------------------------------------|

hdk/docs/Virtual_JTAG_XVC.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ Guide for debugging designs through Vivado running on a remote machine is coming
160160

161161
## Embedded Debug Bridge in CL
162162

163-
The [CL_Debug_Bridge](./../common/ip/cl_ip/cl_ip.srcs/sources_1/ip/cl_debug_bridge/cl_debug_bridge.xci) IP must be embedded in the CL design to enable the use of debug cores like ILA and VIO. According to the [AMD user guide](https://docs.amd.com/r/en-US/ug908-vivado-programming-debugging/Debug-Cores-Clocking-Guidelines), the clock of `CL_Debug_Bridge` must be at least 2.5 times faster than the JTAG clock. The JTAG clock frequency is fixed at 31.25 MHz in the F2 shells. Therefore, the frequency of the clock connected to the `CL_Debug_Bridge` should be at least 2.5 x 31.25 MHz = 78.125 MHz. Failure to meet this requirement will result in the debug network not functioning correctly. However, this minimum clock frequency requirement does not apply to the ILA or VIO debug cores or the rest of the CL logic. If the CL design is running on a slower clock from the available clock recipes, care must be taken to ensure that the `CL_Debug_Bridge` is clocked at 78.125 MHz or above.
163+
The [CL_Debug_Bridge](https://github.com/aws/aws-fpga-resources/blob/-/cl_ip/cl_ip.srcs/sources_1/ip/cl_debug_bridge/cl_debug_bridge.xci) IP must be embedded in the CL design to enable the use of debug cores like ILA and VIO. According to the [AMD user guide](https://docs.amd.com/r/en-US/ug908-vivado-programming-debugging/Debug-Cores-Clocking-Guidelines), the clock of `CL_Debug_Bridge` must be at least 2.5 times faster than the JTAG clock. The JTAG clock frequency is fixed at 31.25 MHz in the F2 shells. Therefore, the frequency of the clock connected to the `CL_Debug_Bridge` should be at least 2.5 x 31.25 MHz = 78.125 MHz. Failure to meet this requirement will result in the debug network not functioning correctly. However, this minimum clock frequency requirement does not apply to the ILA or VIO debug cores or the rest of the CL logic. If the CL design is running on a slower clock from the available clock recipes, care must be taken to ensure that the `CL_Debug_Bridge` is clocked at 78.125 MHz or above.
164164

165165
```verilog
166166
//-----------------------------------

0 commit comments

Comments
 (0)