Merge branch 'sycl' into URmemsetLargePatternL0

intel · Apr 15, 2024 · 8e17c1f · 8e17c1f
2 parents 9aa4bdf + a884a54
commit 8e17c1f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt
@@ -145,7 +145,6 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT)
  # [NATIVECPU] Extended usm fill to bigger patterns than 1 byte
  15233fd2521f9e9b35e3a24037be99ceef334a8e
  )
->>>>>>> sycl
 
  if(SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO)
  set(UNIFIED_RUNTIME_REPO "${SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO}")

diff --git 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