address pr comments

Author: farzonl

clang/lib/CodeGen/CGBuiltin.cpp

@@ -18187,7 +18187,7 @@ Value *CodeGenFunction::EmitHLSLBuiltinExpr(unsigned BuiltinID,
     Value *Op0 = EmitScalarExpr(E->getArg(0));
     return Builder.CreateIntrinsic(
         /*ReturnType=*/llvm::Type::getInt1Ty(getLLVMContext()),
-        CGHLSLUtils::get_hlsl_all_intrinsic(
+        HLSLUtils::get_hlsl_all_intrinsic(
             CGM.getTarget().getTriple().getArch()),
         ArrayRef<Value *>{Op0}, nullptr, "hlsl.all");
   }

clang/lib/CodeGen/CGHLSLRuntime.cpp

@@ -343,7 +343,7 @@ llvm::Value *CGHLSLRuntime::emitInputSemantic(IRBuilder<> &B,
   }
   if (D.hasAttr<HLSLSV_DispatchThreadIDAttr>()) {
     llvm::Function *ThreadIDIntrinsic =
-        CGM.getIntrinsic(CGHLSLUtils::get_hlsl_thread_id_intrinsic(
+        CGM.getIntrinsic(HLSLUtils::get_hlsl_thread_id_intrinsic(
             CGM.getTarget().getTriple().getArch()));
     return buildVectorInput(B, ThreadIDIntrinsic, Ty);
   }

clang/lib/CodeGen/CGHLSLUtils.h

@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This File Provides utility function for HLSL code generation.
+// This file provides utility functions for HLSL code generation.
 // It is used to abstract away implementation details of backends.
 //
 //===----------------------------------------------------------------------===//
@@ -33,12 +33,14 @@
     }                                                                          \
   }
 
-class CGHLSLUtils {
-public:
-  GENERATE_HLSL_INTRINSIC_FUNCTION(all)
-  GENERATE_HLSL_INTRINSIC_FUNCTION(thread_id)
-private:
-  CGHLSLUtils() = delete;
-};
+namespace clang::CodeGen {
+  class HLSLUtils {
+  public:
+    GENERATE_HLSL_INTRINSIC_FUNCTION(all)
+    GENERATE_HLSL_INTRINSIC_FUNCTION(thread_id)
+  private:
+    HLSLUtils() = delete;
+  };
+} // namespace clang::CodeGen
 
-#endif
+#endif // LLVM_CLANG_LIB_CODEGEN_CGHLSLUTILS_H