https://github.com/bob80905 updated https://github.com/llvm/llvm-project/pull/196640
>From f65b7f9f15141902bfe52058fd5b8b35d1b5bd5d Mon Sep 17 00:00:00 2001 From: Joshua Batista <[email protected]> Date: Fri, 8 May 2026 13:38:22 -0700 Subject: [PATCH 1/2] add offload distribution --- clang/cmake/caches/HLSL.cmake | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/clang/cmake/caches/HLSL.cmake b/clang/cmake/caches/HLSL.cmake index 24afcbbda2a40..2826a2ebd2296 100644 --- a/clang/cmake/caches/HLSL.cmake +++ b/clang/cmake/caches/HLSL.cmake @@ -14,3 +14,30 @@ if (HLSL_ENABLE_DISTRIBUTION) "clang;hlsl-resource-headers;clangd" CACHE STRING "") endif() + +# Enable the offload test suite distribution. This produces a portable +# install prefix containing all binaries and test files needed to run the +# HLSL offload test suite on another machine. +# +# Install with: +# cmake --build build --target install-distribution +# cmake --build build --target install-offload-tools +# cmake --build build --target install-offload-test-suite +# +# Prerequisites on the target machine: +# - Python 3.6+ +# - pip install lit pyyaml +# - GPU drivers (D3D12, Vulkan, or Metal depending on test suite) +# - For non-clang test suites: a DXC executable (clang-dxc is included) +# +# After installing, configure and run tests: +# cd <prefix>/share/hlsl-test-suite +# ./configure-test-suite.py --suite clang-d3d12 +# lit run/test/clang-d3d12 +if (HLSL_ENABLE_OFFLOAD_DISTRIBUTION) + # Lit utilities (FileCheck, split-file, etc.) require LLVM_INSTALL_UTILS. + set(LLVM_INSTALL_UTILS ON CACHE BOOL "") + set(LLVM_DISTRIBUTION_COMPONENTS + "clang;hlsl-resource-headers;FileCheck;split-file;obj2yaml;not" + CACHE STRING "") +endif() >From f7efba4d039f71b997b3de999d0b2ff5d982ed76 Mon Sep 17 00:00:00 2001 From: Joshua Batista <[email protected]> Date: Fri, 8 May 2026 16:09:55 -0700 Subject: [PATCH 2/2] remove tutorial comments, and shorten comment. Add offloadtest enabled check, addressing Deric --- clang/cmake/caches/HLSL.cmake | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/clang/cmake/caches/HLSL.cmake b/clang/cmake/caches/HLSL.cmake index 2826a2ebd2296..182eff16a81e3 100644 --- a/clang/cmake/caches/HLSL.cmake +++ b/clang/cmake/caches/HLSL.cmake @@ -15,26 +15,18 @@ if (HLSL_ENABLE_DISTRIBUTION) CACHE STRING "") endif() -# Enable the offload test suite distribution. This produces a portable -# install prefix containing all binaries and test files needed to run the -# HLSL offload test suite on another machine. -# -# Install with: -# cmake --build build --target install-distribution -# cmake --build build --target install-offload-tools -# cmake --build build --target install-offload-test-suite -# -# Prerequisites on the target machine: -# - Python 3.6+ -# - pip install lit pyyaml -# - GPU drivers (D3D12, Vulkan, or Metal depending on test suite) -# - For non-clang test suites: a DXC executable (clang-dxc is included) -# -# After installing, configure and run tests: -# cd <prefix>/share/hlsl-test-suite -# ./configure-test-suite.py --suite clang-d3d12 -# lit run/test/clang-d3d12 +# Enable the offload test suite distribution. Produces a portable install +# prefix containing the binaries and test data needed to run the HLSL +# offload test suite on another machine. See the offload-test-suite repo +# (docs/offload-distribution.md) for setup, prerequisites, and run +# instructions. if (HLSL_ENABLE_OFFLOAD_DISTRIBUTION) + if (NOT "OffloadTest" IN_LIST LLVM_EXTERNAL_PROJECTS) + message(FATAL_ERROR + "HLSL_ENABLE_OFFLOAD_DISTRIBUTION requires OffloadTest to be enabled " + "as an external project. Pass -DLLVM_EXTERNAL_PROJECTS=OffloadTest " + "and -DLLVM_EXTERNAL_OFFLOADTEST_SOURCE_DIR=<path-to-offload-test-suite>.") + endif() # Lit utilities (FileCheck, split-file, etc.) require LLVM_INSTALL_UTILS. set(LLVM_INSTALL_UTILS ON CACHE BOOL "") set(LLVM_DISTRIBUTION_COMPONENTS _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
