Merge branch 'main' into test/isfinite

Author: joaosaffran

azure-pipelines.yml

@@ -45,7 +45,23 @@ stages:
     - script: |
         call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
         call utils\hct\hcttest.cmd -$(configuration) exec
-      displayName: 'DXIL Execution Tests'
+      displayName: 'DXIL Execution Tests'        
+    - script: |
+        call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
+        call utils\hct\hcttest.cmd -$(configuration) compat-suite 1.6
+      displayName: 'DXIL Compat Suite Tests (1.6 release)'
+      condition: succeededOrFailed()
+    - script: |
+        call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
+        call utils\hct\hcttest.cmd -$(configuration) compat-suite 1.7
+      displayName: 'DXIL Compat Suite Tests (1.7 release)'
+      condition: succeededOrFailed()
+    - script: |
+        call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
+        call utils\hct\hcttest.cmd -$(configuration) compat-suite 1.8
+      displayName: 'DXIL Compat Suite Tests (1.8 release)'
+      condition: succeededOrFailed()
+    
 
   - job: Nix
     timeoutInMinutes: 165

include/dxc/Support/HLSLOptions.h

@@ -227,6 +227,7 @@ class DxcOpts {
   std::string TimeTrace = "";           // OPT_ftime_trace[EQ]
   unsigned TimeTraceGranularity = 500;  // OPT_ftime_trace_granularity_EQ
   bool VerifyDiagnostics = false;       // OPT_verify
+  bool Verbose = false;                 // OPT_verbose
 
   // Optimization pass enables, disables and selects
   OptimizationToggles
@@ -257,6 +258,11 @@ class DxcOpts {
   bool EmbedPDBName() const;          // Zi or Fd
   bool DebugFileIsDirectory() const;  // Fd ends in '\\'
   llvm::StringRef GetPDBName() const; // Fd name
+  bool ProduceDxModule()
+      const; // !AstDump && !OptDump && !GenSPIRV && !DumpDependencies &&
+             // !VerifyDiagnostics && Preprocess.empty();
+  bool ProduceFullContainer() const; // ProduceDxModule() && CodeGenHighLevel
+  bool NeedsValidation() const; // ProduceFullContainer() && !DisableValidation
 
   // SPIRV Change Starts
 #ifdef ENABLE_SPIRV_CODEGEN

include/dxc/Support/HLSLOptions.td

@@ -197,6 +197,18 @@ def verify : Joined<["-"], "verify">,
   Group<hlslcomp_Group>, Flags<[CoreOption, DriverOption]>,
   HelpText<"Verify diagnostic output using comment directives">;
 
+def verbose : Flag<["-"], "verbose">,
+              Group<hlslcomp_Group>,
+              Flags<[DriverOption]>,
+              HelpText<"Allow emission of verbose compiler information">;
+
+// Short alias '-v' for the verbose option
+def v : Flag<["-"], "v">,
+        Alias<verbose>,
+        Group<hlslcomp_Group>,
+        Flags<[DriverOption]>,
+        HelpText<"Alias for -verbose">;
+
 /*
 def fno_caret_diagnostics : Flag<["-"], "fno-caret-diagnostics">, Group<hlslcomp_Group>,
  Flags<[CoreOption]>;

include/dxc/Support/dxcapi.extval.h

@@ -1,8 +1,12 @@
 #include "dxc/Support/dxcapi.use.h"
+#include "dxc/WinAdapter.h"
+#include "llvm/Support/raw_ostream.h"
+
 #include <cassert>
 #include <string>
 
 namespace dxc {
+
 class DxcDllExtValidationLoader : public DllLoader {
   // DxCompilerSupport manages the
   // lifetime of dxcompiler.dll, while DxilExtValSupport
@@ -12,8 +16,15 @@ class DxcDllExtValidationLoader : public DllLoader {
   std::string DxilDllPath;
 
 public:
-  std::string GetDxilDllPath() { return DxilDllPath; }
-  bool DxilDllFailedToLoad() {
+  std::string getDxilDllPath() { return DxilDllPath; }
+  enum InitializationFailures {
+    FailedNone = 0,
+    FailedCompilerLoad,
+    FailedDxilPath,
+    FailedDxilLoad,
+  } FailureReason = FailedNone;
+  InitializationFailures getFailureReason() { return FailureReason; }
+  bool dxilDllFailedToLoad() {
     return !DxilDllPath.empty() && !DxilExtValSupport.IsEnabled();
   }
 
@@ -22,7 +33,8 @@ class DxcDllExtValidationLoader : public DllLoader {
   HRESULT CreateInstance2Impl(IMalloc *pMalloc, REFCLSID clsid, REFIID riid,
                               IUnknown **pResult) override;
 
-  HRESULT Initialize();
+  HRESULT initialize();
+  HRESULT InitializeForDll(LPCSTR dllName, LPCSTR fnName);
 
   bool IsEnabled() const override { return DxCompilerSupport.IsEnabled(); }
 };

lib/DxcSupport/HLSLOptions.cpp

@@ -166,6 +166,24 @@ llvm::StringRef DxcOpts::GetPDBName() const {
   return llvm::StringRef();
 }
 
+bool DxcOpts::ProduceDxModule() const {
+
+  return !AstDump && !OptDump &&
+#ifdef ENABLE_SPIRV_CODEGEN
+         !GenSPIRV &&
+#endif
+         !DumpDependencies && !VerifyDiagnostics && !IsRootSignatureProfile() &&
+         Preprocess.empty();
+}
+
+bool DxcOpts::ProduceFullContainer() const {
+  return DxcOpts::ProduceDxModule() && !CodeGenHighLevel;
+}
+
+bool DxcOpts::NeedsValidation() const {
+  return ProduceFullContainer() && !DisableValidation;
+}
+
 MainArgs::MainArgs(int argc, const wchar_t **argv, int skipArgCount) {
   if (argc > skipArgCount) {
     Utf8StringVector.reserve(argc - skipArgCount);
@@ -847,6 +865,7 @@ int ReadDxcOpts(const OptTable *optionTable, unsigned flagsToInclude,
   opts.TimeReport = Args.hasFlag(OPT_ftime_report, OPT_INVALID, false);
   opts.TimeTrace = Args.hasFlag(OPT_ftime_trace, OPT_INVALID, false) ? "-" : "";
   opts.VerifyDiagnostics = Args.hasFlag(OPT_verify, OPT_INVALID, false);
+  opts.Verbose = Args.hasFlag(OPT_verbose, OPT_INVALID, false);
   if (Args.hasArg(OPT_ftime_trace_EQ))
     opts.TimeTrace = Args.getLastArgValue(OPT_ftime_trace_EQ);
   if (Arg *A = Args.getLastArg(OPT_ftime_trace_granularity_EQ)) {