Skip to content

Commit 33c2eb5

Browse files
stsoestsoe
authored
Exclude Alveo content from NPU component (#8700)
Ensure that Alveo specific content is built only for Alveo or legacy XRT components. E.g., only build Alveo artifacts when XRT_ALVEO is defined. Signed-off-by: Soren Soe <[email protected]>
1 parent c19b80a commit 33c2eb5

File tree

10 files changed

+62
-41
lines changed

10 files changed

+62
-41
lines changed

‎src/CMake/version.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ if (${XRT_NATIVE_BUILD} STREQUAL "yes")
105105
endif()
106106

107107
# This is not required on MPSoC platform. To avoid yocto error, do NOT intall
108-
if ((${XRT_NATIVE_BUILD} STREQUAL "yes") AND (NOT WIN32))
108+
if (XRT_ALVEO AND (${XRT_NATIVE_BUILD} STREQUAL "yes") AND (NOT WIN32))
109109
# Copied over from dkms.cmake. TODO: cleanup
110110
set (XRT_DKMS_INSTALL_DIR "/usr/src/xrt-${XRT_VERSION_STRING}")
111111
install(FILES ${PROJECT_BINARY_DIR}/gen/version.h

‎src/runtime_src/core/pcie/emulation/CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# SPDX-License-Identifier: Apache-2.0
22
# Copyright (C) 2019-2021 Xilinx, Inc. All rights reserved.
3-
#
4-
add_subdirectory(common_em)
5-
add_subdirectory(sw_emu)
6-
add_subdirectory(hw_emu)
3+
# Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
4+
if (XRT_ALVEO)
5+
add_subdirectory(common_em)
6+
add_subdirectory(sw_emu)
7+
add_subdirectory(hw_emu)
8+
endif()

‎src/runtime_src/core/pcie/emulation/hw_emu/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ target_link_libraries(xrt_hwemu_static
6363

6464
install (TARGETS xrt_hwemu xrt_hwemu_static
6565
EXPORT xrt-targets
66-
RUNTIME DESTINATION ${XRT_INSTALL_BIN_DIR} COMPONENT ${XRT_COMPONENT}
67-
LIBRARY DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_COMPONENT ${XRT_DEV_COMPONENT}
68-
ARCHIVE DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_DEV_COMPONENT}
66+
RUNTIME DESTINATION ${XRT_INSTALL_BIN_DIR} COMPONENT ${XRT_ALVEO_COMPONENT}
67+
LIBRARY DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_ALVEO_COMPONENT} NAMELINK_COMPONENT ${XRT_ALVEO_DEV_COMPONENT}
68+
ARCHIVE DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_ALVEO_DEV_COMPONENT}
6969
)
7070

‎src/runtime_src/core/pcie/emulation/sw_emu/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ target_link_libraries(xrt_swemu_static
5757

5858
install (TARGETS xrt_swemu xrt_swemu_static
5959
EXPORT xrt-targets
60-
RUNTIME DESTINATION ${XRT_INSTALL_BIN_DIR} COMPONENT ${XRT_COMPONENT}
61-
LIBRARY DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_COMPONENT ${XRT_DEV_COMPONENT}
62-
ARCHIVE DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_DEV_COMPONENT}
60+
RUNTIME DESTINATION ${XRT_INSTALL_BIN_DIR} COMPONENT ${XRT_ALVEO_COMPONENT}
61+
LIBRARY DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_ALVEO_COMPONENT} NAMELINK_COMPONENT ${XRT_ALVEO_DEV_COMPONENT}
62+
ARCHIVE DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_ALVEO_DEV_COMPONENT}
6363
)

‎src/runtime_src/core/pcie/linux/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,11 @@ target_link_libraries(xrt_core_static
6868
pthread
6969
)
7070

71+
# Shim for Linux is installed in the base component as it is
72+
# used by both Alveo and NPU components.
7173
install(TARGETS xrt_core xrt_core_static
7274
EXPORT xrt-targets
73-
RUNTIME DESTINATION ${XRT_INSTALL_BIN_DIR} COMPONENT ${XRT_COMPONENT}
74-
LIBRARY DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_COMPONENT ${XRT_DEV_COMPONENT}
75-
ARCHIVE DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_DEV_COMPONENT}
75+
RUNTIME DESTINATION ${XRT_INSTALL_BIN_DIR} COMPONENT ${XRT_BASE_COMPONENT}
76+
LIBRARY DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_BASE_COMPONENT} NAMELINK_COMPONENT ${XRT_BASE_DEV_COMPONENT}
77+
ARCHIVE DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_BASE_DEV_COMPONENT}
7678
)

