[RFC] Drop legacy wrappers for llvm::IRBuilder (pt. 1)

Clean out a bunch of `IRBuilder` wrappers - either made obsolete by a complete
switch to LLVM 14 or unwarranted in the first place. There's more wrapper APIs
to remove in a separate step during alignment-related cleanup.

Author: Artem Gindinson

IGC/AdaptorCommon/FreezeIntDiv.cpp

@@ -12,7 +12,6 @@ SPDX-License-Identifier: MIT
 #include "common/LLVMWarningsPush.hpp"
 #include "llvm/IR/InstVisitor.h"
 #include "llvm/IR/IRBuilder.h"
-#include "llvmWrapper/IR/IRBuilder.h"
 #include "common/LLVMWarningsPop.hpp"
 
 using namespace llvm;
@@ -70,8 +69,8 @@ bool FreezeIntDiv::runOnFunction(Function& F)
 
 void FreezeIntDiv::freezeIntDiv(BinaryOperator& I)
 {
-    IGCLLVM::IRBuilder<> builder(I.getNextNode());
-    Value* FI = builder.CreateFreezeIfSupported(&I, "freeze");
+    llvm::IRBuilder<> builder(I.getNextNode());
+    Value* FI = builder.CreateFreeze(&I, "freeze");
     I.replaceAllUsesWith(FI);
     cast<Instruction>(FI)->setOperand(0, &I);
 }

IGC/Compiler/CISACodeGen/Emu64OpsPass.cpp

@@ -703,8 +703,8 @@ bool InstExpander::visitFreeze(FreezeInst& FI) {
 
     auto [Lo, Hi] = Emu->getExpandedValues(Src);
 
-    Value* newLo = IRB->CreateFreezeIfSupported(Lo);
-    Value* newHi = IRB->CreateFreezeIfSupported(Hi);
+    Value* newLo = IRB->CreateFreeze(Lo);
+    Value* newHi = IRB->CreateFreeze(Hi);
 
     Emu->setExpandedValues(&FI, newLo, newHi);
     return true;

IGC/LLVM3DBuilder/BuiltinsFrontend.hpp

@@ -163,12 +163,12 @@ class SampleD_DC_FromCubeParams
 
 
 template<bool preserveNames = true, typename T = llvm::ConstantFolder,
-    typename InserterTyDef() = llvm::IRBuilderDefaultInserter>
-class LLVM3DBuilder : public llvm::IGCIRBuilder<T, InserterTyDef()>
+    typename InserterTy = llvm::IRBuilderDefaultInserter>
+class LLVM3DBuilder : public llvm::IGCIRBuilder<T, InserterTy>
 {
 public:
     LLVM3DBuilder(llvm::LLVMContext &pCtx, const PLATFORM &pPlatform)
-        : llvm::IGCIRBuilder<T, InserterTyDef()>(pCtx),
+        : llvm::IGCIRBuilder<T, InserterTy>(pCtx),
         m_Platform(new genplatform(&pPlatform))
     {
             Init();

IGC/VectorCompiler/CMCL/lib/Support/BuiltinTranslator.cpp

@@ -21,13 +21,13 @@ SPDX-License-Identifier: MIT
 #include <llvm/IR/IRBuilder.h>
 #include <llvm/IR/Instructions.h>
 #include <llvm/IR/Module.h>
+#include <llvm/Support/Alignment.h>
 #include <llvm/Support/Casting.h>
 #include <llvm/Support/ErrorHandling.h>
 
 #include "llvmWrapper/IR/DerivedTypes.h"
 #include "llvmWrapper/IR/IRBuilder.h"
 #include "llvmWrapper/IR/Type.h"
-#include "llvmWrapper/Support/Alignment.h"
 
 #include <algorithm>
 #include <array>
@@ -737,9 +737,8 @@ createMainInst<BuiltinID::AtomicRMW>(const std::vector<Value *> &Operands,
   auto BinOp = getLLVMAtomicBinOpFromCMCL(static_cast<CMCLOperation>(
       cast<ConstantInt>(Operands[AtomicRMWOperand::Operation])
           ->getSExtValue()));
-  return *IGCLLVM::createAtomicRMW(
-      IRB, BinOp, Ptr, Operands[AtomicRMWOperand::Operand], Ordering,
-      Ctx.getOrInsertSyncScopeID(ScopeName));
+  return *IRB.CreateAtomicRMW(BinOp, Ptr, Operands[AtomicRMWOperand::Operand],
+      llvm::MaybeAlign{}, Ordering, Ctx.getOrInsertSyncScopeID(ScopeName));
 }
 
 template <>
@@ -761,10 +760,10 @@ Value &createMainInst<BuiltinID::CmpXchg>(const std::vector<Value *> &Operands,
   auto ScopeName = cmcl::atomic::MemoryScope::getScopeNameFromCMCL(
       static_cast<CMCLMemoryScope>(
           cast<ConstantInt>(Operands[CmpXchgOperand::Scope])->getZExtValue()));
-  auto *CmpXchgInst = IGCLLVM::createAtomicCmpXchg(
-      IRB, Ptr, Operands[CmpXchgOperand::Operand0],
-      Operands[CmpXchgOperand::Operand1], OrderingSuccess, OrderingFalilure,
-      Ctx.getOrInsertSyncScopeID(ScopeName));
+  auto *CmpXchgInst = IRB.CreateAtomicCmpXchg(
+      Ptr, Operands[CmpXchgOperand::Operand0],
+      Operands[CmpXchgOperand::Operand1], llvm::MaybeAlign{}, OrderingSuccess,
+      OrderingFalilure, Ctx.getOrInsertSyncScopeID(ScopeName));
   return *IRB.CreateExtractValue(CmpXchgInst, 0 /*CmpXchg result*/,
                                  ".cmpxchg.res");
 }