Enable type traits

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

@@ -36,7 +36,7 @@ jobs:
       - name: Fetch code formatting utils
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          repository: microsoft/DirectXShaderCompiler
+          repository: ${{ github.repository }}
           ref: ${{ github.base_ref }}
           sparse-checkout: |
             utils/git/requirements_formatting.txt
@@ -112,7 +112,7 @@ jobs:
       - name: Fetch code formatting utils
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          repository: microsoft/DirectXShaderCompiler
+          repository: ${{ github.repository }}
           ref: ${{ github.base_ref }}
           sparse-checkout: |
             utils/git/requirements_formatting.txt

.github/workflows/main.yml

@@ -0,0 +1,186 @@
+name: Devsh - Build & Deploy DXCompiler
+
+on:
+  workflow_dispatch:
+    inputs:
+      COMMIT_SHA:
+        description: 'Commit SHA to build'
+        required: true
+
+jobs:
+  windows:
+    name: Windows Build
+    runs-on: windows-2022
+    env:
+      HLSL_SRC_DIR: ${{ github.workspace }}
+      HLSL_BLD_DIR: "${{ github.workspace }}\\build"
+      platform: x64
+      os: windows-latest
+      COMMIT_SHA: ${{ github.event.inputs.COMMIT_SHA }}
+    strategy:
+      matrix:
+        configuration: [Release, Debug]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.inputs.COMMIT_SHA }}
+          clean: true
+          submodules: true
+
+      - name: Build
+        run: |
+          call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
+          call utils\hct\hctbuild.cmd -${{ env.platform }} -${{ matrix.configuration }} -show-cmake-log -spirvtest
+        shell: cmd
+
+      - name: CMake Install DXCompiler
+        run: |
+          cmake --install build/include/dxc --prefix build/install --config ${{ matrix.configuration }}
+          cmake --install build/tools/clang/tools/dxcompiler --prefix build/install --config ${{ matrix.configuration }}
+          cmake -E copy build/${{ matrix.configuration }}/bin/dxcompiler.pdb build/install/lib/
+          cmake -E copy build/${{ matrix.configuration }}/bin/dxc.exe build/install/bin/
+          cmake -E copy include/dxc/WinAdapter.h build/install/include/dxc/
+        shell: cmd
+
+      - name: Archive Installed Directory
+        run: cmake -E tar czf ${{ github.event.inputs.COMMIT_SHA }}.tar.gz build/install
+        shell: cmd
+
+      - name: Upload Installed Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.os }}-${{ matrix.configuration }}-${{ github.event.inputs.COMMIT_SHA }}
+          path: ${{ github.event.inputs.COMMIT_SHA }}.tar.gz
+
+  nix:
+    name: Unix and macOS Build
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            name: Linux_Clang_Release
+            configuration: Release
+            CC: clang-18
+            CXX: clang++-18
+            CMAKE_OPTS: "-DLLVM_ENABLE_WERROR=On -DLLVM_USE_LINKER=lld"
+          - os: ubuntu-latest
+            name: Linux_Clang_Debug
+            configuration: Debug
+            CC: clang
+            CXX: clang++
+            CMAKE_OPTS: "-DLLVM_ENABLE_WERROR=On -DLLVM_USE_LINKER=lld"
+          - os: macos-latest
+            name: MacOS_Clang_Release
+            configuration: Release
+            CC: clang
+            CXX: clang++
+            CMAKE_OPTS: "-DLLVM_ENABLE_WERROR=On"
+          - os: macos-latest
+            name: MacOS_Clang_Debug
+            configuration: Debug
+            CC: clang
+            CXX: clang++
+            CMAKE_OPTS: "-DLLVM_ENABLE_WERROR=On"
+    runs-on: ${{ matrix.os }}
+    env:
+      COMMIT_SHA: ${{ github.event.inputs.COMMIT_SHA }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.inputs.COMMIT_SHA }}
+          clean: true
+          submodules: true
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies on Linux
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ninja-build
+          wget https://apt.llvm.org/llvm.sh
+          chmod u+x llvm.sh
+          sudo ./llvm.sh 18
+          sudo apt-get install -y libc++-18-dev 
+      - name: Install dependencies on macOS
+        if: ${{ matrix.os == 'macos-latest' }}
+        run: |
+          brew update
+          brew install ninja
+          ulimit -Sn 1024
+      - name: Configure with CMake
+        run: |
+          cmake -B build -G Ninja $GITHUB_WORKSPACE \
+            -DLLVM_LIT_ARGS="-v --xunit-xml-output=testresults.xunit.xml" \
+            -C $GITHUB_WORKSPACE/cmake/caches/PredefinedParams.cmake \
+            -DSPIRV_BUILD_TESTS=OFF \
+            -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} \
+            -DCMAKE_C_COMPILER=${{ matrix.CC }} \
+            -DCMAKE_CXX_COMPILER=${{ matrix.CXX }} \
+            ${{ matrix.CMAKE_OPTS || '' }}
+      - name: Build
+        run: ninja -C build test-depends
+
+      - name: CMake Install DXCompiler
+        run: | 
+          cmake --install build/include/dxc --prefix build/install --config ${{ matrix.configuration }}
+          cmake --install build/tools/clang/tools/dxcompiler --prefix build/install --config ${{ matrix.configuration }}
+          cmake -E copy include/dxc/WinAdapter.h build/install/include/dxc/
+      - name: Archive Installed Directory
+        run: cmake -E tar czf ${{ github.event.inputs.COMMIT_SHA }}.tar.gz build/install
+
+      - name: Upload Installed Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.os }}-${{ matrix.configuration }}-${{ github.event.inputs.COMMIT_SHA }}
+          path: ${{ github.event.inputs.COMMIT_SHA }}.tar.gz
+
+  windows-tests:
+    name: Windows Devsh DXC smoke tests
+    needs: windows
+    runs-on: windows-2022
+    strategy:
+      fail-fast: false
+      matrix:
+        configuration: [Debug, Release]
+    env:
+      os: windows-latest
+      COMMIT_SHA: ${{ github.event.inputs.COMMIT_SHA }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.inputs.COMMIT_SHA }}
+          fetch-depth: 1
+          sparse-checkout: |
+            unittests
+
+      - name: Download DXCompiler artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ env.os }}-${{ matrix.configuration }}-${{ github.event.inputs.COMMIT_SHA }}
+          path: artifacts
+
+      - name: Unpack DXCompiler into unittests\Devsh\install
+        run: |
+          cmake -E tar xzf artifacts\${{ github.event.inputs.COMMIT_SHA }}.tar.gz
+          cmake -E make_directory unittests\Devsh\install
+          cmake -E copy_directory build\install unittests\Devsh\install
+        shell: cmd
+
+      - name: Configure Devsh unit tests
+        run: |
+          cmake -S unittests\Devsh -B unittests\Devsh\build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }}
+        shell: cmd
+
+      - name: Run Devsh DXC smoke tests
+        run: |
+          ctest -C ${{ matrix.configuration }} -VV -R dxc_smoke --output-on-failure
+        working-directory: unittests\Devsh\build
+        shell: cmd

