Merging LLVM compatibility patches

Supporting LLVM trunk revision 476047bf8e720f3dc359cf75d1241e13f8ba2350
intel · Feb 12, 2025 · 7d5e641 · 7d5e641
1 parent 625aef7
commit 7d5e641
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 38 deletions.
diff --git a/IGC/WrapperLLVM/include/llvmWrapper/IR/LLVMContext.h b/IGC/WrapperLLVM/include/llvmWrapper/IR/LLVMContext.h
@@ -19,7 +19,7 @@ namespace IGCLLVM
     inline void setOpaquePointers(llvm::LLVMContext* Ctx, const bool Enable)
     {
         IGC_ASSERT_MESSAGE(Ctx, "Null LLVMContext pointer!");
-#if (LLVM_VERSION_MAJOR == 14) || defined(IGC_LLVM_TRUNK_REVISION)
+#if LLVM_VERSION_MAJOR == 14
         if (Enable)
             Ctx->enableOpaquePointers();
 #elif LLVM_VERSION_MAJOR >= 15
@@ -35,7 +35,7 @@ namespace IGC
         IGC_ASSERT_MESSAGE(Ctx, "Null LLVMContext pointer!");
 #if LLVM_VERSION_MAJOR < 14
         return false;
-#elif (LLVM_VERSION_MAJOR == 14) || defined(IGC_LLVM_TRUNK_REVISION)
+#elif LLVM_VERSION_MAJOR == 14
         // With LLVM 14, we invoke a proper check for the -opaque-pointers CL
         // option. Regardless of whether it's false by LLVM 14's default, or
         // through an explicit setting, we deem it acceptable for IGC to

diff --git a/...ernal/custom_intrinsics_index_check.patch → ...upgrader-igc-struct-typed-intrinsic.patch b/...ernal/custom_intrinsics_index_check.patch → ...upgrader-igc-struct-typed-intrinsic.patch
diff --git a/external/llvm/trunk/patches_external/custom_intrinsics_index_check.patch b/external/llvm/trunk/patches_external/custom_intrinsics_index_check.patch
diff --git a/...ernal/custom_intrinsics_index_check.patch → ...upgrader-igc-struct-typed-intrinsic.patch b/...ernal/custom_intrinsics_index_check.patch → ...upgrader-igc-struct-typed-intrinsic.patch