Skip to content

[LLVM] Make compilable with LLVM-20 #17547

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

Merged
cbalint13 merged 6 commits into from
Dec 2, 2024
Merged

[LLVM] Make compilable with LLVM-20 #17547

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a81c198
Make compilable with LLVM-20
parsifal-47 Nov 29, 2024
5d643a9
Resolving all deprecation warnings and addressing CR feedback
parsifal-47 Nov 29, 2024
db6da9c
Removing trailing spaces
parsifal-47 Nov 30, 2024
faeadd4
Fixing linting errors
parsifal-47 Nov 30, 2024
7ad7037
Clang formatting
parsifal-47 Dec 2, 2024
e7f7c9e
Clang formatting
parsifal-47 Dec 2, 2024
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
8 changes: 8 additions & 0 deletions src/target/llvm/codegen_cpu.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,11 @@ void CodeGenCPU::CreateStaticInit(const std::string& init_fname, const Stmt& bod
llvm::Value* CodeGenCPU::GetPackedFuncHandle(const std::string& fname) {
// We will store the packed function handle in global space.
// Initialize it during the first call.
#if TVM_LLVM_VERSION >= 200
llvm::DataLayout layout = module_->getDataLayout();
Comment thread
cbalint13 marked this conversation as resolved.
Outdated
#else
llvm::DataLayout layout(module_.get());
#endif
uint64_t align = layout.getTypeAllocSize(t_tvm_func_handle_);
auto it = func_handle_map_.find(fname);

Expand Down Expand Up @@ -1297,7 +1301,11 @@ void CodeGenCPU::DefineFunctionRegistry(Array<String> func_names) {
}
llvm::ArrayType* t_tvm_crt_func_ptrs =
llvm::ArrayType::get(ftype_tvm_backend_packed_c_func_->getPointerTo(), funcs.size());
#if TVM_LLVM_VERSION >= 200
llvm::DataLayout layout = module_->getDataLayout();
Comment thread
cbalint13 marked this conversation as resolved.
Outdated
#else
llvm::DataLayout layout(module_.get());
#endif

llvm::GlobalVariable* func_registry_ptrs = new llvm::GlobalVariable(
*module_, t_tvm_crt_func_ptrs, true, llvm::GlobalValue::InternalLinkage,
Expand Down
4 changes: 4 additions & 0 deletions src/target/llvm/codegen_llvm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,11 @@ void CodeGenLLVM::InitTarget() {
llvm::TargetMachine* tm = llvm_target_->GetOrCreateTargetMachine();
module_->setTargetTriple(tm->getTargetTriple().str());
module_->setDataLayout(tm->createDataLayout());
#if TVM_LLVM_VERSION >= 200
data_layout_ = std::make_unique<llvm::DataLayout>(module_->getDataLayout());
Comment thread
cbalint13 marked this conversation as resolved.
Outdated
#else
data_layout_.reset(new llvm::DataLayout(module_.get()));
#endif
if (native_vector_bits_ == 0) {
const auto& arch = tm->getTargetTriple().getArch();
if (arch == llvm::Triple::x86_64) {
Expand Down
4 changes: 4 additions & 0 deletions src/target/llvm/llvm_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,11 @@ TVM_REGISTER_GLOBAL("codegen.LLVMModuleCreate")

TVM_REGISTER_GLOBAL("target.llvm_lookup_intrinsic_id")
.set_body_typed([](std::string name) -> int64_t {
#if TVM_LLVM_VERSION >= 200
return static_cast<int64_t>(llvm::Intrinsic::lookupIntrinsicID(name));
#else
return static_cast<int64_t>(llvm::Function::lookupIntrinsicID(name));
#endif
});

TVM_REGISTER_GLOBAL("target.llvm_get_intrinsic_name").set_body_typed([](int64_t id) -> String {
Expand Down