make intrinsic getters member functions. Add a getArch abstraction b\c CodeGenModule is incomplete in the header\CGHLSLRuntime.h

Author: farzonl

clang/lib/CodeGen/CGBuiltin.cpp

@@ -18177,9 +18177,8 @@ Value *CodeGenFunction::EmitHLSLBuiltinExpr(unsigned BuiltinID,
     Value *Op0 = EmitScalarExpr(E->getArg(0));
     return Builder.CreateIntrinsic(
         /*ReturnType=*/llvm::Type::getInt1Ty(getLLVMContext()),
-        CGHLSLRuntime::get_hlsl_all_intrinsic(
-            CGM.getTarget().getTriple().getArch()),
-        ArrayRef<Value *>{Op0}, nullptr, "hlsl.all");
+        CGM.getHLSLRuntime().get_hlsl_all_intrinsic(), ArrayRef<Value *>{Op0},
+        nullptr, "hlsl.all");
   }
   case Builtin::BI__builtin_hlsl_elementwise_any: {
     Value *Op0 = EmitScalarExpr(E->getArg(0));

clang/lib/CodeGen/CGHLSLRuntime.cpp

@@ -115,6 +115,10 @@ GlobalVariable *replaceBuffer(CGHLSLRuntime::Buffer &Buf) {
 
 } // namespace
 
+llvm::Triple::ArchType CGHLSLRuntime::getArch() {
+  return CGM.getTarget().getTriple().getArch();
+}
+
 void CGHLSLRuntime::addConstant(VarDecl *D, Buffer &CB) {
   if (D->getStorageClass() == SC_Static) {
     // For static inside cbuffer, take as global static.
@@ -342,8 +346,7 @@ llvm::Value *CGHLSLRuntime::emitInputSemantic(IRBuilder<> &B,
   }
   if (D.hasAttr<HLSLSV_DispatchThreadIDAttr>()) {
     llvm::Function *ThreadIDIntrinsic =
-        CGM.getIntrinsic(CGHLSLRuntime::get_hlsl_thread_id_intrinsic(
-            CGM.getTarget().getTriple().getArch()));
+        CGM.getIntrinsic(get_hlsl_thread_id_intrinsic());
     return buildVectorInput(B, ThreadIDIntrinsic, Ty);
   }
   assert(false && "Unhandled parameter attribute");

clang/lib/CodeGen/CGHLSLRuntime.h

@@ -31,8 +31,8 @@
 
 // Define the function generator macro
 #define GENERATE_HLSL_INTRINSIC_FUNCTION(name)                                 \
-  static llvm::Intrinsic::ID get_hlsl_##name##_intrinsic(                      \
-      const llvm::Triple::ArchType Arch) {                                     \
+  llvm::Intrinsic::ID get_hlsl_##name##_intrinsic() {                          \
+    llvm::Triple::ArchType Arch = getArch();                                   \
     switch (Arch) {                                                            \
     case llvm::Triple::dxil:                                                   \
       return llvm::Intrinsic::dx_##name;                                       \
@@ -125,6 +125,7 @@ class CGHLSLRuntime {
                                    BufferResBinding &Binding);
   void addConstant(VarDecl *D, Buffer &CB);
   void addBufferDecls(const DeclContext *DC, Buffer &CB);
+  llvm::Triple::ArchType getArch();
   llvm::SmallVector<Buffer> Buffers;
 };