Skip to content

Windows v2 fail #17830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/sycl-windows-run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ jobs:
shell: cmd
run: |
mkdir build-e2e
cmake -GNinja -B build-e2e -S.\llvm\sycl\test-e2e -DSYCL_TEST_E2E_TARGETS="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"
cmake -GNinja -B build-e2e -S.\llvm\sycl\test-e2e -DSYCL_TEST_E2E_TARGETS="level_zero:gpu;level_zero_v2: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
if: inputs.tests_selector == 'e2e'
shell: bash {0}
Expand Down
3 changes: 3 additions & 0 deletions sycl/ur_win_proxy_loader/ur_win_proxy_loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,15 @@ static std::wstring getCurrentDSODir() {
#define __SYCL_UNIFIED_RUNTIME_LOADER_NAME "ur_loader.dll"
#define __SYCL_OPENCL_ADAPTER_NAME "ur_adapter_opencl.dll"
#define __SYCL_LEVEL_ZERO_ADAPTER_NAME "ur_adapter_level_zero.dll"
#define __SYCL_LEVEL_ZERO_V2_ADAPTER_NAME "ur_adapter_level_zero.dll"
#define __SYCL_CUDA_ADAPTER_NAME "ur_adapter_cuda.dll"
#define __SYCL_HIP_ADAPTER_NAME "ur_adapter_hip.dll"
#define __SYCL_NATIVE_CPU_ADAPTER_NAME "ur_adapter_native_cpu.dll"
#else // llvm-mingw
#define __SYCL_UNIFIED_RUNTIME_LOADER_NAME "libur_loader.dll"
#define __SYCL_OPENCL_ADAPTER_NAME "libur_adapter_opencl.dll"
#define __SYCL_LEVEL_ZERO_ADAPTER_NAME "libur_adapter_level_zero.dll"
#define __SYCL_LEVEL_ZERO_V2_ADAPTER_NAME "libur_adapter_level_zero.dll"
#define __SYCL_CUDA_ADAPTER_NAME "libur_adapter_cuda.dll"
#define __SYCL_HIP_ADAPTER_NAME "libur_adapter_hip.dll"
#define __SYCL_NATIVE_CPU_ADAPTER_NAME "libur_adapter_native_cpu.dll"
Expand Down Expand Up @@ -142,6 +144,7 @@ void preloadLibraries() {
getDllHandle() = loadAdapter(__SYCL_UNIFIED_RUNTIME_LOADER_NAME);
loadAdapter(__SYCL_OPENCL_ADAPTER_NAME);
loadAdapter(__SYCL_LEVEL_ZERO_ADAPTER_NAME);
loadAdapter(__SYCL_LEVEL_ZERO_V2_ADAPTER_NAME);
loadAdapter(__SYCL_CUDA_ADAPTER_NAME);
loadAdapter(__SYCL_HIP_ADAPTER_NAME);
loadAdapter(__SYCL_NATIVE_CPU_ADAPTER_NAME);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@ static bool ForceDisableCopyOffload = [] {
raii::ze_command_list_handle_t
command_list_cache_t::createCommandList(const command_list_descriptor_t &desc) {
ZeStruct<zex_intel_queue_copy_operations_offload_hint_exp_desc_t> offloadDesc;
auto requestedCopyOffload =
std::visit([](auto &&arg) { return arg.CopyOffloadEnabled; }, desc);

auto requestedCopyOffload = false;
if (ForceDisableCopyOffload && requestedCopyOffload) {
logger::info("Copy offload is disabled by the environment variable.");
requestedCopyOffload = false;
Expand Down
Loading