diff --git a/.github/workflows/sycl-linux-build.yml b/.github/workflows/sycl-linux-build.yml index f18ad927c7016..75154546bb984 100644 --- a/.github/workflows/sycl-linux-build.yml +++ b/.github/workflows/sycl-linux-build.yml @@ -248,6 +248,7 @@ jobs: # TODO replace utility installation with a single CMake target run: | cmake --build $GITHUB_WORKSPACE/build --target utils/FileCheck/install + cmake --build $GITHUB_WORKSPACE/build --target tools/llvm-dis/install cmake --build $GITHUB_WORKSPACE/build --target utils/count/install cmake --build $GITHUB_WORKSPACE/build --target utils/not/install cmake --build $GITHUB_WORKSPACE/build --target utils/lit/install diff --git a/sycl/test-e2e/CMakeLists.txt b/sycl/test-e2e/CMakeLists.txt index 38afa0ee45e0c..07000f6a825bb 100644 --- a/sycl/test-e2e/CMakeLists.txt +++ b/sycl/test-e2e/CMakeLists.txt @@ -116,6 +116,7 @@ if(NOT SYCL_TEST_E2E_STANDALONE) sycl-toolchain FileCheck not + llvm-dis ) endif() # Standalone. diff --git a/sycl/test-e2e/SeparateCompile/test.cpp b/sycl/test-e2e/SeparateCompile/test.cpp index 920714e72e0f0..2ce777d83cdce 100644 --- a/sycl/test-e2e/SeparateCompile/test.cpp +++ b/sycl/test-e2e/SeparateCompile/test.cpp @@ -39,6 +39,11 @@ // // >> ---- do table transformations from bc to spv entries // RUN: file-table-tform -extract=Code -drop_titles -o test_spv_in.table test.table +// RUN: cat test_spv_in.table +// RUN: llvm-dis test_0.bc -o - +// RUN: llvm-dis test_1.bc -o - +// RUN: llvm-dis test_2.bc -o - +// RUN: llvm-dis test_3.bc -o - // RUN: llvm-foreach --in-file-list=test_spv_in.table --in-replace=test_spv_in.table --out-ext=spv --out-file-list=test_spv_out.table --out-replace=test_spv_out.table -- llvm-spirv -o test_spv_out.table -spirv-allow-extra-diexpressions -spirv-allow-unknown-intrinsics=llvm.genx. -spirv-ext=-all test_spv_in.table // RUN: file-table-tform -replace=Code,Code -o test_spv.table test.table test_spv_out.table // diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index df9a7e6a3192c..23a40b6acc529 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -832,6 +832,7 @@ def remove_level_zero_suffix(devices): tools = [ ToolSubst("FileCheck", unresolved="ignore"), + ToolSubst("llvm-dis", unresolved="ignore"), # not is only substituted in certain circumstances; this is lit's default # behaviour. ToolSubst(