.gitmodules

@@ -1,12 +1,12 @@
-[submodule "external/SPIRV-Headers"]
-	path = external/SPIRV-Headers
-	url = https://github.com/KhronosGroup/SPIRV-Headers
-[submodule "external/SPIRV-Tools"]
-	path = external/SPIRV-Tools
-	url = https://github.com/KhronosGroup/SPIRV-Tools
 [submodule "external/googletest"]
 	path = external/googletest
-	url = https://github.com/google/googletest
+	url = git@github.com:google/googletest.git
 [submodule "external/DirectX-Headers"]
 	path = external/DirectX-Headers
-	url = https://github.com/microsoft/DirectX-Headers.git
+	url = git@github.com:microsoft/DirectX-Headers.git
+[submodule "external/SPIRV-Tools"]
+	path = external/SPIRV-Tools
+	url = git@github.com:Devsh-Graphics-Programming/SPIRV-Tools.git
+[submodule "external/SPIRV-Headers"]
+	path = external/SPIRV-Headers
+	url = git@github.com:Devsh-Graphics-Programming/SPIRV-Headers.git

CMakeLists.txt

@@ -1,6 +1,8 @@
 # See docs/CMake.html for instructions about how to build LLVM with CMake.
-cmake_minimum_required(VERSION 3.17.2) # HLSL Change - Require CMake 3.17.2.
 
