Merge remote-tracking branch 'upstream/main' into user/alsepkow/fix-min-precision-vector-load

Author: alsepkow

.github/workflows/clang-format-checker.yml

@@ -37,7 +37,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           repository: microsoft/DirectXShaderCompiler
-          ref: ${{ github.base_ref }}
+          ref: ${{ github.event.repository.default_branch }}
           sparse-checkout: |
             utils/git/requirements_formatting.txt
             utils/git/code-format-helper.py
@@ -82,7 +82,7 @@ jobs:
             --end-rev $END_REV \
             --changed-files "$CHANGED_FILES"
   apply_diff:
-    if: ${{ github.event_name == 'issue_comment' && endsWith(github.event.comment.body, '- [x] Check this box to apply formatting changes to this branch.') }}
+    if: ${{ github.event_name == 'issue_comment' && github.event.comment.user.login == 'github-actions[bot]' && endsWith(github.event.comment.body, '- [x] Check this box to apply formatting changes to this branch.') }}
     runs-on: ubuntu-latest
     env:
       TMP_DIFF_FILE: /tmp/diff.patch
@@ -113,7 +113,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           repository: microsoft/DirectXShaderCompiler
-          ref: ${{ github.base_ref }}
+          ref: ${{ github.event.repository.default_branch }}
           sparse-checkout: |
             utils/git/requirements_formatting.txt
             utils/git/code-format-helper.py

azure-pipelines.yml

@@ -78,7 +78,7 @@ stages:
 
     variables:
       macOS: macOS-latest
-      linux: Ubuntu-22.04 # FIXME: #7364, DXC does not build correctly with GCC 13+
+      linux: Ubuntu-24.04
 
     strategy:
       matrix:
@@ -99,13 +99,13 @@ stages:
         Linux_Gcc_Release:
           image: ${{ variables.linux }}
           configuration: Release
-          CC: gcc-9
-          CXX: g++-9
+          CC: gcc
+          CXX: g++
         Linux_Gcc_Debug:
           image: ${{ variables.linux }}
           configuration: Debug
-          CC: gcc-9
-          CXX: g++-9
+          CC: gcc
+          CXX: g++
           CMAKE_OPTS: -DLLVM_USE_SPLIT_DWARF=On
         MacOS_Clang_Release:
           image: ${{ variables.macOS }}
@@ -144,11 +144,6 @@ stages:
       displayName: 'Installing dependencies'
       condition: eq(variables['image'], variables['linux'])
 
-    - bash: |
-        sudo apt-get install g++-9 -y
-      displayName: 'Installing g++-9'
-      condition: and(eq(variables['CXX'], 'g++-9'), eq(variables['image'], variables['linux']))
-
     - bash: |
         brew update
         brew install ninja

cmake/modules/HandleLLVMOptions.cmake

@@ -16,6 +16,14 @@ if(NOT LLVM_FORCE_USE_OLD_TOOLCHAIN)
     if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
       message(FATAL_ERROR "Host GCC version must be at least 4.7!")
     endif()
+    # GCC 13 has a known miscompilation bug in -funswitch-loops
+    # (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109934) that causes
+    # widespread test failures at -O3. Disable -funswitch-loops for GCC 13.
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0 AND
+       CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14.0)
+      add_compile_options(-fno-unswitch-loops)
+      message(STATUS "Disabling -funswitch-loops due to GCC 13 miscompilation bug (PR109934)")
+    endif()
   elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.1)
       message(FATAL_ERROR "Host Clang version must be at least 3.1!")

docs/CommandGuide/FileCheck.rst

@@ -60,6 +60,11 @@ OPTIONS
   -verify``. With this option FileCheck will verify that input does not contain
   warnings not covered by any ``CHECK:`` patterns.
 
+.. option:: -D<VAR=VALUE>
+
+  Sets a filecheck variable ``VAR`` with value ``VALUE`` that can be used in
+  ``CHECK:`` lines.
+
 .. option:: -version
 
  Show the version number of this program.

docs/ReleaseNotes.md

