Added option for disabling HLSL intrinsics

Author: Przemog1

include/dxc/Support/HLSLOptions.td

@@ -601,3 +601,6 @@ def rw_decl_global_cb : Flag<["-", "/"], "decl-global-cb">, Group<hlslrewrite_Gr
   HelpText<"Collect all global constants outside cbuffer declarations into cbuffer GlobalCB { ... }. Still experimental, not all dependency scenarios handled.">;
 // Also removed: compress, decompress, /Gch (child effect), /Gpp (partial precision)
 // /Op - no support for preshaders.
+
+def fvk_disable_hlsl_intrinsics : Flag<["-"], "fvk-disable-hlsl-intrinsics">, Group<spirv_Group>, Flags<[CoreOption, DriverOption]>,
+  HelpText<"Disable HLSL intrinsics">;

include/dxc/Support/SPIRVOptions.h

@@ -38,6 +38,7 @@ enum class SpirvLayoutRule {
 };
 
 struct SpirvCodeGenOptions {
+  bool disableHLSLIntrinsics;
   /// Disable legalization and optimization and emit raw SPIR-V
   bool codeGenHighLevel;
   bool debugInfoFile;

lib/DxcSupport/HLSLOptions.cpp

@@ -1074,6 +1074,8 @@ int ReadDxcOpts(const OptTable *optionTable, unsigned flagsToInclude,
 
   // SPIRV Change Starts
 #ifdef ENABLE_SPIRV_CODEGEN
+  opts.SpirvOptions.disableHLSLIntrinsics =
+      Args.hasFlag(OPT_fvk_disable_hlsl_intrinsics, OPT_INVALID, false);
   opts.GenSPIRV = Args.hasFlag(OPT_spirv, OPT_INVALID, false);
   opts.SpirvOptions.invertY =
       Args.hasFlag(OPT_fvk_invert_y, OPT_INVALID, false);

tools/clang/include/clang/AST/ASTContext.h

@@ -2408,7 +2408,7 @@ class ASTContext : public RefCountedBase<ASTContext> {
   /// It is normally invoked after ASTContext construction.
   ///
   /// \param Target The target 
-  void InitBuiltinTypes(const TargetInfo &Target);
+  void InitBuiltinTypes(const TargetInfo &Target, bool ignoreHLSLIntrinsics);
 
 private:
   void InitBuiltinType(CanQualType &R, BuiltinType::Kind K);

tools/clang/include/clang/AST/HlslTypes.h

@@ -51,7 +51,8 @@ namespace hlsl {
 
 /// <summary>Initializes the specified context to support HLSL
 /// compilation.</summary>
-void InitializeASTContextForHLSL(clang::ASTContext &context);
+void InitializeASTContextForHLSL(clang::ASTContext &context,
+                                 bool ignoreHLSLIntrinsics);
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Type system enumerations.

tools/clang/include/clang/Frontend/CompilerInstance.h

@@ -669,7 +669,7 @@ class CompilerInstance : public ModuleLoader {
   std::string getSpecificModuleCachePath();
 
   /// Create the AST context.
-  void createASTContext();
+  void createASTContext(bool ignoreHLSLIntrinsics = false);
 
   /// Create an external AST source to read a PCH file and attach it to the AST
   /// context.

tools/clang/include/clang/Frontend/FrontendAction.h

@@ -208,7 +208,8 @@ class FrontendAction {
   ///
   /// \return True on success; on failure the compilation of this file should
   /// be aborted and neither Execute() nor EndSourceFile() should be called.
-  bool BeginSourceFile(CompilerInstance &CI, const FrontendInputFile &Input);
+  bool BeginSourceFile(CompilerInstance &CI, const FrontendInputFile &Input,
+                       bool ignoreHLSLIntrinsics = false);
 
   /// \brief Set the source manager's main input file, and run the action.
   bool Execute();

tools/clang/lib/AST/ASTContext.cpp

@@ -958,7 +958,7 @@ void ASTContext::InitBuiltinType(CanQualType &R, BuiltinType::Kind K) {
   Types.push_back(Ty);
 }
 
-void ASTContext::InitBuiltinTypes(const TargetInfo &Target) {
+void ASTContext::InitBuiltinTypes(const TargetInfo &Target, bool ignoreHLSLIntrinsics) {
   assert((!this->Target || this->Target == &Target) &&
          "Incorrect target reinitialization");
   assert(VoidTy.isNull() && "Context reinitialized?");
@@ -1108,7 +1108,7 @@ void ASTContext::InitBuiltinTypes(const TargetInfo &Target) {
 
     HLSLStringTy = this->getPointerType(CharTy);
 
-    hlsl::InitializeASTContextForHLSL(*this); // Previously in constructor, guarded by !DelayInitialization
+    hlsl::InitializeASTContextForHLSL(*this, ignoreHLSLIntrinsics); // Previously in constructor, guarded by !DelayInitialization
   }
   // HLSL Change Ends
 }

tools/clang/lib/Frontend/CompilerInstance.cpp

@@ -409,12 +409,12 @@ std::string CompilerInstance::getSpecificModuleCachePath() {
 
 // ASTContext
 
-void CompilerInstance::createASTContext() {
+void CompilerInstance::createASTContext(bool ignoreHLSLIntrinsics) {
   Preprocessor &PP = getPreprocessor();
   Context = new ASTContext(getLangOpts(), PP.getSourceManager(),
                            PP.getIdentifierTable(), PP.getSelectorTable(),
                            PP.getBuiltinInfo());
-  Context->InitBuiltinTypes(getTarget());
+  Context->InitBuiltinTypes(getTarget(), ignoreHLSLIntrinsics);
 }
 
 // ExternalASTSource

tools/clang/lib/Frontend/FrontendAction.cpp

@@ -173,7 +173,8 @@ FrontendAction::CreateWrappedASTConsumer(CompilerInstance &CI,
 }
 
 bool FrontendAction::BeginSourceFile(CompilerInstance &CI,
-                                     const FrontendInputFile &Input) {
+                                     const FrontendInputFile &Input,
+                                     bool ignoreHLSLIntrinsics) {
   assert(!Instance && "Already processing a source file!");
   assert(!Input.isEmpty() && "Unexpected empty filename!");
   setCurrentInput(Input);
@@ -323,7 +324,7 @@ bool FrontendAction::BeginSourceFile(CompilerInstance &CI,
   if (!usesPreprocessorOnly()) {
     // Parsing a model file should reuse the existing ASTContext.
     if (!isModelParsingAction())
-      CI.createASTContext();
+      CI.createASTContext(ignoreHLSLIntrinsics);
 
     std::unique_ptr<ASTConsumer> Consumer =
         CreateWrappedASTConsumer(CI, InputFile);