Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
branch = main-ge
[submodule "src/runtime_src/aie-rt"]
path = src/runtime_src/aie-rt
url = https://github.com/Xilinx/aie-rt.git
branch = release/main_aig
url = https://github.com/Xilinx/aie-codegen.git
branch = main
[submodule "src/runtime_src/core/tools/xbtracer/Detours"]
path = src/runtime_src/core/tools/xbtracer/Detours
url = https://github.com/microsoft/Detours.git
Expand Down
32 changes: 24 additions & 8 deletions src/runtime_src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ endif(XRT_ENABLE_WERROR)
if (NOT XRT_EDGE)
add_compile_options( ${XRT_WARN_OPTS} )
endif()
xrt_add_subdirectory(xdp)

xrt_add_subdirectory(tools/xclbinutil)
xrt_add_subdirectory(xocl)
Expand All @@ -53,13 +52,24 @@ if (NOT XRT_EDGE)
xrt_add_subdirectory(tools/scripts)
if (XRT_NPU)
# Used by xdp for include search path
set(AIERT_DIR ${CMAKE_CURRENT_BINARY_DIR}/aie-rt/driver/src)
set(XAIENGINE_BUILD_SHARED OFF)
xrt_add_subdirectory_disable_install_target(aie-rt/driver/src)
set(AIERT_DIR ${CMAKE_CURRENT_BINARY_DIR}/aie-rt/src)
set(AIE_CODEGEN_BUILD_SHARED OFF)
set(XDP_USE_AIE_CODEGEN_CMAKE 1)
xrt_add_subdirectory_disable_install_target(aie-rt/src)
endif()
endif()

if (XDP_VE2_BUILD_CMAKE STREQUAL "yes")
set(AIERT_DIR ${CMAKE_CURRENT_BINARY_DIR}/aie-rt/src)
set(AIE_CODEGEN_BUILD_SHARED OFF)
set(XDP_USE_AIE_CODEGEN_CMAKE 1)
xrt_add_subdirectory_disable_install_target(aie-rt/src)
xrt_add_subdirectory_disable_install_target(aie-rt/fal)
set(AIEFAL_DIR ${CMAKE_CURRENT_BINARY_DIR}/aie-rt/fal/src/include)
endif()

xrt_add_subdirectory(xdp)

# Attach to the user's linker flags
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic")
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
Expand All @@ -83,11 +93,17 @@ else()
add_compile_options( ${XRT_WARN_OPTS} )
endif()

if (XRT_NPU)
if (XRT_NPU OR (XDP_VE2_BUILD_CMAKE STREQUAL "yes"))
# Used by xdp for include search path
set(AIERT_DIR ${CMAKE_CURRENT_BINARY_DIR}/aie-rt/driver/src)
set(XAIENGINE_BUILD_SHARED OFF)
xrt_add_subdirectory_disable_install_target(aie-rt/driver/src)
set(AIERT_DIR ${CMAKE_CURRENT_BINARY_DIR}/aie-rt/src)
set(AIE_CODEGEN_BUILD_SHARED OFF)
set(XDP_USE_AIE_CODEGEN_CMAKE 1)
xrt_add_subdirectory_disable_install_target(aie-rt/src)
endif()

if (XDP_VE2_BUILD_CMAKE STREQUAL "yes")
xrt_add_subdirectory_disable_install_target(aie-rt/fal)
set(AIEFAL_DIR ${CMAKE_CURRENT_BINARY_DIR}/aie-rt/fal/src/include)
endif()

# Build Subdirectories
Expand Down
2 changes: 1 addition & 1 deletion src/runtime_src/aie-rt
Loading