Merge branch 'main' into texture1d

Author: luciechoi

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

@@ -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

azure-pipelines.yml

@@ -36,7 +36,7 @@ stages:
       submodules: true
     - script: |
         call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
-        call utils\hct\hctbuild.cmd -$(platform) -$(configuration) -show-cmake-log -spirvtest -warp-nuget-version 1.0.16.1
+        call utils\hct\hctbuild.cmd -vs2022 -$(platform) -$(configuration) -show-cmake-log -spirvtest -warp-nuget-version 1.0.16.1
       displayName: 'Building'
     - script: |
         call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
@@ -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
 

include/dxc/DXIL/DxilInstructions.h

@@ -10651,14 +10651,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); }
@@ -10854,16 +10854,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); }
@@ -11091,16 +11091,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/DxilMetadataHelper.h

@@ -648,6 +648,7 @@ class DxilMDHelper {
 public:
   // Utility functions.
   static bool IsKnownNamedMetaData(const llvm::NamedMDNode &Node);
+  static bool IsKnownGeneratedMetaData(const llvm::NamedMDNode &Node);
   static bool IsKnownMetadataID(llvm::LLVMContext &Ctx, unsigned ID);
   static void GetKnownMetadataIDs(llvm::LLVMContext &Ctx,
                                   llvm::SmallVectorImpl<unsigned> *pIDs);

include/dxc/DXIL/DxilOperations.h

@@ -145,6 +145,7 @@ class OP {
   static bool CheckOpCodeTable();
   static bool IsDxilOpFuncName(llvm::StringRef name);
   static bool IsDxilOpFunc(const llvm::Function *F);
+  static bool IsDxilOpLinAlgFuncName(llvm::StringRef Name);
   static bool IsDxilOpFuncCallInst(const llvm::Instruction *I);
   static bool IsDxilOpFuncCallInst(const llvm::Instruction *I, OpCode opcode);
   static bool IsDxilOpWave(OpCode C);
@@ -286,6 +287,7 @@ class OP {
   static const char *m_NamePrefix;
   static const char *m_TypePrefix;
   static const char *m_MatrixTypePrefix;
+  static const char *m_LinAlgNamePrefix;
   static unsigned GetTypeSlot(llvm::Type *pType);
   static const char *GetOverloadTypeName(unsigned TypeSlot);
   static llvm::StringRef GetTypeName(llvm::Type *Ty,

include/dxc/DXIL/DxilUtil.h

@@ -166,6 +166,7 @@ llvm::Type *GetHLSLHitObjectType(llvm::Module *M);
 bool IsHLSLHitObjectType(llvm::Type *Ty);
 bool IsHLSLLinAlgMatrixType(llvm::Type *Ty);
 llvm::StringRef GetHLSLLinAlgMatrixTypeMangling(llvm::StructType *Ty);
+bool IsHLSLKnownTargetType(llvm::Type *Ty);
 bool IsHLSLResourceDescType(llvm::Type *Ty);
 bool IsResourceSingleComponent(llvm::Type *Ty);
 uint8_t GetResourceComponentCount(llvm::Type *Ty);

include/dxc/DxilRootSignature/DxilRootSignature.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,