small refactor

small refactor

Author: scottp101

IGC/AdaptorOCL/UnifyIROCL.cpp

@@ -199,6 +199,8 @@ static void CommonOCLBasedPasses(OpenCLProgramContext *pContext) {
 
   COMPILER_TIME_START(pContext, TIME_UnificationPasses);
 
+  setupTriple(*pContext);
+
   pContext->metrics.Init(&pContext->hash, pContext->getModule()->getNamedMetadata("llvm.dbg.cu") != nullptr);
   pContext->metrics.CollectFunctions(pContext->getModule());
 

IGC/Compiler/CISACodeGen/helper.cpp

@@ -2374,6 +2374,9 @@ void appendToUsed(llvm::Module &M, ArrayRef<GlobalValue *> Values) {
   GV->setSection("llvm.metadata");
 }
 
+void setupTriple(CodeGenContext &Ctx, StringRef OS) {
+}
+
 bool safeScheduleUp(llvm::BasicBlock *BB, llvm::Value *V, llvm::Instruction *&InsertPos,
                     llvm::DenseSet<llvm::Instruction *> Scheduled) {
   llvm::Instruction *I = llvm::dyn_cast<llvm::Instruction>(V);

IGC/Compiler/CISACodeGen/helper.h

@@ -474,6 +474,8 @@ inline float GetThreadOccupancyPerSubslice(SIMDMode simdMode, unsigned threadGro
 // Global can now be any pointer type that uses addrspace
 void appendToUsed(llvm::Module &M, llvm::ArrayRef<llvm::GlobalValue *> Values);
 
+void setupTriple(CodeGenContext &Ctx, llvm::StringRef OS = "");
+
 bool safeScheduleUp(llvm::BasicBlock *BB, llvm::Value *V, llvm::Instruction *&InsertPos,
                     llvm::DenseSet<llvm::Instruction *> Scheduled);
 

IGC/GenISAIntrinsics/GenIntrinsicFunctions.cpp

@@ -6,7 +6,6 @@ SPDX-License-Identifier: MIT
 
 ============================= end_copyright_notice ===========================*/
 
-#include "common/igc_regkeys.hpp"
 #include "GenIntrinsicFunctions.h"
 #include "GenIntrinsicDefinition.h"
 #include "GenIntrinsicLookup.h"
@@ -128,7 +127,7 @@ template <llvm::GenISAIntrinsic::ID id> class IntrinsicFunctionImp : public llvm
     llvm::LLVMContext &ctx = module.getContext();
     std::string funcName = GetName(overloadedTypes, overloadedPointeeTys);
     llvm::FunctionType *pFuncType = GetType(ctx, overloadedTypes);
-    llvm::AttributeList attribs = GetAttributeList(ctx, overloadedPointeeTys);
+    llvm::AttributeList attribs = GetAttributeList(module, overloadedPointeeTys);
     // There can never be multiple globals with the same name of different types,
     // because intrinsics must be a specific type.
     IGCLLVM::Module &M = static_cast<IGCLLVM::Module &>(module);
@@ -195,8 +194,9 @@ template <llvm::GenISAIntrinsic::ID id> class IntrinsicFunctionImp : public llvm
     return llvm::FunctionType::get(resultTy, argTys, false);
   }
 
-  static llvm::AttributeList GetAttributeList(llvm::LLVMContext &ctx,
+  static llvm::AttributeList GetAttributeList(llvm::Module &M,
                                               const llvm::ArrayRef<llvm::Type *> &overloadedPointeeTys) {
+    auto &ctx = M.getContext();
     // 1. Instantiate regular attributes for the given intrinsic
     llvm::ArrayRef<llvm::Attribute::AttrKind> attributeKinds = IntrinsicDefinitionT::scAttributeKinds;