diff --git a/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/merge_sort/README.md b/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/merge_sort/README.md index 952891b52e..3dc9f2ef3f 100755 --- a/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/merge_sort/README.md +++ b/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/merge_sort/README.md @@ -40,7 +40,7 @@ You can also find more information about [troubleshooting build errors](/DirectP | Optimized for | Description |:--- |:--- -| OS | Ubuntu* 18.04/20.04
RHEL*/CentOS* 8
SUSE* 15
Windows* 10 +| OS | Ubuntu* 18.04/20.04
RHEL*/CentOS* 8
SUSE* 15 | Hardware | Intel® Programmable Acceleration Card with Intel® Arria® 10 GX FPGA (Intel® PAC with Intel® Arria® 10 GX FPGA)
Intel® FPGA Programmable Acceleration Card (PAC) D5005 (with Intel Stratix® 10 SX) | Software | Intel® oneAPI DPC++/C++ Compiler @@ -111,11 +111,7 @@ For `constexpr_math.hpp`, `pipe_utils.hpp`, and `unrolled_loop.hpp` see the READ > - For private installations: ` . ~/intel/oneapi/setvars.sh` > - For non-POSIX shells, like csh, use the following command: `bash -c 'source /setvars.sh ; exec csh'` > -> Windows*: -> - `C:\Program Files(x86)\Intel\oneAPI\setvars.bat` -> - Windows PowerShell*, use the following command: `cmd.exe "/K" '"C:\Program Files (x86)\Intel\oneAPI\setvars.bat" && powershell'` -> -> For more information on configuring environment variables, see [Use the setvars Script with Linux* or macOS*](https://www.intel.com/content/www/us/en/develop/documentation/oneapi-programming-guide/top/oneapi-development-environment-setup/use-the-setvars-script-with-linux-or-macos.html) or [Use the setvars Script with Windows*](https://www.intel.com/content/www/us/en/develop/documentation/oneapi-programming-guide/top/oneapi-development-environment-setup/use-the-setvars-script-with-windows.html). +> For more information on configuring environment variables, see [Use the setvars Script with Linux* or macOS*](https://www.intel.com/content/www/us/en/develop/documentation/oneapi-programming-guide/top/oneapi-development-environment-setup/use-the-setvars-script-with-linux-or-macos.html). ### On Linux* @@ -153,43 +149,6 @@ For `constexpr_math.hpp`, `pipe_utils.hpp`, and `unrolled_loop.hpp` see the READ (Optional) The hardware compiles listed above can take several hours to complete; alternatively, you can download FPGA precompiled binaries (compatible with Linux* Ubuntu* 18.04) from [https://iotdk.intel.com/fpga-precompiled-binaries/latest/merge_sort.fpga.tar.gz](https://iotdk.intel.com/fpga-precompiled-binaries/latest/merge_sort.fpga.tar.gz). -### On Windows* - -> **Note**: The Intel® PAC with Intel Arria® 10 GX FPGA and Intel® FPGA PAC D5005 (with Intel Stratix® 10 SX) do not yet support Windows*. Compiling to FPGA hardware on Windows* requires a third-party or custom Board Support Package (BSP) with Windows* support. - -1. Change to the sample directory. -2. Configure the build system for **Intel® PAC with Intel Arria® 10 GX FPGA**, which is the default - ``` - mkdir build - cd build - cmake -G "NMake Makefiles" .. - ``` - For the **Intel® FPGA PAC D5005 (with Intel Stratix® 10 SX)**, enter the following: - ``` - cmake -G "NMake Makefiles" .. -DFPGA_DEVICE=intel_s10sx_pac:pac_s10 - ``` -3. Compile the design. (The provided targets match the recommended development flow.) - - 1. Compile for emulation (fast compile time, targets emulated FPGA device). - ``` - nmake fpga_emu - ``` - 2. Compile for simulation (fast compile time, targets simulator FPGA device): - ``` - nmake fpga_sim - ``` - 3. Generate the HTML performance report. - ``` - nmake report - ``` - The report resides at `merge_sort_report.a.prj/reports/report.html`. - - 4. Compile for FPGA hardware (longer compile time, targets FPGA device). - ``` - nmake fpga - ``` -> **Note**: If you encounter any issues with long paths when compiling under Windows*, you may have to create your ‘build’ directory in a shorter path, for example `c:\samples\build`. You can then run cmake from that directory, and provide cmake with the full path to your sample directory. - ## Run the `Merge Sort` Program ### On Linux @@ -206,22 +165,6 @@ For `constexpr_math.hpp`, `pipe_utils.hpp`, and `unrolled_loop.hpp` see the READ ``` ./merge_sort.fpga ``` -### On Windows - -1. Run the sample on the FPGA emulator (the kernel executes on the CPU). - ``` - merge_sort.fpga_emu.exe - ``` -2. Run the sample on the FPGA simulator device: - ``` - set CL_CONTEXT_MPSIM_DEVICE_INTELFPGA=1 - merge_sort.fpga_sim.exe - set CL_CONTEXT_MPSIM_DEVICE_INTELFPGA= - ``` -3. Run the sample on the FPGA device. - ``` - merge_sort.fpga.exe - ``` ## Example Output