Replace outdated IGC_LLVM_TRUNK_REVISION checks and vc-intrinsics patches

Replaced current, outdated IGC_LLVM_TRUNK_REVISION checks and vc-intrinsics patches to align with the next LLVM 16 to 17 interim period.
Analogically, replaced vc-intrinsics and LLVM patches to match the next interim period.
Added a workaround for SPIRV-LLVM-Translator versioning in build and packaging scripts.

Author: michalkr52

IGC/BiFManager/main.cpp

@@ -53,7 +53,7 @@ int main(int argc, char *argv[]) {
     printf("[BiFManager] - Disabling Opaque Pointers\n");
   }
 
-#if LLVM_VERSION_MAJOR < 17
+#if LLVM_VERSION_MAJOR < 17 || defined(IGC_LLVM_TRUNK_REVISION)
   Context.setOpaquePointers(enableOpaquePointers);
 #endif
 #endif

IGC/OCLFE/igd_fcl_mcl/headers/clang_tb.h

@@ -149,7 +149,7 @@ bool GetFCLShaderDumpPidDisable();
 bool GetFCLDumpToCurrentDir();
 bool GetFCLDumpToCustomDir();
 bool GetFCLEnableKernelNamesBasedHash();
-#if LLVM_VERSION_MAJOR <= 16
+#if LLVM_VERSION_MAJOR < 17 || defined(IGC_LLVM_TRUNK_REVISION)
 bool GetFCLEnableOpaquePointersBackend();
 #endif
 } // namespace FCL

IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp

@@ -76,7 +76,7 @@ int32_t FCLDumpToCurrDir = 0;
 int32_t FCLDumpToCustomDir = 0;
 int32_t FCLShDumpPidDis = 0;
 int32_t FCLEnableKernelNamesBasedHash = 0;
-#if LLVM_VERSION_MAJOR <= 16
+#if LLVM_VERSION_MAJOR < 17 || defined(IGC_LLVM_TRUNK_REVISION)
 int32_t FCLEnableOpaquePointersBackend = 0;
 #endif
 int32_t FCLEnvKeysRead = 0;
