From 838f1712338b1b68270d85d9b8788bcb94775b11 Mon Sep 17 00:00:00 2001 From: Sonal Santan Date: Wed, 7 Jan 2026 15:09:33 -0800 Subject: [PATCH] Bump up aiebu hash in XRT Fix CMake to resolve xdp build failure with updated aiebu which does not include aie-rt Signed-off-by: Sonal Santan --- src/runtime_src/CMakeLists.txt | 12 +++++++----- src/runtime_src/core/common/CMakeLists.txt | 8 +------- src/runtime_src/core/common/aiebu | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/runtime_src/CMakeLists.txt b/src/runtime_src/CMakeLists.txt index 8f486439962..375e2954f17 100644 --- a/src/runtime_src/CMakeLists.txt +++ b/src/runtime_src/CMakeLists.txt @@ -51,6 +51,13 @@ if (NOT XRT_EDGE) # For embedded, headers and libraries are installed in /usr # Not requeired setup.sh/.csh 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) + endif() + endif() # Attach to the user's linker flags @@ -81,11 +88,6 @@ else() 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) - - # This enables aiebu submodule use aie-rt binaries built - # by XRT from above - set(AIEBU_AIE-RT_BIN_DIR ${AIERT_DIR}) - set(AIEBU_AIE-RT_HEADER_DIR ${AIERT_DIR}/include) endif() # Build Subdirectories diff --git a/src/runtime_src/core/common/CMakeLists.txt b/src/runtime_src/core/common/CMakeLists.txt index e2e45cfb83c..80437159a63 100644 --- a/src/runtime_src/core/common/CMakeLists.txt +++ b/src/runtime_src/core/common/CMakeLists.txt @@ -21,12 +21,6 @@ elseif (NOT XRT_EDGE) # AIEBU should use XRT's version of ELFIO set(AIEBU_ELFIO_SRC_DIR ${XRT_SOURCE_DIR}/runtime_src/core/common/elf) - # AIEBU should build XRT's version of aie-rt, unless XRT is sharing its - # build of aie-rt - if (NOT DEFINED AIEBU_AIE-RT_BIN_DIR) - set(AIEBU_AIE-RT_SRC_DIR ${XRT_SOURCE_DIR}/runtime_src/aie-rt) - endif() - xrt_add_subdirectory(aiebu) else() message(WARNING "Edge device, build of submodule aiebu disabled") @@ -122,7 +116,7 @@ target_include_directories(xrt_coreutil $ $ ) - + target_include_directories(xrt_coreutil_static PUBLIC $ diff --git a/src/runtime_src/core/common/aiebu b/src/runtime_src/core/common/aiebu index 9065273e0c0..3b043b61011 160000 --- a/src/runtime_src/core/common/aiebu +++ b/src/runtime_src/core/common/aiebu @@ -1 +1 @@ -Subproject commit 9065273e0c0a4ac5930fff904ac245cf38dd3087 +Subproject commit 3b043b61011eaaf11c77c95b1087ad535cb10c76