Merge branch 'main' of github.com:microsoft/DirectXShaderCompiler into devshFixes

Author: devsh

.gitignore

@@ -52,7 +52,7 @@ autoconf/autom4te.cache
 # Directories to ignore (do not add trailing '/'s, they skip symlinks).
 #==============================================================================#
 # Build directories
-build*
+/build*/
 # External projects that are tracked independently.
 external/*
 # Clang, which is tracked independently.

README.md

@@ -61,7 +61,7 @@ release mode for DXIL 1.1 and Shader Model 6.1 (View Instancing support only).
 
 Drivers can be downloaded from the following link [Intel Graphics Drivers](https://downloadcenter.intel.com/product/80939/Graphics-Drivers)
 
-Direct access to 15.60 driver (latest as of of this update) is provided below:
+Direct access to 15.60 driver (latest as of this update) is provided below:
 
 [Installer](https://downloadmirror.intel.com/27412/a08/win64_15.60.2.4901.exe)
 

azure-pipelines.yml

@@ -51,8 +51,8 @@ stages:
         Linux_Clang_Release:
           image: ${{ variables.linux }}
           configuration: Release
-          CC: clang
-          CXX: clang++
+          CC: clang-18
+          CXX: clang++-18
           CMAKE_OPTS: -DLLVM_ENABLE_WERROR=On -DLLVM_USE_SANITIZER='Address;Undefined' -DLLVM_ENABLE_LIBCXX=On -DLLVM_USE_LINKER=lld
           CHECK_ALL_ENV: ASAN_OPTIONS=alloc_dealloc_mismatch=0
           OS: Linux
@@ -98,7 +98,12 @@ stages:
       inputs:
         versionSpec: '3.x'
 
-    - bash: sudo apt-get install ninja-build
+    - bash: |
+        sudo apt-get install ninja-build
+        wget https://apt.llvm.org/llvm.sh
+        chmod u+x llvm.sh
+        sudo ./llvm.sh 18
+        sudo apt-get install libc++-18-dev
       displayName: 'Installing dependencies'
       condition: eq(variables['image'], variables['linux'])
 

docs/ReleaseNotes.md

@@ -12,7 +12,6 @@ The included licenses apply to the following files:
 
 | License file | Applies to |
 |---|---|
-|LICENSE-MS.txt     |dxil.dll (if included in package)|
 |LICENSE-MIT.txt    |d3d12shader.h|
 |LICENSE-LLVM.txt   |all other files|
 
@@ -23,6 +22,8 @@ The included licenses apply to the following files:
 Place release notes for the upcoming release below this line and remove this line upon naming this release.
 
 - The incomplete WaveMatrix implementation has been removed.
+- DXIL Validator Hash is open sourced.
+- DXIL container validation for PSV0 part allows any content ordering inside string and semantic index tables.
 
 ### Version 1.8.2407
 

docs/SPIR-V.rst

@@ -303,6 +303,7 @@ Supported extensions
 * SPV_GOOGLE_user_type
 * SPV_NV_mesh_shader
 * SPV_KHR_fragment_shading_barycentric
+* SPV_KHR_float_controls
 
 Vulkan specific attributes
 --------------------------
@@ -397,8 +398,8 @@ interface variables:
   main([[vk::location(N)]] float4 input: A) : B
   { ... }
 
-Macro for SPIR-V
-----------------
+Macros for SPIR-V
+-----------------
 
 If SPIR-V CodeGen is enabled and ``-spirv`` flag is used as one of the command
 line options (meaning that "generates SPIR-V code"), it defines an implicit
@@ -412,6 +413,12 @@ specific part of the HLSL code:
   #endif
   RWStructuredBuffer<S> mySBuffer;
 
+When the ``-spirv`` flag is used, the ``-fspv-target-env`` option will
+implicitly define the macros ``__SPIRV_MAJOR_VERSION__`` and
+``__SPIRV_MINOR_VERSION__``, which will be integers representing the major and
+minor version of the SPIR-V being generated. This can be used to enable code that uses a feature
+only for environments where that feature is available.
+
 SPIR-V version and extension
 ----------------------------
 
@@ -2884,6 +2891,30 @@ If an output unsigned integer ``status`` argument is present,
 ``OpImageSparseSampleDrefExplicitLod`` is used instead. The resulting SPIR-V
 ``Residency Code`` will be written to ``status``.
 
+``.SampleCmpBias(sampler, location, bias, comparator[, offset][, clamp][, Status])``
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Not available to ``Texture3D``, ``Texture2DMS``, and ``Texture2DMSArray``.
+
+The translation is similar to ``.SampleBias()``, but the
+``OpImageSampleDrefImplicitLod`` instruction is used.
+
+If an output unsigned integer ``status`` argument is present,
+``OpImageSparseSampleDrefImplicitLod`` is used instead. The resulting SPIR-V
+``Residency Code`` will be written to ``status``.
+
+``.SampleCmpGrad(sampler, location, ddx, ddy, comparator[, offset][, clamp][, Status])``
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Not available to ``Texture3D``, ``Texture2DMS``, and ``Texture2DMSArray``.
+
+The translation is similar to ``.SampleGrad()``, but the
+``OpImageSampleDrefExplicitLod`` instruction are used.
+
+If an output unsigned integer ``status`` argument is present,
+``OpImageSparseSampleDrefExplicitLod`` is used instead. The resulting SPIR-V
+``Residency Code`` will be written to ``status``.
+
 ``.Gather()``
 +++++++++++++
 
@@ -2977,10 +3008,11 @@ Not available to ``Texture2DMS`` and ``Texture2DMSArray``.
 
 Since texture types are represented as ``OpTypeImage``, the ``OpImageQueryLod``
 instruction is used for translation. An ``OpSampledImage`` is created based on
-the ``SamplerState`` passed to the function. The resulting sampled image and
-the coordinate passed to the function are used to invoke ``OpImageQueryLod``.
-The result of ``OpImageQueryLod`` is a ``float2``. The first element contains
-the mipmap array layer. The second element contains the unclamped level of detail.
+the ``SamplerState`` or ``SamplerComparisonState`` passed to the function. The
+resulting sampled image and the coordinate passed to the function are used to
+invoke ``OpImageQueryLod``. The result of ``OpImageQueryLod`` is a ``float2``.
+The first element contains the mipmap array layer. The second element contains
+the unclamped level of detail.
 
 ``Texture1D``
 ~~~~~~~~~~~~~

docs/index.rst

@@ -190,7 +190,7 @@ For API clients and LLVM developers.
 
 :doc:`CodeGenerator`
    The design and implementation of the LLVM code generator.  Useful if you are
-   working on retargetting LLVM to a new architecture, designing a new codegen
+   working on retargeting LLVM to a new architecture, designing a new codegen
    pass, or enhancing existing components.
 
 :doc:`TableGen <TableGen/index>`

include/dxc/CMakeLists.txt

@@ -17,7 +17,6 @@ configure_file(
 
 add_subdirectory(DXIL)
 add_subdirectory(DxilContainer)
-add_subdirectory(HLSL)
 add_subdirectory(Support)
 add_subdirectory(Tracing)
 

include/dxc/DxilContainer/DxcContainerBuilder.h

@@ -11,9 +11,12 @@
 
 #pragma once
 
-#include "dxc/DxilContainer/DxilContainer.h"
+// Include Windows header early for DxilHash.h.
 #include "dxc/Support/Global.h"
 #include "dxc/Support/WinIncludes.h"
+
+#include "dxc/DxilContainer/DxilContainer.h"
+#include "dxc/DxilHash/DxilHash.h"
 #include "dxc/Support/microcom.h"
 #include "dxc/dxcapi.h"
 #include "llvm/ADT/SmallVector.h"
@@ -46,6 +49,7 @@ class DxcContainerBuilder : public IDxcContainerBuilder {
     m_warning = warning;
     m_RequireValidation = false;
     m_HasPrivateData = false;
+    m_HashFunction = nullptr;
   }
 
 protected:
@@ -66,6 +70,13 @@ class DxcContainerBuilder : public IDxcContainerBuilder {
   const char *m_warning;
   bool m_RequireValidation;
   bool m_HasPrivateData;
+  // Function to compute hash when valid dxil container is built
+  // This is nullptr if loaded container has invalid hash
+  HASH_FUNCTION_PROTO *m_HashFunction;
+
+  void DetermineHashFunctionFromContainerContents(
+      const DxilContainerHeader *ContainerHeader);
+  void HashAndUpdate(DxilContainerHeader *ContainerHeader);
 
   UINT32 ComputeContainerSize();
   HRESULT UpdateContainerHeader(AbstractMemoryStream *pStream,

include/dxc/DxilContainer/DxilContainer.h

@@ -166,6 +166,9 @@ enum class DxilProgramSigSemantic : uint32_t {
   InnerCoverage = 70,
 };
 
+DxilProgramSigSemantic SemanticKindToSystemValue(DXIL::SemanticKind,
+                                                 DXIL::TessellatorDomain);
+
 enum class DxilProgramSigCompType : uint32_t {
   Unknown = 0,
   UInt32 = 1,
@@ -179,6 +182,9 @@ enum class DxilProgramSigCompType : uint32_t {
   Float64 = 9,
 };
 
+DxilProgramSigCompType CompTypeToSigCompType(DXIL::ComponentType,
+                                             bool i1ToUnknownCompat);
+
 struct DxilProgramSignatureElement {
   uint32_t Stream; // Stream index (parameters must appear in non-decreasing
                    // stream order)