From 8afc51115457243b568bc1b6fc3e79bbaefe5f06 Mon Sep 17 00:00:00 2001 From: Chris Perkins Date: Mon, 8 May 2023 14:40:55 -0700 Subject: [PATCH 1/3] [SYCL] No L0_Loader in product. Was temporarily added to enable win GHA testing in December, but should no longer be necessary. --- sycl/plugins/level_zero/CMakeLists.txt | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/sycl/plugins/level_zero/CMakeLists.txt b/sycl/plugins/level_zero/CMakeLists.txt index aabbb4e5daa8..2b9dff977029 100755 --- a/sycl/plugins/level_zero/CMakeLists.txt +++ b/sycl/plugins/level_zero/CMakeLists.txt @@ -140,23 +140,6 @@ add_sycl_plugin(level_zero ${XPTI_LIBS} ) -#FIXME: We should stop shipping level zero loader and headers as part of the -# toolchain installation. Instead these should be avaialble in the system. -# We keep shipping it until all environments are updated. -if (TARGET ze_loader) - install(TARGETS ze_loader - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero-sycl-dev - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT level-zero-sycl-dev - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero-sycl-dev - ) - file(GLOB LEVEL_ZERO_API_HEADERS "${LEVEL_ZERO_INCLUDE_DIR}/*.h") - install(FILES ${LEVEL_ZERO_API_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/sycl/level_zero/ - COMPONENT level-zero-sycl-dev - ) -endif() -# end of FIXME - add_dependencies(pi_level_zero ze-api) if (SYCL_ENABLE_XPTI_TRACING) From 51c6e69cb3275fc3bc92d4c662adb7a388d305da Mon Sep 17 00:00:00 2001 From: "Perkins, Chris" Date: Tue, 9 May 2023 11:19:59 -0700 Subject: [PATCH 2/3] tests do NOT need L0 interop and should not include it in the build directive. --- sycl/test-e2e/Plugin/level_zero_events_caching.cpp | 2 +- sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp | 2 +- sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp | 2 +- sycl/test-e2e/Plugin/level_zero_usm_device_read_only.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sycl/test-e2e/Plugin/level_zero_events_caching.cpp b/sycl/test-e2e/Plugin/level_zero_events_caching.cpp index 86da4fec71fb..e0a446b1f109 100644 --- a/sycl/test-e2e/Plugin/level_zero_events_caching.cpp +++ b/sycl/test-e2e/Plugin/level_zero_events_caching.cpp @@ -1,6 +1,6 @@ // REQUIRES: gpu, level_zero -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out +// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: env ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck --check-prefixes=CACHING-ENABLED %s // RUN: env SYCL_PI_LEVEL_ZERO_DISABLE_EVENTS_CACHING=0 ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck --check-prefixes=CACHING-ENABLED %s // RUN: env SYCL_PI_LEVEL_ZERO_DISABLE_EVENTS_CACHING=1 ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck --check-prefixes=CACHING-DISABLED %s diff --git a/sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp b/sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp index 8f41ee1e5d02..1b8cdaa288dc 100644 --- a/sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp +++ b/sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp @@ -1,5 +1,5 @@ // REQUIRES: aspect-ext_intel_device_id -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out +// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: env ZEX_NUMBER_OF_CCS=0:4 env ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out > %t.default.log 2>&1 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --check-prefixes=CHECK-PVC < %t.default.log diff --git a/sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp b/sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp index 94eaf9120ea5..6c8d375aa7d8 100644 --- a/sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp +++ b/sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp @@ -1,5 +1,5 @@ // REQUIRES: aspect-ext_intel_device_id -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out +// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: env ZEX_NUMBER_OF_CCS=0:4 env ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out > %t.log 2>&1 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --check-prefixes=CHECK-PVC < %t.log // diff --git a/sycl/test-e2e/Plugin/level_zero_usm_device_read_only.cpp b/sycl/test-e2e/Plugin/level_zero_usm_device_read_only.cpp index 3419e378439d..572e468410a7 100644 --- a/sycl/test-e2e/Plugin/level_zero_usm_device_read_only.cpp +++ b/sycl/test-e2e/Plugin/level_zero_usm_device_read_only.cpp @@ -1,6 +1,6 @@ // REQUIRES: gpu, level_zero -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out +// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: env SYCL_PI_TRACE=2 ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER // Test that "device_read_only" shared USM allocations are pooled. From fd8e17a8988191551234960ede41d561ed6e634e Mon Sep 17 00:00:00 2001 From: "Perkins, Chris" Date: Tue, 9 May 2023 20:04:13 -0700 Subject: [PATCH 3/3] overlooked test? --- sycl/test-e2e/Plugin/level_zero_events_caching_leak.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/Plugin/level_zero_events_caching_leak.cpp b/sycl/test-e2e/Plugin/level_zero_events_caching_leak.cpp index 28b926df98cc..72335434f0de 100644 --- a/sycl/test-e2e/Plugin/level_zero_events_caching_leak.cpp +++ b/sycl/test-e2e/Plugin/level_zero_events_caching_leak.cpp @@ -1,6 +1,6 @@ // REQUIRES: gpu, level_zero -// RUN: %{build} %level_zero_options -o %t.out +// RUN: %{build} -o %t.out // RUN: env ZE_MAX_NUMBER_OF_EVENTS_PER_EVENT_POOL=4 ZE_DEBUG=4 %{run} %t.out // RUN: env SYCL_PI_LEVEL_ZERO_DISABLE_EVENTS_CACHING=1 ZE_MAX_NUMBER_OF_EVENTS_PER_EVENT_POOL=4 ZE_DEBUG=4 %{run} %t.out