[LLVM] Fix build failures when building with llvm>=22#18818
Merged
mshr-h merged 1 commit intoapache:mainfrom Feb 26, 2026
Merged
[LLVM] Fix build failures when building with llvm>=22#18818mshr-h merged 1 commit intoapache:mainfrom
mshr-h merged 1 commit intoapache:mainfrom
Conversation
Contributor
Summary of ChangesHello @mshr-h, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request resolves critical build failures encountered when compiling TVM with LLVM version 22 or newer. The changes primarily involve updating the TVM codebase to align with recent API modifications in LLVM's target and command-line option handling, ensuring continued compatibility and successful compilation across different LLVM versions. Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Changelog
Activity
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request successfully addresses build failures with LLVM versions 22 and above by adapting to API changes in llvm::cl::getRegisteredOptions() and llvm::TargetRegistry::lookupTarget. The changes introduce conditional compilation blocks to ensure compatibility across different LLVM versions. Additionally, the handling of command-line options has been made more robust with safer lookup mechanisms and explicit null checks.
src/target/llvm/llvm_instance.cc
Outdated
| parse_error = true; | ||
| continue; | ||
| } | ||
| auto& options = llvm::cl::getRegisteredOptions(); |
Contributor
There was a problem hiding this comment.
The llvm::cl::getRegisteredOptions() function returns a reference to a static StringMap. Calling it repeatedly inside the loop, as done here, is inefficient. It would be better to call it once before the loop and store the reference, then reuse that reference within the loop. This applies to the similar change in ApplyLLVMOptions as well.
auto& options = llvm::cl::getRegisteredOptions();
bool parse_error = false;
for (const ffi::String& s : v.value()) {
Option opt = ParseOptionString(s);
if (opt.type == Option::OptType::Invalid) {
parse_error = true;
continue;
}
#if TVM_LLVM_VERSION >= 220
if (options.find(opt.name) != options.end()) {
#else
if (options.count(opt.name)) {
src/target/llvm/llvm_instance.cc
Outdated
|
|
||
| llvm::cl::Option* base_op = options[new_opt.name]; | ||
| llvm::cl::Option* base_op = nullptr; | ||
| auto& options = llvm::cl::getRegisteredOptions(); |
Contributor
There was a problem hiding this comment.
Similar to the comment in LLVMTargetInfo constructor, llvm::cl::getRegisteredOptions() returns a reference to a static StringMap. Calling it repeatedly inside this loop is inefficient. It should be called once before the loop and the reference reused.
const auto& new_options = GetCommandLineOptions();
auto& options = llvm::cl::getRegisteredOptions();
for (size_t i = 0, e = saved_llvm_options_.size(); i != e; ++i) {
const Option& new_opt = new_options[i];
const Option& saved_opt = saved_llvm_options_[i];
llvm::cl::Option* base_op = nullptr;
#if TVM_LLVM_VERSION >= 220
auto it = options.find(new_opt.name);
if (it != options.end()) {
base_op = it->second;
}
#else
if (options.count(new_opt.name)) {
base_op = options[new_opt.name];
}
#endif
mshr-h
force-pushed
the
fix-llvm-22-target-api
branch
2 times, most recently
from
c78d5a2 to
24bbefe
Compare
cbalint13
approved these changes
Feb 25, 2026
Contributor
cbalint13
left a comment
cbalint13
left a comment
There was a problem hiding this comment.
LGTM.
Thank you for the fix !
Member
|
@tvm-bot rerun |
Contributor
|
Failed to re-run CI in https://github.com/apache/tvm/actions/runs/22421146231 Detailswith response |
Contributor
Author
|
@tvm-bot rerun |
Contributor
|
Failed to re-run CI in https://github.com/apache/tvm/actions/runs/22424690235 Detailswith response |
mshr-h
force-pushed
the
fix-llvm-22-target-api
branch
from
24bbefe to
2e6ba06
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes Windows/macOS GitHub Actions build failures when building TVM with LLVM 22 (
TVM_LLVM_VERSION=221), caused by LLVM API changes in target/command-line option handling.Link to the recent build failure log: https://github.com/apache/tvm/actions/runs/22387355836/job/64820136927?pr=18817