From 12693a6f013604d8216ca2af999032059bb845d5 Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Wed, 17 Jul 2024 17:17:46 -0700 Subject: [PATCH 1/3] Fix interop E2E tests on Win CI --- .github/workflows/sycl-windows-run-tests.yml | 2 +- sycl/test-e2e/lit.cfg.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sycl-windows-run-tests.yml b/.github/workflows/sycl-windows-run-tests.yml index d61425eb61444..9315d70ff49fb 100644 --- a/.github/workflows/sycl-windows-run-tests.yml +++ b/.github/workflows/sycl-windows-run-tests.yml @@ -79,7 +79,7 @@ jobs: shell: cmd run: | mkdir build-e2e - cmake -GNinja -B build-e2e -S.\llvm\sycl\test-e2e -DSYCL_TEST_E2E_TARGETS="ext_oneapi_level_zero:gpu" -DCMAKE_CXX_COMPILER="clang++" -DLEVEL_ZERO_LIBS_DIR="D:\github\level-zero_win-sdk\lib" -DLLVM_LIT="..\llvm\llvm\utils\lit\lit.py" + cmake -GNinja -B build-e2e -S.\llvm\sycl\test-e2e -DSYCL_TEST_E2E_TARGETS="ext_oneapi_level_zero:gpu" -DCMAKE_CXX_COMPILER="clang++" -DLEVEL_ZERO_LIBS_DIR="D:\github\level-zero_win-sdk\lib" -DLEVEL_ZERO_INCLUDE="D:\github\level-zero_win-sdk\include" -DLLVM_LIT="..\llvm\llvm\utils\lit\lit.py" - name: Run End-to-End tests shell: bash run: | diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index 77589fac7579f..2a91d86f80180 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -253,6 +253,9 @@ def open_check_file(file_name): config.available_features.add("level_zero_dev_kit") config.substitutions.append(("%level_zero_options", level_zero_options)) else: + lit_config.warning("Could not find L0 library and/or header files. Disabling level_zero_dev_kit LIT feature.") + lit.config.warning("L0 options: " + level_zero_options) + lit.config.warning("config.level_zero_libs_dir: " + config.level_zero_libs_dir) config.substitutions.append(("%level_zero_options", "")) # Check for sycl-preview library @@ -334,6 +337,9 @@ def open_check_file(file_name): ("%opencl_lib", "-L" + config.opencl_libs_dir + " -lOpenCL") ) config.available_features.add("opencl_icd") +else: + lit.config.warning("OpenCL libraries not found. Disabling opencl_icd feature.") + config.substitutions.append(("%opencl_include_dir", config.opencl_include_dir)) if cl_options: From 10e092bd9927f9f81501a5dcb267983a21e5adff Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Wed, 17 Jul 2024 22:38:19 -0700 Subject: [PATCH 2/3] Fix typo --- sycl/test-e2e/lit.cfg.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index 2a91d86f80180..89706f6dac5e1 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -254,8 +254,8 @@ def open_check_file(file_name): config.substitutions.append(("%level_zero_options", level_zero_options)) else: lit_config.warning("Could not find L0 library and/or header files. Disabling level_zero_dev_kit LIT feature.") - lit.config.warning("L0 options: " + level_zero_options) - lit.config.warning("config.level_zero_libs_dir: " + config.level_zero_libs_dir) + lit_config.warning("L0 options: " + level_zero_options) + lit_config.warning("config.level_zero_libs_dir: " + config.level_zero_libs_dir) config.substitutions.append(("%level_zero_options", "")) # Check for sycl-preview library @@ -337,8 +337,6 @@ def open_check_file(file_name): ("%opencl_lib", "-L" + config.opencl_libs_dir + " -lOpenCL") ) config.available_features.add("opencl_icd") -else: - lit.config.warning("OpenCL libraries not found. Disabling opencl_icd feature.") config.substitutions.append(("%opencl_include_dir", config.opencl_include_dir)) From 38836f57740fd663e3e915ed36f6539971acfdc0 Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Thu, 18 Jul 2024 07:57:42 -0700 Subject: [PATCH 3/3] Remove debug statements --- sycl/test-e2e/lit.cfg.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index 89706f6dac5e1..77589fac7579f 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -253,9 +253,6 @@ def open_check_file(file_name): config.available_features.add("level_zero_dev_kit") config.substitutions.append(("%level_zero_options", level_zero_options)) else: - lit_config.warning("Could not find L0 library and/or header files. Disabling level_zero_dev_kit LIT feature.") - lit_config.warning("L0 options: " + level_zero_options) - lit_config.warning("config.level_zero_libs_dir: " + config.level_zero_libs_dir) config.substitutions.append(("%level_zero_options", "")) # Check for sycl-preview library @@ -337,7 +334,6 @@ def open_check_file(file_name): ("%opencl_lib", "-L" + config.opencl_libs_dir + " -lOpenCL") ) config.available_features.add("opencl_icd") - config.substitutions.append(("%opencl_include_dir", config.opencl_include_dir)) if cl_options: