Skip to content

Commit 7d1cfe7

Browse files
Revert "FPGA: Remove Windows simulator command for memory_attributes (oneapi-src#1374)"
This reverts commit 149dbb6.
1 parent b0c2f81 commit 7d1cfe7

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

DirectProgramming/C++SYCL_FPGA/Tutorials/Features/memory_attributes/README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,10 @@ The choice of attributes will be further discussed in the [Examining the Reports
249249
```
250250
nmake fpga_emu
251251
```
252+
* Compile for simulation (fast compile time, targets simulated FPGA device, reduced data size):
253+
```
254+
nmake fpga_sim
255+
```
252256
* Generate the optimization report:
253257
```
254258
nmake report
@@ -317,6 +321,12 @@ There are often many ways to generate a stall-free memory system. As a programme
317321
```bash
318322
CL_CONTEXT_MPSIM_DEVICE_INTELFPGA=1 ./memory_attributes.fpga_sim
319323
```
324+
* On Windows
325+
```bash
326+
set CL_CONTEXT_MPSIM_DEVICE_INTELFPGA=1
327+
memory_attributes.fpga_sim.exe
328+
set CL_CONTEXT_MPSIM_DEVICE_INTELFPGA=
329+
```
320330
3. Run the sample on the FPGA device (only if you ran `cmake` with `-DFPGA_DEVICE=<board-support-package>:<board-variant>`):
321331
```
322332
./memory_attributes.fpga (Linux)

DirectProgramming/C++SYCL_FPGA/Tutorials/Features/memory_attributes/src/CMakeLists.txt

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
set(SOURCE_FILE memory_attributes.cpp)
22
set(TARGET_NAME memory_attributes)
33
set(EMULATOR_TARGET ${TARGET_NAME}.fpga_emu)
4+
set(SIMULATOR_TARGET ${TARGET_NAME}.fpga_sim)
45
set(FPGA_TARGET ${TARGET_NAME}.fpga)
56

6-
if(UNIX)
7-
set(SIMULATOR_TARGET ${TARGET_NAME}.fpga_sim)
8-
endif()
9-
107
# FPGA board selection
118
if(NOT DEFINED FPGA_DEVICE)
129
set(FPGA_DEVICE "Agilex")
@@ -49,20 +46,18 @@ set_target_properties(${EMULATOR_TARGET} PROPERTIES LINK_FLAGS "${EMULATOR_LINK_
4946
add_custom_target(fpga_emu DEPENDS ${EMULATOR_TARGET})
5047

5148
###############################################################################
52-
### FPGA Simulator (for UNIX)
49+
### FPGA Simulator
5350
###############################################################################
5451
# To compile in a single command:
5552
# icpx -fsycl -fintelfpga -Xssimulation -DFPGA_SIMULATOR mem_channel.cpp -o mem_channel.fpga_sim
5653
# CMake executes:
5754
# [compile] icpx -fsycl -fintelfpga -Xssimulation -DFPGA_SIMULATOR -o mem_channel.cpp.o -c mem_channel.cpp
5855
# [link] icpx -fsycl -fintelfpga -Xssimulation mem_channel.cpp.o -o mem_channel.fpga_sim
59-
if(UNIX)
60-
add_executable(${SIMULATOR_TARGET} ${SOURCE_FILE})
61-
target_include_directories(${SIMULATOR_TARGET} PRIVATE ../../../../include)
62-
set_target_properties(${SIMULATOR_TARGET} PROPERTIES COMPILE_FLAGS "${SIMULATOR_COMPILE_FLAGS}")
63-
set_target_properties(${SIMULATOR_TARGET} PROPERTIES LINK_FLAGS "${SIMULATOR_LINK_FLAGS}")
64-
add_custom_target(fpga_sim DEPENDS ${SIMULATOR_TARGET})
65-
endif()
56+
add_executable(${SIMULATOR_TARGET} ${SOURCE_FILE})
57+
target_include_directories(${SIMULATOR_TARGET} PRIVATE ../../../../include)
58+
set_target_properties(${SIMULATOR_TARGET} PROPERTIES COMPILE_FLAGS "${SIMULATOR_COMPILE_FLAGS}")
59+
set_target_properties(${SIMULATOR_TARGET} PROPERTIES LINK_FLAGS "${SIMULATOR_LINK_FLAGS}")
60+
add_custom_target(fpga_sim DEPENDS ${SIMULATOR_TARGET})
6661

6762
###############################################################################
6863
### Generate Report

0 commit comments

Comments
 (0)