LLVM 13 related changes

Contains a number of small changes:
  * CloneFunctionInto
  * fs::F_None -> fs::OF_None
  * getUserCost fix
  * include std::stack
  * ConstantAggregateZero getElementCount helper function
  * OptTable printHelp

Author: Anton Sidorenko

IGC/Options/src/Options.cpp

@@ -12,6 +12,7 @@ SPDX-License-Identifier: MIT
 
 using namespace IGC::options;
 using namespace llvm::opt;
+using llvm::raw_ostream;
 
 #define PREFIX(NAME, VALUE) static const char *const API_##NAME[] = VALUE;
 #include "igc/Options/ApiOptions.inc"

IGC/VectorCompiler/CMCL/tools/Translator/Main.cpp

@@ -18,6 +18,7 @@ SPDX-License-Identifier: MIT
 #include <llvm/Support/InitLLVM.h>
 #include <llvm/Support/SourceMgr.h>
 #include <llvm/Support/ToolOutputFile.h>
+#include <llvm/Support/FileSystem.h>
 
 using namespace llvm;
 

IGC/VectorCompiler/lib/Driver/Driver.cpp

@@ -53,6 +53,7 @@ SPDX-License-Identifier: MIT
 #include "llvm/Transforms/IPO/PassManagerBuilder.h"
 #include "llvm/Transforms/Scalar.h"
 
+#include "llvmWrapper/Option/OptTable.h"
 #include "llvmWrapper/Target/TargetMachine.h"
 
 #include "Probe/Assertion.h"