@@ -41,6 +41,16 @@ line upon naming the release. Refer to previous for appropriate section names.
 
 - Fixed non-deterministic DXIL/PDB output when compiling shaders with resource arrays, debug info, and SM 6.6+. [#8171](https://github.com/microsoft/DirectXShaderCompiler/issues/8171)
 - Fixed mesh shader semantics that were incorrectly case sensitive.
+- DXIL validation: added validation for `CreateHandleFromBinding`.
+- DXIL validation now rejects non-standard integer bit widths (e.g. `i25`) in instructions.
+
+#### Other Changes
+
+- `/P` now matches `cl.exe` behavior: preprocesses to `<inputname>.i` by
+  default, with `/Fi` to override the output filename. The old FXC-style `/P
+   <filename>` positional syntax has been renamed to `/Po`.
+  [#4611](https://github.com/microsoft/DirectXShaderCompiler/issues/4611).
+
 
 ### Version 1.9.2602
 

external/SPIRV-Headers

@@ -183,8 +183,8 @@ enum class ComponentType : uint32_t {
   PackedU8x32 = 18,
 
   // BEGIN NEW FOR SM 6.9
-  U8 = 19,
-  I8 = 20,
+  I8 = 19,
+  U8 = 20,
   F8_E4M3 = 21,
   F8_E5M2 = 22,
   // END

external/SPIRV-Tools

@@ -10606,7 +10606,7 @@ struct DxilInst_LinAlgMatrixLoadFromDescriptor {
   // Validation support
   bool isAllowed() const { return true; }
   bool isArgumentListValid() const {
-    if (5 != llvm::dyn_cast<llvm::CallInst>(Instr)->getNumArgOperands())
+    if (6 != llvm::dyn_cast<llvm::CallInst>(Instr)->getNumArgOperands())
       return false;
     return true;
   }
@@ -10618,6 +10618,7 @@ struct DxilInst_LinAlgMatrixLoadFromDescriptor {
     arg_offset = 2,
     arg_stride = 3,
     arg_layout = 4,
+    arg_align = 5,
   };
   // Accessors
   llvm::Value *get_handle() const { return Instr->getOperand(1); }
@@ -10628,6 +10629,8 @@ struct DxilInst_LinAlgMatrixLoadFromDescriptor {
   void set_stride(llvm::Value *val) { Instr->setOperand(3, val); }
   llvm::Value *get_layout() const { return Instr->getOperand(4); }
   void set_layout(llvm::Value *val) { Instr->setOperand(4, val); }
+  llvm::Value *get_align() const { return Instr->getOperand(5); }
+  void set_align(llvm::Value *val) { Instr->setOperand(5, val); }
 };
 
 /// This instruction fills a matrix with data from a groupshared array
@@ -10651,14 +10654,14 @@ struct DxilInst_LinAlgMatrixLoadFromMemory {
   bool requiresUniformInputs() const { return false; }
   // Operand indexes
   enum OperandIdx {
-    arg_groupsharedArr = 1,
+    arg_memory = 1,
     arg_offset = 2,
     arg_stride = 3,
     arg_layout = 4,
   };
   // Accessors
-  llvm::Value *get_groupsharedArr() const { return Instr->getOperand(1); }
-  void set_groupsharedArr(llvm::Value *val) { Instr->setOperand(1, val); }
+  llvm::Value *get_memory() const { return Instr->getOperand(1); }
+  void set_memory(llvm::Value *val) { Instr->setOperand(1, val); }
   llvm::Value *get_offset() const { return Instr->getOperand(2); }
   void set_offset(llvm::Value *val) { Instr->setOperand(2, val); }
   llvm::Value *get_stride() const { return Instr->getOperand(3); }
@@ -10805,7 +10808,7 @@ struct DxilInst_LinAlgMatrixStoreToDescriptor {
   // Validation support
   bool isAllowed() const { return true; }
   bool isArgumentListValid() const {
-    if (6 != llvm::dyn_cast<llvm::CallInst>(Instr)->getNumArgOperands())
+    if (7 != llvm::dyn_cast<llvm::CallInst>(Instr)->getNumArgOperands())
       return false;
     return true;
   }
@@ -10818,6 +10821,7 @@ struct DxilInst_LinAlgMatrixStoreToDescriptor {
     arg_offset = 3,
     arg_stride = 4,
     arg_layout = 5,
+    arg_align = 6,
   };
   // Accessors
   llvm::Value *get_matrix() const { return Instr->getOperand(1); }
@@ -10830,6 +10834,8 @@ struct DxilInst_LinAlgMatrixStoreToDescriptor {
   void set_stride(llvm::Value *val) { Instr->setOperand(4, val); }
   llvm::Value *get_layout() const { return Instr->getOperand(5); }
   void set_layout(llvm::Value *val) { Instr->setOperand(5, val); }
+  llvm::Value *get_align() const { return Instr->getOperand(6); }
+  void set_align(llvm::Value *val) { Instr->setOperand(6, val); }
 };
 
 /// This instruction stores a matrix to groupshared memory
@@ -10854,16 +10860,16 @@ struct DxilInst_LinAlgMatrixStoreToMemory {
   // Operand indexes
   enum OperandIdx {
     arg_matrix = 1,
-    arg_groupsharedArr = 2,
+    arg_memory = 2,
     arg_offset = 3,
     arg_stride = 4,
     arg_layout = 5,
   };
   // Accessors
   llvm::Value *get_matrix() const { return Instr->getOperand(1); }
   void set_matrix(llvm::Value *val) { Instr->setOperand(1, val); }
-  llvm::Value *get_groupsharedArr() const { return Instr->getOperand(2); }
-  void set_groupsharedArr(llvm::Value *val) { Instr->setOperand(2, val); }
+  llvm::Value *get_memory() const { return Instr->getOperand(2); }
+  void set_memory(llvm::Value *val) { Instr->setOperand(2, val); }
   llvm::Value *get_offset() const { return Instr->getOperand(3); }
   void set_offset(llvm::Value *val) { Instr->setOperand(3, val); }
   llvm::Value *get_stride() const { return Instr->getOperand(4); }
@@ -11042,7 +11048,7 @@ struct DxilInst_LinAlgMatrixAccumulateToDescriptor {
   // Validation support
   bool isAllowed() const { return true; }
   bool isArgumentListValid() const {
-    if (6 != llvm::dyn_cast<llvm::CallInst>(Instr)->getNumArgOperands())
+    if (7 != llvm::dyn_cast<llvm::CallInst>(Instr)->getNumArgOperands())
       return false;
     return true;
   }
@@ -11055,6 +11061,7 @@ struct DxilInst_LinAlgMatrixAccumulateToDescriptor {
     arg_offset = 3,
     arg_stride = 4,
     arg_layout = 5,
+    arg_align = 6,
   };
   // Accessors
   llvm::Value *get_matrix() const { return Instr->getOperand(1); }
@@ -11067,6 +11074,8 @@ struct DxilInst_LinAlgMatrixAccumulateToDescriptor {
   void set_stride(llvm::Value *val) { Instr->setOperand(4, val); }
   llvm::Value *get_layout() const { return Instr->getOperand(5); }
   void set_layout(llvm::Value *val) { Instr->setOperand(5, val); }
+  llvm::Value *get_align() const { return Instr->getOperand(6); }
+  void set_align(llvm::Value *val) { Instr->setOperand(6, val); }
 };
 
 /// This instruction accumulates a matrix to groupshared memory
@@ -11091,16 +11100,16 @@ struct DxilInst_LinAlgMatrixAccumulateToMemory {
   // Operand indexes
   enum OperandIdx {
     arg_matrix = 1,
-    arg_groupsharedArr = 2,
+    arg_memory = 2,
     arg_offset = 3,
     arg_stride = 4,
     arg_layout = 5,
   };
   // Accessors
   llvm::Value *get_matrix() const { return Instr->getOperand(1); }
   void set_matrix(llvm::Value *val) { Instr->setOperand(1, val); }
-  llvm::Value *get_groupsharedArr() const { return Instr->getOperand(2); }
-  void set_groupsharedArr(llvm::Value *val) { Instr->setOperand(2, val); }
+  llvm::Value *get_memory() const { return Instr->getOperand(2); }
+  void set_memory(llvm::Value *val) { Instr->setOperand(2, val); }
   llvm::Value *get_offset() const { return Instr->getOperand(3); }
   void set_offset(llvm::Value *val) { Instr->setOperand(3, val); }
   llvm::Value *get_stride() const { return Instr->getOperand(4); }

include/dxc/DXIL/DxilConstants.h

@@ -55,6 +55,7 @@ static const uint32_t DxilMapAnisotropy = 16;
 
 // Enumerations and flags.
 enum class DxilComparisonFunc : unsigned {
+  None = 0,
   Never = 1,
   Less = 2,
   Equal = 3,