Skip to content

Commit 2d65c02

Browse files
lgritzlgritz
committed
Avoid deprecated LLVM calls for 21+
Signed-off-by: Larry Gritz <[email protected]>
1 parent 2858176 commit 2d65c02

File tree

1 file changed

+74
-27
lines changed

1 file changed

+74
-27
lines changed

‎src/liboslexec/llvm_util.cpp‎

Lines changed: 74 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -476,27 +476,13 @@ LLVM_Util::LLVM_Util(const PerThreadInfo& per_thread_info, int debuglevel,
476476
m_llvm_type_longlong = (llvm::Type*)llvm::Type::getInt64Ty(*m_llvm_context);
477477
m_llvm_type_void = (llvm::Type*)llvm::Type::getVoidTy(*m_llvm_context);
478478

479-
m_llvm_type_int_ptr = llvm::PointerType::get(m_llvm_type_int, 0);
480-
m_llvm_type_int8_ptr = llvm::PointerType::get(m_llvm_type_int8, 0);
481-
m_llvm_type_int64_ptr = llvm::PointerType::get(m_llvm_type_int64, 0);
482-
m_llvm_type_bool_ptr = llvm::PointerType::get(m_llvm_type_bool, 0);
483-
m_llvm_type_char_ptr = llvm::PointerType::get(m_llvm_type_char, 0);
484-
m_llvm_type_void_ptr = m_llvm_type_char_ptr;
485-
m_llvm_type_float_ptr = llvm::PointerType::get(m_llvm_type_float, 0);
486-
m_llvm_type_longlong_ptr = llvm::PointerType::get(m_llvm_type_int64, 0);
487-
m_llvm_type_double_ptr = llvm::PointerType::get(m_llvm_type_double, 0);
488-
489479
// A triple is a struct composed of 3 floats
490480
std::vector<llvm::Type*> triplefields(3, m_llvm_type_float);
491481
m_llvm_type_triple = type_struct(triplefields, "Vec3");
492-
m_llvm_type_triple_ptr
493-
= (llvm::PointerType*)llvm::PointerType::get(m_llvm_type_triple, 0);
494482

495483
// A matrix is a struct composed 16 floats
496484
std::vector<llvm::Type*> matrixfields(16, m_llvm_type_float);
497485
m_llvm_type_matrix = type_struct(matrixfields, "Matrix4");
498-
m_llvm_type_matrix_ptr
499-
= (llvm::PointerType*)llvm::PointerType::get(m_llvm_type_matrix, 0);
500486

501487
// Setup up wide aliases
502488
// TODO: why are there casts to the base class llvm::Type *?
@@ -511,6 +497,48 @@ LLVM_Util::LLVM_Util(const PerThreadInfo& per_thread_info, int debuglevel,
511497
m_llvm_type_wide_longlong = llvm_vector_type(m_llvm_type_longlong,
512498
m_vector_width);
513499

500+
// A twide riple is a struct composed of 3 wide floats
501+
std::vector<llvm::Type*> triple_wide_fields(3, m_llvm_type_wide_float);
502+
m_llvm_type_wide_triple = type_struct(triple_wide_fields, "WideVec3");
503+
504+
// A wide matrix is a struct composed 16 wide floats
505+
std::vector<llvm::Type*> matrix_wide_fields(16, m_llvm_type_wide_float);
506+
m_llvm_type_wide_matrix = type_struct(matrix_wide_fields, "WideMatrix4");
507+
508+
#if OSL_LLVM_VERSION >= 210
509+
// All opaque pointers now. Eventually, all the typed ones can go away.
510+
m_llvm_type_void_ptr = llvm::PointerType::get(*m_llvm_context, 0);
511+
m_llvm_type_int_ptr = m_llvm_type_void_ptr;
512+
m_llvm_type_int8_ptr = m_llvm_type_void_ptr;
513+
m_llvm_type_int64_ptr = m_llvm_type_void_ptr;
514+
m_llvm_type_bool_ptr = m_llvm_type_void_ptr;
515+
m_llvm_type_char_ptr = m_llvm_type_void_ptr;
516+
m_llvm_type_float_ptr = m_llvm_type_void_ptr;
517+
m_llvm_type_longlong_ptr = m_llvm_type_void_ptr;
518+
m_llvm_type_double_ptr = m_llvm_type_void_ptr;
519+
m_llvm_type_triple_ptr = m_llvm_type_void_ptr;
520+
m_llvm_type_matrix_ptr = m_llvm_type_void_ptr;
521+
m_llvm_type_wide_char_ptr = m_llvm_type_void_ptr;
522+
m_llvm_type_wide_void_ptr = m_llvm_type_void_ptr;
523+
m_llvm_type_wide_int_ptr = m_llvm_type_void_ptr;
524+
m_llvm_type_wide_bool_ptr = m_llvm_type_void_ptr;
525+
m_llvm_type_wide_float_ptr = m_llvm_type_void_ptr;
526+
#else
527+
// Old style typed pointers. These are marked as deprecated in LLVM 21,
528+
// and will be removed in some subsequent version.
529+
m_llvm_type_int_ptr = llvm::PointerType::get(m_llvm_type_int, 0);
530+
m_llvm_type_int8_ptr = llvm::PointerType::get(m_llvm_type_int8, 0);
531+
m_llvm_type_int64_ptr = llvm::PointerType::get(m_llvm_type_int64, 0);
532+
m_llvm_type_bool_ptr = llvm::PointerType::get(m_llvm_type_bool, 0);
533+
m_llvm_type_char_ptr = llvm::PointerType::get(m_llvm_type_char, 0);
534+
m_llvm_type_void_ptr = m_llvm_type_char_ptr;
535+
m_llvm_type_float_ptr = llvm::PointerType::get(m_llvm_type_float, 0);
536+
m_llvm_type_longlong_ptr = llvm::PointerType::get(m_llvm_type_int64, 0);
537+
m_llvm_type_double_ptr = llvm::PointerType::get(m_llvm_type_double, 0);
538+
m_llvm_type_triple_ptr
539+
= (llvm::PointerType*)llvm::PointerType::get(m_llvm_type_triple, 0);
540+
m_llvm_type_matrix_ptr
541+
= (llvm::PointerType*)llvm::PointerType::get(m_llvm_type_matrix, 0);
514542
m_llvm_type_wide_char_ptr = llvm::PointerType::get(m_llvm_type_wide_char,
515543
0);
516544
m_llvm_type_wide_void_ptr = llvm_vector_type(m_llvm_type_void_ptr,
@@ -520,14 +548,7 @@ LLVM_Util::LLVM_Util(const PerThreadInfo& per_thread_info, int debuglevel,
520548
0);
521549
m_llvm_type_wide_float_ptr = llvm::PointerType::get(m_llvm_type_wide_float,
522550
0);
523-
524-
// A triple is a struct composed of 3 floats
525-
std::vector<llvm::Type*> triple_wide_fields(3, m_llvm_type_wide_float);
526-
m_llvm_type_wide_triple = type_struct(triple_wide_fields, "WideVec3");
527-
528-
// A matrix is a struct composed 16 floats
529-
std::vector<llvm::Type*> matrix_wide_fields(16, m_llvm_type_wide_float);
530-
m_llvm_type_wide_matrix = type_struct(matrix_wide_fields, "WideMatrix4");
551+
#endif
531552

532553
ustring_rep(m_ustring_rep); // setup ustring-related types
533554
}
@@ -545,14 +566,20 @@ LLVM_Util::ustring_rep(UstringRep rep)
545566
OSL_ASSERT(m_ustring_rep == UstringRep::hash);
546567
m_llvm_type_ustring = llvm::Type::getInt64Ty(*m_llvm_context);
547568
}
548-
m_llvm_type_ustring_ptr = llvm::PointerType::get(m_llvm_type_ustring, 0);
549569

550570
// Batched versions haven't been updated to handle hash yet.
551571
// For now leave them using the real ustring regardless of UstringRep
552572
m_llvm_type_wide_ustring = llvm_vector_type(m_llvm_type_real_ustring,
553573
m_vector_width);
574+
575+
#if OSL_LLVM_VERSION >= 210
576+
m_llvm_type_ustring_ptr = m_llvm_type_void_ptr;
577+
m_llvm_type_wide_ustring_ptr = m_llvm_type_void_ptr;
578+
#else
579+
m_llvm_type_ustring_ptr = llvm::PointerType::get(m_llvm_type_ustring, 0);
554580
m_llvm_type_wide_ustring_ptr
555581
= llvm::PointerType::get(m_llvm_type_wide_ustring, 0);
582+
#endif
556583
}
557584