@@ -668,8 +669,8 @@ static Error fillInternalOptions(const opt::ArgList &InternalOptions,
     constexpr unsigned FlagsToInclude = IGC::options::VCApiOption;
     constexpr unsigned FlagsToExclude = 0;
     constexpr bool ShowAllAliases = false;
-    IGC::getApiOptTable().PrintHelp(llvm::errs(), Usage, Title, FlagsToInclude,
-                                    FlagsToExclude, ShowAllAliases);
+    IGCLLVM::printHelp(IGC::getApiOptTable(), llvm::errs(), Usage, Title,
+                       FlagsToInclude, FlagsToExclude, ShowAllAliases);
   }
   if (InternalOptions.hasArg(OPT_help_internal)) {
     constexpr const char *Usage =
@@ -678,9 +679,8 @@ static Error fillInternalOptions(const opt::ArgList &InternalOptions,
     constexpr unsigned FlagsToInclude = IGC::options::VCInternalOption;
     constexpr unsigned FlagsToExclude = 0;
     constexpr bool ShowAllAliases = false;
-    IGC::getInternalOptTable().PrintHelp(llvm::errs(), Usage, Title,
-                                         FlagsToInclude, FlagsToExclude,
-                                         ShowAllAliases);
+    IGCLLVM::printHelp(IGC::getInternalOptTable(), llvm::errs(), Usage, Title,
+                       FlagsToInclude, FlagsToExclude, ShowAllAliases);
   }
 
   return Error::success();

IGC/VectorCompiler/lib/GenXCodeGen/GenXAnalysisDumper.cpp

@@ -95,7 +95,8 @@ static int openFileForDump(Function *F, StringRef Suffix)
   // Sanitize templated kernel names.
   std::replace_if(Filename.begin(), Filename.end(),
                   [](const char x) { return x == '<' || x == '>'; }, '_');
-  auto EC = sys::fs::openFileForWrite(Filename, FD, sys::fs::CD_CreateAlways, sys::fs::F_None);
+  auto EC = sys::fs::openFileForWrite(Filename, FD, sys::fs::CD_CreateAlways,
+                                      sys::fs::OF_None);
   if (EC) {
     errs() << "Error: " << EC.message() << "\n";
     return -1;

IGC/VectorCompiler/lib/GenXCodeGen/GenXOCLRuntimeInfo.cpp

@@ -31,6 +31,7 @@ SPDX-License-Identifier: MIT
 #include <cctype>
 #include <functional>
 #include <iterator>
+#include <stack>
 
 #include "Probe/Assertion.h"
 

IGC/VectorCompiler/lib/GenXCodeGen/GenXPatternMatch.cpp

@@ -75,6 +75,7 @@ SPDX-License-Identifier: MIT
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 
+#include "llvmWrapper/IR/Constants.h"
 #include "llvmWrapper/IR/DerivedTypes.h"
 #include "llvmWrapper/Support/TypeSize.h"
 #include "llvmWrapper/Transforms/Utils/Local.h"
@@ -1834,7 +1835,7 @@ bool MinMaxMatcher::valuesMatch(llvm::Value *Op1, llvm::Value *Op2) {
   if (isa<ConstantAggregateZero>(Op1) && isa<ConstantAggregateZero>(Op2)) {
     ConstantAggregateZero *C1 = cast<ConstantAggregateZero>(Op1);
     ConstantAggregateZero *C2 = cast<ConstantAggregateZero>(Op2);
-    if (C1->getNumElements() != C2->getNumElements())
+    if (IGCLLVM::getElementCount(*C1) != IGCLLVM::getElementCount(*C2))
       return false;
     Type *C1Ty = C1->getType();
     Type *C2Ty = C2->getType();

IGC/VectorCompiler/lib/GenXCodeGen/GenXTargetMachine.h

@@ -97,7 +97,12 @@ class GenXTTIImpl : public TargetTransformInfoImplCRTPBase<GenXTTIImpl>
   bool shouldBuildLookupTables() { return false; }
   unsigned getFlatAddressSpace() { return 4; }
 
-  int getUserCost(const User *U, ArrayRef<const Value *> Operands
+#if LLVM_VERSION_MAJOR >= 13
+  InstructionCost
+#else
+  int
+#endif
+  getUserCost(const User *U, ArrayRef<const Value *> Operands
 #if LLVM_VERSION_MAJOR >= 11
                   ,
                   TTI::TargetCostKind CostKind

IGC/VectorCompiler/lib/GenXOpts/CMPacketize/GenXPacketize.cpp

@@ -23,6 +23,7 @@ SPDX-License-Identifier: MIT
 #include "llvmWrapper/IR/DerivedTypes.h"
 #include "llvmWrapper/Support/Alignment.h"
 #include "llvmWrapper/IR/Instructions.h"
+#include "llvmWrapper/Transforms/Utils/Cloning.h"
 
 #include "vc/GenXOpts/Utils/CMRegion.h"
 
@@ -322,7 +323,7 @@ Function *GenXPacketize::vectorizeSIMTFunction(Function *F, unsigned Width) {
   }
   SmallVector<ReturnInst *, 10> returns;
   ClonedCodeInfo CloneInfo;
-  CloneFunctionInto(ClonedFunc, F, ArgMap, true, returns, Suffix[Width / 8],
+  IGCLLVM::CloneFunctionInto(ClonedFunc, F, ArgMap, true, returns, Suffix[Width / 8],
                     &CloneInfo);
 
   ReplaceMap.clear();

IGC/VectorCompiler/lib/GenXOpts/CMTrans/GenXImportOCLBiF.cpp

@@ -44,6 +44,7 @@ SPDX-License-Identifier: MIT
 #include <llvm/Transforms/Utils/Cloning.h>
 #include <llvm/Transforms/Utils/ValueMapper.h>
 #include <llvmWrapper/IR/Instructions.h>
+#include "llvmWrapper/Transforms/Utils/Cloning.h"
 
 #include <algorithm>
 #include <iterator>
@@ -387,7 +388,7 @@ static void removeFunctionBitcasts(Module &M) {
 
               // Clone the body of the function into the dest function.
               SmallVector<ReturnInst *, 8> Returns; // Ignore returns.
-              CloneFunctionInto(pDstFunc, funcTobeChanged, operandMap, false,
+              IGCLLVM::CloneFunctionInto(pDstFunc, funcTobeChanged, operandMap, false,
                                 Returns, "");
 
               pDstFunc->setCallingConv(funcTobeChanged->getCallingConv());

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

@@ -0,0 +1,36 @@
+/*========================== begin_copyright_notice ============================
+
+Copyright (C) 2019-2021 Intel Corporation
+
+SPDX-License-Identifier: MIT
+
+============================= end_copyright_notice ===========================*/
+
+#ifndef IGCLLVM_IR_CONSTANTS_H
+#define IGCLLVM_IR_CONSTANTS_H
+
+#include "llvm/Config/llvm-config.h"
+#include "llvm/IR/Constants.h"
+
+#if LLVM_VERSION_MAJOR > 12
+#include "llvm/Support/TypeSize.h"
+#endif
+
+namespace IGCLLVM
+{
+  inline
+#if LLVM_VERSION_MAJOR <= 12
+  unsigned
+#else
+  llvm::ElementCount
+#endif
+  getElementCount(const llvm::ConstantAggregateZero &C) {
+#if LLVM_VERSION_MAJOR <= 12
+    return C.getNumElements();
+#else
+    return C.getElementCount();
+#endif
+  }
+}
+
+#endif

IGC/WrapperLLVM/include/llvmWrapper/Option/OptTable.h

@@ -0,0 +1,43 @@
+/*========================== begin_copyright_notice ============================
+
+Copyright (C) 2019-2021 Intel Corporation
+
+SPDX-License-Identifier: MIT
+
+============================= end_copyright_notice ===========================*/
+
+#ifndef IGCLLVM_OPTION_OPTTABLE_H
+#define IGCLLVM_OPTION_OPTTABLE_H
+
+#include "llvm/Config/llvm-config.h"
+#include "llvm/Option/OptTable.h"
+#include "llvm/Support/raw_ostream.h"
+
+namespace IGCLLVM {
+inline void printHelp(const llvm::opt::OptTable &Options, llvm::raw_ostream &OS,
+                      const char *Usage, const char *Title,
+                      unsigned FlagsToInclude, unsigned FlagsToExclude,
+                      bool ShowAllAliases) {
+  Options.
+#if LLVM_VERSION_MAJOR <= 12
+      PrintHelp
+#else
+      printHelp
+#endif
+      (OS, Usage, Title, FlagsToInclude, FlagsToExclude, ShowAllAliases);
+}
+
+inline void printHelp(const llvm::opt::OptTable &Options, llvm::raw_ostream &OS,
+                      const char *Usage, const char *Title,
+                      bool ShowHidden = false, bool ShowAllAliases = false) {
+  Options.
+#if LLVM_VERSION_MAJOR <= 12
+      PrintHelp
+#else
+      printHelp
+#endif
+      (OS, Usage, Title, ShowHidden, ShowAllAliases);
+}
+} // namespace IGCLLVM
+
+#endif