Update dxc with Nabla changes to latest as of 03/01/24

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

@@ -1,11 +1,16 @@
 name: "Check code formatting"
-on: pull_request_target
-permissions:
- pull-requests: write
+on: 
+ pull_request_target:
+ types: [opened,synchronize]
+ issue_comment:
+ types: edited
 
 jobs:
  code_formatter:
+ if: github.event_name == 'pull_request_target'
  runs-on: ubuntu-latest
+ permissions:
+ pull-requests: write
  steps:
  - name: Fetch LLVM sources
  uses: actions/checkout@v4
@@ -20,9 +25,10 @@ jobs:
  fetch_depth: 100 # Fetches only the last 10 commits
 
  - name: "Listed files"
+ env: LISTED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
  run: |
  echo "Formatting files:"
- echo "${{ steps.changed-files.outputs.all_changed_files }}"
+ echo "$LISTED_FILES"
 
  - name: Install clang-format
  uses: aminya/setup-cpp@v1
@@ -40,15 +46,86 @@ jobs:
  run: pip install -r utils/git/requirements_formatting.txt
 
  - name: Run code formatter
+ id: formatter
  env:
  GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
  START_REV: ${{ github.event.pull_request.base.sha }}
  END_REV: ${{ github.event.pull_request.head.sha }}
  CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
  run: |
- python utils/git/code-format-helper.py \
+  python utils/git/code-format-helper.py \
  --token ${{ secrets.GITHUB_TOKEN }} \
  --issue-number $GITHUB_PR_NUMBER \
  --start-rev $START_REV \
  --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.') }}
+ runs-on: ubuntu-latest
+ env:
+ TMP_DIFF_FILE: /tmp/diff.patch
+ permissions:
+ pull-requests: write
+ contents: write
+ steps:
+ - uses: actions/github-script@v3
+ id: get-pr
+ with:
+ script: |
+ const request = {
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ pull_number: context.issue.number
+ }
+ core.info(`Getting PR #${request.pull_number} from ${request.owner}/${request.repo}`)
+ try {
+ const result = await github.pulls.get(request)
+ return result.data
+ } catch (err) {
+ core.setFailed(`Request failed with error ${err}`)
+ } 
+ - name: Fetch LLVM sources
+ uses: actions/checkout@v4
+ with:
+ fetch-depth: 2
+ path: build/main_src
+
+ - name: Setup Python env
+ uses: actions/setup-python@v4
+ with:
+ python-version: '3.11'
+ cache: 'pip'
+ cache-dependency-path: 'build/main_src/utils/git/requirements_formatting.txt'
+
+ - name: Install python dependencies
+ run: pip install -r build/main_src/utils/git/requirements_formatting.txt
+
+ - name: Apply code diff
+ env:
+ GITHUB_PR_NUMBER: ${{ github.event.issue.number }}
+ COMMENT_ID: ${{ github.event.comment.id }}
+ run: |
+ python build/main_src/utils/git/code-format-save-diff.py \
+ --token ${{ secrets.GITHUB_TOKEN }} \
+ --issue-number $GITHUB_PR_NUMBER \
+ --tmp-diff-file $TMP_DIFF_FILE \
+ --comment-id $COMMENT_ID
+
+ - name: Fetch LLVM sources for head
+ uses: actions/checkout@v4
+ with:
+ fetch-depth: 2
+ ref: ${{ fromJSON(steps.get-pr.outputs.result).head.ref }}
+ repository: ${{ fromJSON(steps.get-pr.outputs.result).head.repo.full_name }}
+
+ - name: apply diff
+ run: |
+ git apply $TMP_DIFF_FILE
+ git add .
+
+ - name: Commit & Push changes
+ uses: actions-js/push@master
+ with:
+ branch: ${{ fromJSON(steps.get-pr.outputs.result).head.ref }}
+ repository: ${{ fromJSON(steps.get-pr.outputs.result).head.repo.full_name }}
+ github_token: ${{ secrets.GITHUB_TOKEN }}

