Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NO MERGE] iree-amd-aie patches #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[NO MERGE] iree-amd-aie patches #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/runtime_src/core/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ add_subdirectory(xdp)
if(CMAKE_VERSION VERSION_LESS "3.18.0")
message(WARNING "CMake version is less than 3.18.0, build of submodule aiebu disabled")
elseif (${XRT_NATIVE_BUILD} STREQUAL "yes")
add_subdirectory(aiebu)
# add_subdirectory(aiebu)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without commenting this line, we will see error like below:

-- building XRT core libs
-- CMAKE_SYSTEM=Windows-10.0.27723
-- CMAKE_INSTALL_PREFIX=C:/develop/iree-amd-aie-dezhi/iree-build/compiler/plugins/iree-aie-xrt-coreutil/aiebu/xilinx
-- Using aie-rt from C:/develop/iree-amd-aie-dezhi/iree-build/compiler/plugins/iree-aie-xrt-coreutil/aiebu
-- Using ELFIO from C:/develop/iree-amd-aie-dezhi/third_party/XRT/src/runtime_src/core/common/aiebu/src/cpp/ELFIO
-- Found Python3: C:/Python313/python.exe (found version "3.13.0") found components: Interpreter
-- Python version: 3.13.0
-- Could NOT find Boost (missing: Boost_INCLUDE_DIR)
-- Boost version:
CMake Error at C:/Program Files/Microsoft Visual Studio/2022/Professional/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.27/Modules/FindPackageHandleStandardArgs.cmake:230 (message):
Could NOT find Boost (missing: Boost_INCLUDE_DIR program_options)
Call Stack (most recent call first):
C:/Program Files/Microsoft Visual Studio/2022/Professional/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.27/Modules/FindPackageHandleStandardArgs.cmake:600 (_FPHSA_FAILURE_MESSAGE)
C:/Program Files/Microsoft Visual Studio/2022/Professional/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.27/Modules/FindBoost.cmake:2378 (find_package_handle_standard_args)
C:/develop/iree-amd-aie-dezhi/third_party/XRT/src/runtime_src/core/common/aiebu/src/cpp/aiebu/CMakeLists.txt:7 (find_package)

else()
message(WARNING "Edge device, build of submodule aiebu disabled")
endif()
Expand Down
2 changes: 1 addition & 1 deletion src/runtime_src/core/common/query.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include <boost/format.hpp>

#include <stdexcept>
#include <any>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What justify this change is not clear


namespace xrt_core {

Expand Down
4 changes: 1 addition & 3 deletions src/runtime_src/tools/xclbinutil/SectionAIEResourcesBin.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,7 @@ SectionAIEResourcesBin::getSubSectionEnum(const std::string& sSubSectionName)
}

// -------------------------------------------------------------------------

const std::string&
SectionAIEResourcesBin::getSubSectionName(SectionAIEResourcesBin::SubSection eSubSection)
std::string SectionAIEResourcesBin::getSubSectionName(SectionAIEResourcesBin::SubSection eSubSection)
{
auto subSectionTable = getSubSectionTable();
auto iter = std::find_if(subSectionTable.begin(), subSectionTable.end(), [&](const auto& entry) {return entry.second == eSubSection;});
Expand Down
2 changes: 1 addition & 1 deletion src/runtime_src/tools/xclbinutil/SectionAIEResourcesBin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class SectionAIEResourcesBin : public Section {
};
public:
static SubSection getSubSectionEnum(const std::string& _sSubSectionName);
static const std::string& getSubSectionName(SubSection eSubSection);
static std::string getSubSectionName(SubSection eSubSection);

public:
bool subSectionExists(const std::string& _sSubSectionName) const override;
Expand Down
Loading