diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0cc41611..4eee48f7a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,6 @@ jobs: pushd third_party/XRT sed -i "s/\/Qspectre//g" src/CMake/nativeWin.cmake git submodule update --recursive --init - # python ./src/runtime_src/tools/scripts/xrtdeps-win19.py --icd --opencl popd - name: Enable cache @@ -109,7 +108,6 @@ jobs: # also make into abs path if [ x"${{ matrix.OS }}" == x"windows" ]; then export BOOST_ROOT="/$(echo "${{ steps.install-boost.outputs.BOOST_ROOT }}" | sed -e 's/\\/\//g' -e 's/://')" - # export KHRONOS=/c/Xilinx/xrt/ext fi bash "build_tools/ci/build_test_cpp_${{ matrix.os }}.sh" diff --git a/build_tools/cmake/iree_aie_rt.cmake b/build_tools/cmake/iree_aie_rt.cmake index a51612329..118b460f5 100644 --- a/build_tools/cmake/iree_aie_rt.cmake +++ b/build_tools/cmake/iree_aie_rt.cmake @@ -10,6 +10,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/iree_aie_utils.cmake) # cdo-drver # ############################################################################## +set(_BOOTGEN_SOURCE_DIR ${IREE_AMD_AIE_SOURCE_DIR}/third_party/bootgen) replace_string_in_file(${_BOOTGEN_SOURCE_DIR}/cdo-driver/cdo_driver.c "\"(Write64)" "\"cdo-driver: (Write64)") replace_string_in_file(${_BOOTGEN_SOURCE_DIR}/cdo-driver/cdo_driver.c "\"(MaskWrite64)" "\"cdo-driver: (MaskWrite64)") replace_string_in_file(${_BOOTGEN_SOURCE_DIR}/cdo-driver/cdo_driver.c "\"(NOP Command)" "\"cdo-driver: (NOP Command)") diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Target/XCLBinGen.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Target/XCLBinGen.cpp index af52e5bcc..8f1b5e176 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Target/XCLBinGen.cpp +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Target/XCLBinGen.cpp @@ -866,7 +866,7 @@ static LogicalResult generateXCLBin( "-w"}; FailureOr bootgenBin = - findAMDAIETool("amdaie_bootgen", amdAIEInstallDir); + findAMDAIETool("iree_aie_bootgen", amdAIEInstallDir); if (!succeeded(bootgenBin) || !runTool(bootgenBin.value().string(), flags, verbose)) {