From a884a54914f9e9cf052591d70eb5cac20a25a210 Mon Sep 17 00:00:00 2001 From: "Neil R. Spruit" Date: Mon, 15 Apr 2024 01:58:14 -0700 Subject: [PATCH] =?UTF-8?q?[UR][L0][Image]=20Set=20ZeImageDesc=20member=20?= =?UTF-8?q?of=20=5Fur=5Fimage=20in=20release=20build=20=E2=80=A6=20(#13338?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …for legacy image - reenable the image interop test with fix to image interop in release builds - precommit PR for https://github.com/oneapi-src/unified-runtime/pull/1498 --------- Signed-off-by: Neil R. Spruit Co-authored-by: Aaron Greig --- sycl/plugins/unified_runtime/CMakeLists.txt | 12 ++++++------ sycl/test-e2e/Plugin/interop-level-zero-image.cpp | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index d10181378c8fa..63f808ca86c1a 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -95,13 +95,13 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) endfunction() set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - # commit 758c61490442456933e3957aac568e13287429eb - # Merge: e2b5b7fa e2e44728 + # commit 6ccaf38708cfa614ab7f9b34c351826cd74028f2 + # Merge: 0eab26c7 0497923a # Author: aarongreig - # Date: Wed Apr 10 16:15:45 2024 +0100 - # Merge pull request #1483 from nrspruit/fix_inorder_lists_reuse - # [L0] Fix regular in order command list reuse given inorder queue - set(UNIFIED_RUNTIME_TAG 758c61490442456933e3957aac568e13287429eb) + # Date: Fri Apr 12 10:22:00 2024 +0100 + # Merge pull request #1498 from wenju-he/ZeImageDesc-urMemImageCreateWithNativeHandle + # [L0][Image] Set ZeImageDesc member of _ur_image in release build for legacy image + set(UNIFIED_RUNTIME_TAG 6ccaf38708cfa614ab7f9b34c351826cd74028f2) fetch_adapter_source(level_zero ${UNIFIED_RUNTIME_REPO} diff --git a/sycl/test-e2e/Plugin/interop-level-zero-image.cpp b/sycl/test-e2e/Plugin/interop-level-zero-image.cpp index 2599dc7fa9dab..2b0b36112d2a1 100644 --- a/sycl/test-e2e/Plugin/interop-level-zero-image.cpp +++ b/sycl/test-e2e/Plugin/interop-level-zero-image.cpp @@ -3,8 +3,7 @@ // RUN: %{run} %t.out // spir-v gen for legacy images at O0 not working -// UNSUPPORTED: true -// This test is currently broken see https://github.com/intel/llvm/issues/13090 +// UNSUPPORTED: O0 // This test verifies that make_image is working for 1D, 2D and 3D images. // We instantiate an image with L0, set its body, then use a host accessor to