.gitmodules

@@ -1,12 +1,6 @@
 [submodule "external/googletest"]
 path = external/googletest
 url = https://github.com/google/googletest
-[submodule "external/re2"]
-path = external/re2
-url = https://github.com/google/re2
-[submodule "external/effcee"]
-path = external/effcee
-url = https://github.com/google/effcee
 [submodule "external/DirectX-Headers"]
 path = external/DirectX-Headers
 url = https://github.com/microsoft/DirectX-Headers.git

CMakeLists.txt

@@ -36,9 +36,6 @@ endif()
 
 project(LLVM)
 
-# This requires a more recent version than CMake 3.4 but is a noop in prior versions. # HLSL Change
-set(VS_STARTUP_PROJECT "dndxc" CACHE STRING "VS startup project in solution") # HLSL Change
-
 # The following only works with the Ninja generator in CMake >= 3.0.
 set(LLVM_PARALLEL_COMPILE_JOBS "" CACHE STRING
  "Define the maximum number of concurrent compilation jobs.")
@@ -593,8 +590,10 @@ set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}
 
 set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 if (APPLE)
- set(CMAKE_INSTALL_NAME_DIR "@rpath")
- set(CMAKE_INSTALL_RPATH "@executable_path/../lib")
+ if(NOT DEFINED CMAKE_INSTALL_RPATH)
+ set(CMAKE_INSTALL_NAME_DIR "@rpath")
+ set(CMAKE_INSTALL_RPATH "@executable_path/../lib")
+ endif(NOT DEFINED CMAKE_INSTALL_RPATH)
 else(UNIX)
  if(NOT DEFINED CMAKE_INSTALL_RPATH)
  set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}")

appveyor.yml

@@ -47,9 +47,9 @@ test_script:
 - ps: utils\appveyor\appveyor_test.ps1
 - cmd: call utils\hct\hcttest -rel clang
 - sh: ./bin/dxc --help
-- sh: ./bin/dxc -T ps_6_0 ../tools/clang/test/CodeGenSPIRV_Lit/passthru-ps.hlsl2spv
-- sh: ./bin/dxc -T ps_6_0 -Fo passthru-ps.dxil ../tools/clang/test/CodeGenSPIRV_Lit/passthru-ps.hlsl2spv
-- sh: ./bin/dxc -T ps_6_0 -Fo passthru-ps.spv ../tools/clang/test/CodeGenSPIRV_Lit/passthru-ps.hlsl2spv -spirv
+- sh: ./bin/dxc -T ps_6_0 ../tools/clang/test/CodeGenSPIRV/passthru-ps.hlsl2spv
+- sh: ./bin/dxc -T ps_6_0 -Fo passthru-ps.dxil ../tools/clang/test/CodeGenSPIRV/passthru-ps.hlsl2spv
+- sh: ./bin/dxc -T ps_6_0 -Fo passthru-ps.spv ../tools/clang/test/CodeGenSPIRV/passthru-ps.hlsl2spv -spirv
 - sh: ./tools/clang/unittests/SPIRV/ClangSPIRVTests --spirv-test-root ../tools/clang/test/CodeGenSPIRV/
 - sh: ./tools/clang/unittests/HLSL/ClangHLSLTests --HlslDataDir $PWD/../tools/clang/test/HLSL/
 

azure-pipelines.yml

@@ -1,3 +1,7 @@
+trigger:
+ - main
+ - release*
+
 resources:
 - repo: self
 
@@ -49,14 +53,15 @@ stages:
  configuration: Release
  CC: clang
  CXX: clang++
- CMAKE_OPTS: -DLLVM_ENABLE_WERROR=On -DLLVM_ENABLE_SANITIZER=Address -DLLVM_ENABLE_LIBCXX=On
+ 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
  Linux_Clang_Debug:
  image: ${{ variables.linux }}
  configuration: Debug
  CC: clang
  CXX: clang++
