Skip to content

Commit 876a9de

Browse files
authored
FPGA: remove 2023.0 cruft in anticipation of 2023.1 release (#1476)
This is a port of #1474
1 parent f409932 commit 876a9de

File tree

5 files changed

+13
-385
lines changed

5 files changed

+13
-385
lines changed

DirectProgramming/C++SYCL_FPGA/Tutorials/GettingStarted/fpga_template/src/fpga_template.cpp

+6-14
Original file line numberDiff line numberDiff line change
@@ -32,33 +32,25 @@ int main() {
3232
bool passed = false;
3333

3434
try {
35-
// This design is tested with 2023.0, but also accounts for a syntax change in
36-
// 2023.1
37-
#if __INTEL_CLANG_COMPILER >= 20230100
35+
36+
// Use compile-time macros to select either:
37+
// - the FPGA emulator device (CPU emulation of the FPGA)
38+
// - the FPGA device (a real FPGA)
39+
// - the simulator device
3840
#if FPGA_SIMULATOR
3941
auto selector = sycl::ext::intel::fpga_simulator_selector_v;
4042
#elif FPGA_HARDWARE
4143
auto selector = sycl::ext::intel::fpga_selector_v;
4244
#else // #if FPGA_EMULATOR
4345
auto selector = sycl::ext::intel::fpga_emulator_selector_v;
4446
#endif
45-
#elif __INTEL_CLANG_COMPILER >= 20230000
46-
#if FPGA_SIMULATOR
47-
auto selector = sycl::ext::intel::fpga_simulator_selector{};
48-
#elif FPGA_HARDWARE
49-
auto selector = sycl::ext::intel::fpga_selector{};
50-
#else // #if FPGA_EMULATOR
51-
auto selector = sycl::ext::intel::fpga_emulator_selector{};
52-
#endif
53-
#else
54-
assert(false) && "this design requires oneAPI 2023.0 or 2023.1!"
55-
#endif
5647

5748
sycl::queue q(selector, fpga_tools::exception_handler,
5849
sycl::property::queue::enable_profiling{});
5950

6051
auto device = q.get_device();
6152

53+
// make sure the device supports USM host allocations
6254
if (!device.has(sycl::aspect::usm_host_allocations)) {
6355
std::cerr << "This design must either target a board that supports USM "
6456
"Host/Shared allocations, or IP Component Authoring. "

DirectProgramming/C++SYCL_FPGA/Tutorials/Tools/experimental/platform_designer/README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ Follow these steps to compile and test the design:
179179

180180
```
181181
> cd .. # navigate to project root if not there already
182-
> xcopy add-oneapi\build\add.fpga_ip_export.prj_1\ add-quartus\add.fpga_ip_export.prj_1 /e /s /i
182+
> ROBOCOPY add-oneapi\build\add.fpga_ip_export.prj_1\ add-quartus\add.fpga_ip_export.prj_1\ /S
183+
183184
```
184185

185186
4. Create the Platform Designer system.

0 commit comments

Comments
 (0)