Merge remote-tracking branch 'upstream/main' into copilot/fix-issue-5103-tests

# Conflicts:
#	docs/ReleaseNotes.md

Author: damyanp

.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/config-ix.cmake

@@ -573,7 +573,7 @@ string(REPLACE " " ";" LLVM_BINDINGS_LIST "${LLVM_BINDINGS}")
 
 # HLSL Change Begin - Metal IR Converter
 find_package(MetalIRConverter)
-if (METAL_IRCONVERTER_FOUND)
+if (MetalIRConverter_FOUND)
   set(ENABLE_METAL_CODEGEN On)
   message(STATUS "Enabling Metal Support")
   add_definitions(-DENABLE_METAL_CODEGEN)

cmake/modules/FindMetalIRConverter.cmake

@@ -1,16 +1,16 @@
-find_path(METAL_IRCONVERTER_INCLUDE_DIR metal_irconverter.h
+find_path(MetalIRConverter_INCLUDE_DIR metal_irconverter.h
           HINTS /usr/local/include/metal_irconverter
           DOC "Path to metal IR converter headers"
           )
 
-find_library(METAL_IRCONVERTER_LIB NAMES metalirconverter
+find_library(MetalIRConverter_LIB NAMES metalirconverter
   PATH_SUFFIXES lib
   )
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(METAL_IRCONVERTER
-                                    REQUIRED_VARS METAL_IRCONVERTER_LIB METAL_IRCONVERTER_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MetalIRConverter
+                                  REQUIRED_VARS MetalIRConverter_LIB MetalIRConverter_INCLUDE_DIR)
 
-message(STATUS "Metal IR Converter Include Dir: ${METAL_IRCONVERTER_INCLUDE_DIR}")
-message(STATUS "Metal IR Converter Library: ${METAL_IRCONVERTER_LIB}")
-mark_as_advanced(METAL_IRCONVERTER_LIB METAL_IRCONVERTER_INCLUDE_DIR)
+message(STATUS "Metal IR Converter Include Dir: ${MetalIRConverter_INCLUDE_DIR}")
+message(STATUS "Metal IR Converter Library: ${MetalIRConverter_LIB}")
+mark_as_advanced(MetalIRConverter_LIB MetalIRConverter_INCLUDE_DIR)

cmake/modules/HCT.cmake

@@ -67,6 +67,8 @@ function(add_hlsl_hctgen mode)
                        ${opcodes_json})
 
   get_filename_component(output_extension ${full_output} LAST_EXT)
+  string(SUBSTRING ${output_extension} 1 -1 output_extension_no_dot)
+  set(target_name "${mode}_${output_extension_no_dot}")
 
   if (CLANG_FORMAT_EXE AND output_extension MATCHES "\.h|\.cpp|\.inl")
     set(format_cmd COMMAND ${CLANG_FORMAT_EXE} -i ${temp_output})
@@ -132,8 +134,8 @@ function(add_hlsl_hctgen mode)
                      DEPENDS ${output}
                      COMMENT "Verifying clang-format results...")
 
-  add_custom_target(${mode}
+  add_custom_target(${target_name}
                     DEPENDS ${temp_output}.stamp)
 
-  add_dependencies(HCTGen ${mode})
+  add_dependencies(HCTGen ${target_name})
 endfunction()

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.