@@ -161,7 +161,7 @@ void FCLReadKeysFromEnv() {
                       (RegKeysFlagsFromOptions.find("ShaderDumpPidDisable=1") != std::string::npos);
     FCLEnableKernelNamesBasedHash = getFCLIGCBinaryKey("EnableKernelNamesBasedHash") ||
                                     (RegKeysFlagsFromOptions.find("EnableKernelNamesBasedHash=1") != std::string::npos);
-#if LLVM_VERSION_MAJOR <= 16
+#if LLVM_VERSION_MAJOR < 17 || defined(IGC_LLVM_TRUNK_REVISION)
     FCLEnableOpaquePointersBackend =
         getFCLIGCBinaryKey("EnableOpaquePointersBackend") ||
         (RegKeysFlagsFromOptions.find("EnableOpaquePointersBackend=1") != std::string::npos);
@@ -195,7 +195,7 @@ bool GetFCLEnableKernelNamesBasedHash() {
   return FCLEnableKernelNamesBasedHash;
 }
 
-#if LLVM_VERSION_MAJOR <= 16
+#if LLVM_VERSION_MAJOR < 17 || defined(IGC_LLVM_TRUNK_REVISION)
 bool GetFCLEnableOpaquePointersBackend() {
   FCLReadKeysFromEnv();
   return FCLEnableOpaquePointersBackend;
@@ -1381,16 +1381,16 @@ bool CClangTranslationBlock::TranslateClang(const TranslateClangArgs *pInputArgs
     optionsEx += " -debug-info-kind=line-tables-only -dwarf-version=4";
   }
 
-#if LLVM_VERSION_MAJOR <= 16 && defined(IGC_DEBUG_VARIABLES)
+#if (LLVM_VERSION_MAJOR < 17 || defined(IGC_LLVM_TRUNK_REVISION)) && defined(IGC_DEBUG_VARIABLES)
   // Allow to dynamically switch from typed to opaque pointers on
-  // LLVM <= 16. Disabling opaque pointers dynamically is not possible.
+  // LLVM < 17. Disabling opaque pointers dynamically is not possible.
   if (FCL_IGC_IS_FLAG_ENABLED(EnableOpaquePointersBackend)) {
     optionsEx += " -opaque-pointers";
   } else {
 #endif
     optionsEx += " ";
     optionsEx += __IGC_OPAQUE_POINTERS_DEFAULT_ARG_CLANG;
-#if LLVM_VERSION_MAJOR <= 16 && defined(IGC_DEBUG_VARIABLES)
+#if (LLVM_VERSION_MAJOR < 17 || defined(IGC_LLVM_TRUNK_REVISION)) && defined(IGC_DEBUG_VARIABLES)
   }
 #endif
 

IGC/VectorCompiler/lib/Driver/Driver.cpp

@@ -455,17 +455,17 @@ static void optimizeIR(const vc::CompileOptions &Opts,
   else
     OptLevel = llvm::OptimizationLevel::O2;
 
-#if LLVM_VERSION_MAJOR < 17
+#if LLVM_VERSION_MAJOR < 17 || defined(IGC_LLVM_TRUNK_REVISION)
   // On llvm-16 a separate method must be used to build default O0 pipeline,
   // otherwise it hits an assertion.
   llvm::ModulePassManager MPM;
   if (OptLevel == llvm::OptimizationLevel::O0)
     MPM = PB.buildO0DefaultPipeline(OptLevel);
   else
     MPM = PB.buildPerModuleDefaultPipeline(OptLevel);
-#else  // LLVM_VERSION_MAJOR < 17
+#else  // LLVM_VERSION_MAJOR < 17 || defined(IGC_LLVM_TRUNK_REVISION)
   llvm::ModulePassManager MPM = PB.buildPerModuleDefaultPipeline(OptLevel);
-#endif // LLVM_VERSION_MAJOR < 17
+#endif // LLVM_VERSION_MAJOR < 17 || defined(IGC_LLVM_TRUNK_REVISION)
 
   MPM.run(M, MAM);
 #endif // LLVM_VERSION_MAJOR < 16

IGC/WrapperLLVM/include/llvmWrapper/ADT/APInt.h

@@ -17,7 +17,7 @@ SPDX-License-Identifier: MIT
 namespace IGCLLVM {
 using SignedDivisionByConstantInfo = llvm::SignedDivisionByConstantInfo;
 using UnsignedDivisionByConstantInfo =
-#if (LLVM_VERSION_MAJOR == 14) || defined(IGC_LLVM_TRUNK_REVISION)
+#if (LLVM_VERSION_MAJOR == 14)
     // Account for a typo
     llvm::UnsignedDivisonByConstantInfo;
 #else // LLVM_VERSION_MAJOR == 14
@@ -55,4 +55,4 @@ inline llvm::APInt MagicNumber(const UnsignedDivisionByConstantInfo &mu) { retur
 inline llvm::APInt MagicNumber(const SignedDivisionByConstantInfo &ms) { return ms.Magic; }
 } // namespace IGCLLVM
 
-#endif
+#endif

IGC/WrapperLLVM/include/llvmWrapper/ADT/Optional.h

@@ -9,7 +9,7 @@ SPDX-License-Identifier: MIT
 #ifndef IGCLLVM_ADT_OPTIONAL_H
 #define IGCLLVM_ADT_OPTIONAL_H
 
-#if LLVM_VERSION_MAJOR < 17
+#if LLVM_VERSION_MAJOR < 17 || defined(IGC_LLVM_TRUNK_REVISION)
 #include <llvm/ADT/Optional.h>
 #endif
 #include <optional>

IGC/WrapperLLVM/include/llvmWrapper/ADT/StringRef.h

@@ -16,7 +16,7 @@ namespace IGCLLVM {
 inline bool equals_insensitive(llvm::StringRef LHS, llvm::StringRef RHS) { return LHS.equals_insensitive(RHS); }
 
 inline bool ends_with_insensitive(llvm::StringRef LHS, llvm::StringRef RHS) {
-#if LLVM_VERSION_MAJOR > 16
+#if LLVM_VERSION_MAJOR > 16 && !defined(IGC_LLVM_TRUNK_REVISION)
   return LHS.ends_with_insensitive(RHS);
 #else
   return LHS.endswith_insensitive(RHS);

IGC/WrapperLLVM/include/llvmWrapper/Analysis/InstructionSimplify.h

@@ -13,7 +13,7 @@ SPDX-License-Identifier: MIT
 #include "llvm/Analysis/InstructionSimplify.h"
 
 namespace IGCLLVM {
-#if (LLVM_VERSION_MAJOR < 15) || defined(IGC_LLVM_TRUNK_REVISION)
+#if (LLVM_VERSION_MAJOR < 15)
 inline llvm::Value *simplifyInstruction(llvm::Instruction *I, const llvm::SimplifyQuery &Q,
                                         llvm::OptimizationRemarkEmitter *ORE = nullptr) {
   return llvm::SimplifyInstruction(I, Q, ORE);
@@ -22,15 +22,15 @@ inline llvm::Value *simplifyInstruction(llvm::Instruction *I, const llvm::Simpli
 using llvm::simplifyInstruction;
 #endif
 
-#if (LLVM_VERSION_MAJOR < 15) || defined(IGC_LLVM_TRUNK_REVISION)
+#if (LLVM_VERSION_MAJOR < 15)
 inline llvm::Value *simplifyBinOp(unsigned Opcode, llvm::Value *LHS, llvm::Value *RHS, const llvm::SimplifyQuery &Q) {
   return llvm::SimplifyBinOp(Opcode, LHS, RHS, Q);
 }
 #else
 using llvm::simplifyBinOp;
 #endif
 
-#if (LLVM_VERSION_MAJOR < 15) || defined(IGC_LLVM_TRUNK_REVISION)
+#if (LLVM_VERSION_MAJOR < 15)
 inline llvm::Value *simplifyCall(llvm::CallBase *Call, const llvm::SimplifyQuery &Q) {
   return llvm::SimplifyCall(Call, Q);
 }

IGC/WrapperLLVM/include/llvmWrapper/IR/ConstantFold.h

@@ -11,14 +11,14 @@ SPDX-License-Identifier: MIT
 
 #include "llvm/Config/llvm-config.h"
 #include "llvm/IR/Constants.h"
-#if (LLVM_VERSION_MAJOR >= 15) && !defined(IGC_LLVM_TRUNK_REVISION)
+#if (LLVM_VERSION_MAJOR >= 15)
 #include "llvm/IR/ConstantFold.h"
 #endif
 
 namespace IGCLLVM {
 inline llvm::Constant *ConstantFoldExtractValueInstruction(llvm::Constant *Agg, llvm::ArrayRef<unsigned> Idxs,
                                                            llvm::Type *OnlyIfReducedTy = nullptr) {
-#if (LLVM_VERSION_MAJOR < 15) || defined(IGC_LLVM_TRUNK_REVISION)
+#if (LLVM_VERSION_MAJOR < 15)
   return llvm::ConstantExpr::getExtractValue(Agg, Idxs, OnlyIfReducedTy);
 #else
   return llvm::ConstantFoldExtractValueInstruction(Agg, Idxs);
@@ -28,15 +28,15 @@ inline llvm::Constant *ConstantFoldExtractValueInstruction(llvm::Constant *Agg,
 inline llvm::Constant *ConstantFoldInsertValueInstruction(llvm::Constant *Agg, llvm::Constant *Val,
                                                           llvm::ArrayRef<unsigned> Idxs,
                                                           llvm::Type *OnlyIfReducedTy = nullptr) {
-#if (LLVM_VERSION_MAJOR < 15) || defined(IGC_LLVM_TRUNK_REVISION)
+#if (LLVM_VERSION_MAJOR < 15)
   return llvm::ConstantExpr::getInsertValue(Agg, Val, Idxs, OnlyIfReducedTy);
 #else
   return llvm::ConstantFoldInsertValueInstruction(Agg, Val, Idxs);
 #endif
 }
 
 inline llvm::Constant *ConstantFoldBinaryInstruction(unsigned Opcode, llvm::Constant *V1, llvm::Constant *V2) {
-#if (LLVM_VERSION_MAJOR < 15) || defined(IGC_LLVM_TRUNK_REVISION)
+#if (LLVM_VERSION_MAJOR < 15)
   // TODO: Add other opcodes as needed
   switch (Opcode) {
   case llvm::Instruction::SDiv:
@@ -54,4 +54,4 @@ inline llvm::Constant *ConstantFoldBinaryInstruction(unsigned Opcode, llvm::Cons
 }
 } // namespace IGCLLVM
 
-#endif // IGCLLVM_IR_CONSTANT_FOLD_H
+#endif // IGCLLVM_IR_CONSTANT_FOLD_H

IGC/WrapperLLVM/include/llvmWrapper/IR/ConstantFolder.h

@@ -42,7 +42,7 @@ class ConstantFolderBase : public llvm::IRBuilderFolder {
   /// up to LLVM 14.
   /// -------------------------------------------------------------------
 
-#if (LLVM_VERSION_MAJOR < 15) || defined(IGC_LLVM_TRUNK_REVISION)
+#if (LLVM_VERSION_MAJOR < 15)
 
   // Note: for direct usage in code, prefer `CreateBinOp` wrapper for all
   // LLVM versions up to 15.
@@ -190,14 +190,14 @@ class ConstantFolderBase : public llvm::IRBuilderFolder {
                                            llvm::ArrayRef<unsigned> IdxList) const override {
     return m_baseConstantFolder.CreateInsertValue(Agg, Val, IdxList);
   }
-#endif // (LLVM_VERSION_MAJOR < 15) || defined(IGC_LLVM_TRUNK_REVISION)
+#endif // (LLVM_VERSION_MAJOR < 15)
 
   /// -------------------------------------------------------------------
   /// This block defines virtual methods that are present in the base
   /// llvm::IRBuilderFolder class starting from LLVM 15.
   /// -------------------------------------------------------------------
 
-#if (LLVM_VERSION_MAJOR >= 15) && !defined(IGC_LLVM_TRUNK_REVISION)
+#if (LLVM_VERSION_MAJOR >= 15)
   inline llvm::Value *FoldBinOp(llvm::Instruction::BinaryOps Opc, llvm::Value *LHS, llvm::Value *RHS) const override {
     return m_baseConstantFolder.FoldBinOp(Opc, LHS, RHS);
   }
@@ -252,7 +252,7 @@ class ConstantFolderBase : public llvm::IRBuilderFolder {
   /// -------------------------------------------------------------------
 
   inline llvm::Constant *CreateBinOp(llvm::Instruction::BinaryOps Opc, llvm::Constant *LHS, llvm::Constant *RHS) const
-#if (LLVM_VERSION_MAJOR < 15) || defined(IGC_LLVM_TRUNK_REVISION)
+#if (LLVM_VERSION_MAJOR < 15)
       override {
     return m_baseConstantFolder.CreateBinOp(Opc, LHS, RHS);
   }