- CMAKE_OPTS: -DLLVM_ENABLE_WERROR=On
+ CMAKE_OPTS: -DLLVM_ENABLE_WERROR=On -DLLVM_USE_LINKER=lld
  Linux_Gcc_Release:
  image: ${{ variables.linux }}
  configuration: Release
@@ -104,7 +109,7 @@ stages:
  displayName: 'Installing dependencies'
  condition: eq(variables['image'], variables['macOS'])
  - bash: |
- cmake -B build -G Ninja $BUILD_SOURCESDIRECTORY -DLLVM_LIT_ARGS=--xunit-xml-output=testresults.xunit.xml -C $BUILD_SOURCESDIRECTORY/cmake/caches/PredefinedParams.cmake -DSPIRV_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=$(configuration) -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX) $(CMAKE_OPTS)
+ cmake -B build -G Ninja $BUILD_SOURCESDIRECTORY -DLLVM_LIT_ARGS='-v --xunit-xml-output=testresults.xunit.xml' -C $BUILD_SOURCESDIRECTORY/cmake/caches/PredefinedParams.cmake -DSPIRV_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=$(configuration) -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX) $(CMAKE_OPTS)
  displayName: 'Running Cmake'
  - bash: |
  ninja -C build test-depends
@@ -116,7 +121,7 @@ stages:
  ls -ld $AGENT_BUILDDIRECTORY
  ls -ld $BUILD_SOURCESDIRECTORY
  displayName: 'Smoke tests'
- - bash: ninja -C build check-all
+ - bash: $(CHECK_ALL_ENV) ninja -C build check-all
  displayName: 'DXC tests'
  - task: PublishTestResults@2
  inputs:

cmake/modules/FindD3D12.cmake

@@ -1,7 +1,18 @@
 # Find the Win10 SDK path.
 if ("$ENV{WIN10_SDK_PATH}$ENV{WIN10_SDK_VERSION}" STREQUAL "" )
  get_filename_component(WIN10_SDK_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots;KitsRoot10]" ABSOLUTE CACHE)
- set (WIN10_SDK_VERSION ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION})
+ if (CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION)
+ set (WIN10_SDK_VERSION ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION})
+ else()
+ # CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION may not be defined if, for example,
+ # the Ninja generator is used instead of Visual Studio. Attempt to retrieve the
+ # most recent SDK version from the list of paths under "${WIN10_SDK_PATH}/Include/".
+ file(GLOB sdk_dirs RELATIVE "${WIN10_SDK_PATH}/Include/" "${WIN10_SDK_PATH}/Include/10.*")
+ if (sdk_dirs)
+ list(POP_BACK sdk_dirs WIN10_SDK_VERSION)
+ endif()
+ unset(sdk_dirs)
+ endif()
 elseif(TRUE)
  set (WIN10_SDK_PATH $ENV{WIN10_SDK_PATH})
  set (WIN10_SDK_VERSION $ENV{WIN10_SDK_VERSION})

cmake/modules/FindDiaSDK.cmake

@@ -22,6 +22,7 @@ find_path(DIASDK_INCLUDE_DIR # Set variable DIASDK_INCLUDE_DIR
  dia2.h # Find a path with dia2.h
  HINTS "${VS_DIA_INC_PATH}"
  HINTS "${VSWHERE_LATEST}/DIA SDK/include"
+ HINTS "${MSVC_DIA_SDK_DIR}/include"
  DOC "path to DIA SDK header files"
  )
 

cmake/modules/HandleLLVMOptions.cmake

@@ -78,6 +78,11 @@ if( LLVM_ENABLE_ASSERTIONS )
  "${flags_var_to_scrub}" "${${flags_var_to_scrub}}")
  endforeach()
  endif()
+else()
+ # Disable assertions in Debug builds
+ if( uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG" )
+ add_definitions( -DNDEBUG )
+ endif()
 endif()
 
 string(TOUPPER "${LLVM_ABI_BREAKING_CHECKS}" uppercase_LLVM_ABI_BREAKING_CHECKS)