558585

@@ -1790,8 +1817,13 @@ LLVM_Util::nvptx_target_machine()
17901817
&& "PTX compile error: LLVM Target is not initialized");
17911818

17921819
m_nvptx_target_machine = llvm_target->createTargetMachine(
1793-
ModuleTriple.str(), CUDA_TARGET_ARCH, "+ptx50", options,
1794-
llvm::Reloc::Static, llvm::CodeModel::Small,
1820+
#if OSL_LLVM_VERSION >= 210
1821+
llvm::Triple(ModuleTriple.str()),
1822+
#else
1823+
ModuleTriple.str(),
1824+
#endif
1825+
CUDA_TARGET_ARCH, "+ptx50", options, llvm::Reloc::Static,
1826+
llvm::CodeModel::Small,
17951827
#if OSL_LLVM_VERSION >= 180
17961828
llvm::CodeGenOptLevel::Default
17971829
#else
@@ -2911,7 +2943,11 @@ LLVM_Util::type_struct_field_at_index(llvm::Type* type, int index)
29112943
llvm::PointerType*
29122944
LLVM_Util::type_ptr(llvm::Type* type)
29132945
{
2946+
#if OSL_LLVM_VERSION >= 210
2947+
return m_llvm_type_void_ptr;
2948+
#else
29142949
return llvm::PointerType::get(type, 0);
2950+
#endif
29152951
}
29162952

29172953
llvm::Type*
@@ -2959,8 +2995,12 @@ llvm::PointerType*
29592995
LLVM_Util::type_function_ptr(llvm::Type* rettype, cspan<llvm::Type*> params,
29602996
bool varargs)
29612997
{
2998+
#if OSL_LLVM_VERSION >= 210
2999+
return m_llvm_type_void_ptr;
3000+
#else
29623001
llvm::FunctionType* functype = type_function(rettype, params, varargs);
29633002
return llvm::PointerType::getUnqual(functype);
3003+
#endif
29643004
}
29653005

29663006

@@ -3784,8 +3824,7 @@ llvm::Value*
37843824
LLVM_Util::ptr_to_cast(llvm::Value* val, llvm::Type* type,
37853825
const std::string& llname)
37863826
{
3787-
return builder().CreatePointerCast(val, llvm::PointerType::get(type, 0),
3788-
llname);
3827+
return builder().CreatePointerCast(val, type_ptr(type), llname);
37893828
}
37903829

37913830

@@ -3803,14 +3842,22 @@ llvm::Value*
38033842
LLVM_Util::ptr_cast(llvm::Value* val, const TypeDesc& type,
38043843
const std::string& llname)
38053844
{
3845+
#if OSL_LLVM_VERSION >= 210
3846+
return ptr_cast(val, m_llvm_type_void_ptr, llname);
3847+
#else
38063848
return ptr_cast(val, llvm::PointerType::get(llvm_type(type), 0), llname);
3849+
#endif
38073850
}
38083851

38093852

38103853
llvm::Value*
38113854
LLVM_Util::wide_ptr_cast(llvm::Value* val, const TypeDesc& type)
38123855
{
3856+
#if OSL_LLVM_VERSION >= 210
3857+
return ptr_cast(val, m_llvm_type_void_ptr);
3858+
#else
38133859
return ptr_cast(val, llvm::PointerType::get(llvm_vector_type(type), 0));
3860+
#endif
38143861
}
38153862

38163863

0 commit comments

Comments
 (0)