‎src/runtime_src/core/pcie/noop/CMakeLists.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# SPDX-License-Identifier: Apache-2.0
22
# Copyright (C) 2019-2022 Xilinx, Inc. All rights reserved.
3+
# Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
4+
if (NOT XRT_ALVEO)
5+
return()
6+
endif()
7+
38
add_library(xrt_noop SHARED
49
device_noop.cpp
510
shim.cpp
@@ -31,7 +36,7 @@ set_target_properties(xrt_noop PROPERTIES
3136

3237
install(TARGETS xrt_noop
3338
EXPORT xrt-targets
34-
RUNTIME DESTINATION ${XRT_INSTALL_BIN_DIR} COMPONENT ${XRT_COMPONENT}
35-
LIBRARY DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_COMPONENT ${XRT_DEV_COMPONENT}
36-
ARCHIVE DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_DEV_COMPONENT}
39+
RUNTIME DESTINATION ${XRT_INSTALL_BIN_DIR} COMPONENT ${XRT_ALVEO_COMPONENT}
40+
LIBRARY DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_ALVEO_COMPONENT} NAMELINK_COMPONENT ${XRT_ALVEO_DEV_COMPONENT}
41+
ARCHIVE DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_ALVEO_DEV_COMPONENT}
3742
)

‎src/runtime_src/core/pcie/tools/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# SPDX-License-Identifier: Apache-2.0
22
# Copyright (C) 2019-2021 Xilinx, Inc. All rights reserved.
3-
#
4-
add_subdirectory(cloud-daemon)
5-
3+
# Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
64
if(XRT_ALVEO)
5+
add_subdirectory(cloud-daemon)
76
add_subdirectory(xbflash.qspi)
87
endif(XRT_ALVEO)

‎src/runtime_src/core/pcie/windows/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# SPDX-License-Identifier: Apache-2.0
22
# Copyright (C) 2019-2022 Xilinx, Inc. All rights reserved.
3-
#
4-
xrt_add_subdirectory(alveo)
3+
# Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
4+
if (XRT_ALVEO)
5+
xrt_add_subdirectory(alveo)
6+
endif()

‎src/runtime_src/core/pcie/windows/alveo/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ endif()
4949
# platforms.
5050
install(TARGETS xrt_core xrt_core_static
5151
EXPORT xrt-targets
52-
RUNTIME DESTINATION ${XRT_INSTALL_BIN_DIR} COMPONENT ${XRT_COMPONENT}
53-
LIBRARY DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_COMPONENT ${XRT_DEV_COMPONENT}
54-
ARCHIVE DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_DEV_COMPONENT}
52+
RUNTIME DESTINATION ${XRT_INSTALL_BIN_DIR} COMPONENT ${XRT_ALVEO_COMPONENT}
53+
LIBRARY DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_ALVEO_COMPONENT} NAMELINK_COMPONENT ${XRT_ALVEO_DEV_COMPONENT}
54+
ARCHIVE DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_ALVEO_DEV_COMPONENT}
5555
)

‎src/runtime_src/tools/scripts/CMakeLists.txt

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,39 @@
22
# Copyright (C) 2019-2021 Xilinx, Inc. All rights reserved.
33
#
44
if (NOT WIN32)
5+
set(XRT_SETUP_SCRIPTS
6+
setup.sh
7+
setup.csh)
58

6-
set(XRT_SETUP_SCRIPTS
7-
setup.sh
8-
setup.csh)
9+
set(XRT_LOADER_SCRIPTS
10+
loader)
911

10-
set(XRT_LOADER_SCRIPTS
11-
loader)
12-
13-
set (XRT_SCRIPTS
14-
service_bundle.sh
15-
plp_program.sh)
12+
set (XRT_SCRIPTS
13+
service_bundle.sh
14+
plp_program.sh)
1615

1716
else()
1817

19-
set(XRT_SETUP_SCRIPTS
20-
setup.bat)
18+
set(XRT_SETUP_SCRIPTS
19+
setup.bat)
2120

22-
set (XRT_LOADER_SCRIPTS
23-
loader.bat)
21+
set (XRT_LOADER_SCRIPTS
22+
loader.bat)
2423

2524
endif(NOT WIN32)
2625

27-
install (PROGRAMS ${XRT_SCRIPTS} DESTINATION ${XRT_INSTALL_BIN_DIR})
28-
install (PROGRAMS ${XRT_LOADER_SCRIPTS} DESTINATION ${XRT_INSTALL_UNWRAPPED_DIR})
29-
install (FILES ${XRT_SETUP_SCRIPTS} DESTINATION ${XRT_INSTALL_DIR})
26+
if (XRT_BASE)
27+
install (PROGRAMS ${XRT_LOADER_SCRIPTS}
28+
DESTINATION ${XRT_INSTALL_UNWRAPPED_DIR}
29+
COMPONENT ${XRT_BASE_COMPONENT})
30+
31+
install (FILES ${XRT_SETUP_SCRIPTS}
32+
DESTINATION ${XRT_INSTALL_DIR}
33+
COMPONENT ${XRT_BASE_COMPONENT})
34+
endif()
35+
36+
if (XRT_ALVEO)
37+
install (PROGRAMS ${XRT_SCRIPTS}
38+
DESTINATION ${XRT_INSTALL_BIN_DIR}
39+
COMPONENT ${XRT_ALVEO_COMPONENT})
40+
endif()

0 commit comments

Comments
 (0)