+
+cmake_minimum_required(VERSION 3.17.2) # HLSL Change - Require CMake 3.17.2.
+cmake_policy(SET CMP0091 NEW)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
@@ -98,11 +100,26 @@ mark_as_advanced(DXC_DISABLE_ALLOCATOR_OVERRIDES)
 option(DXC_CODEGEN_EXCEPTIONS_TRAP "An exception in code generation generates a trap, ending the compiler process" OFF)
 mark_as_advanced(DXC_CODEGEN_EXCEPTIONS_TRAP)
 
+option(DXC_ENABLE_ETW "Compile with ETW Tracing" ON)
+mark_as_advanced(DXC_ENABLE_ETW)
+
+if(DXC_ENABLE_ETW)
+  add_compile_definitions(DXC_ENABLE_ETW)
+endif()
+
 # adjust link option to enable debugging from kernel mode; not compatible with incremental linking
 if(NOT CMAKE_VERSION VERSION_LESS "3.13" AND MSVC AND NOT CMAKE_C_COMPILER_ARCHITECTURE_ID STREQUAL "ARM64EC")
   add_link_options(/DEBUGTYPE:CV,FIXUP,PDATA /INCREMENTAL:NO)
 endif()
 
+if(MSVC)
+  # use new Standard Conforming Preprocessor
+  # https://learn.microsoft.com/en-us/cpp/preprocessor/preprocessor-experimental-overview?view=msvc-170
+  if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
+    add_compile_options(/Zc:preprocessor)
+  endif()
+endif()
+
 # enable control flow guard
 if(WIN32)
   if(MSVC)
@@ -111,6 +128,7 @@ if(WIN32)
   else()
     add_compile_options(-fcf-protection)
   endif()
+  add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
 endif(WIN32)
 
 # Enable CET Shadow Stack
@@ -644,6 +662,7 @@ endif( ${CMAKE_SYSTEM_NAME} MATCHES SunOS )
 # use export_executable_symbols(target).
 set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
 
+
 # enable warnings as errors for debug build
 if (MSVC)
   SET(CMAKE_CXX_FLAGS_DEBUG  "${CMAKE_CXX_FLAGS_DEBUG} /WX")
@@ -833,3 +852,20 @@ endif (HLSL_OFFICIAL_BUILD)
 if (NOT "${DXC_CMAKE_ENDS_INCLUDE}" STREQUAL "")
   include(${DXC_CMAKE_ENDS_INCLUDE})
 endif()
+
+set(NBL_DXC_DEBUG 
+"string(APPEND NBL_DXC_DEBUG_INCLUDE_DIRECTORIES \"$<TARGET_PROPERTY:dxcompiler,INCLUDE_DIRECTORIES>\")\n\
+set(NBL_DXC_DEBUG_DLL \"$<TARGET_FILE:dxcompiler>\")\n\
+set(NBL_DXC_DEBUG_LIB \"$<TARGET_LINKER_FILE:dxcompiler>;$<TARGET_LINKER_FILE:LLVMSupport>\")"
+)
+
+file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/nbl/generate/dxc/config/debug.cmake" CONTENT "${NBL_DXC_DEBUG}" CONDITION $<CONFIG:Debug>)
+
+set(NBL_DXC_RELEASE
+"string(APPEND NBL_DXC_RELEASE_INCLUDE_DIRECTORIES \"$<TARGET_PROPERTY:dxcompiler,INCLUDE_DIRECTORIES>\")\n\
+set(NBL_DXC_RELEASE_DLL \"$<TARGET_FILE:dxcompiler>\")\n\
+set(NBL_DXC_RELEASE_LIB \"$<TARGET_LINKER_FILE:dxcompiler>;$<TARGET_LINKER_FILE:LLVMSupport>\")"
+)
+
+file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/nbl/generate/dxc/config/release.cmake" CONTENT "${NBL_DXC_RELEASE}" CONDITION $<CONFIG:Release>)
+