From 9b2e77a6769d68dd509f502f0181aa865043b262 Mon Sep 17 00:00:00 2001
From: John Pennycook <john.pennycook@intel.com>
Date: Fri, 2 Feb 2024 02:45:26 -0800
Subject: [PATCH 1/3] [SYCL] Disable dynamic_address_cast test on FPGA (#12561)
The FPGA emulator is currently affected by the same issue as the CPU
runtime.
Signed-off-by: John Pennycook <john.pennycook@intel.com>
---
sycl/test-e2e/AddressCast/dynamic_address_cast.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sycl/test-e2e/AddressCast/dynamic_address_cast.cpp b/sycl/test-e2e/AddressCast/dynamic_address_cast.cpp
index 0216261547542..10db9a429e53e 100644
--- a/sycl/test-e2e/AddressCast/dynamic_address_cast.cpp
+++ b/sycl/test-e2e/AddressCast/dynamic_address_cast.cpp
@@ -8,7 +8,8 @@
// Issue with OpenCL CPU runtime implementation of OpGenericCastToPtrExplicit
// OpGenericCastToPtr* intrinsics not implemented on AMD or NVIDIA
-// UNSUPPORTED: cpu, hip, cuda
+// FPGA emulator affected by same issue as OpenCL CPU runtime
+// UNSUPPORTED: cpu, hip, cuda, accelerator
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out
#include <sycl/sycl.hpp>
From 35f9696be49f8b6547b49e289b9a3142f0a9986d Mon Sep 17 00:00:00 2001
From: aelovikov-intel <andrei.elovikov@intel.com>
Date: Fri, 2 Feb 2024 02:48:30 -0800
Subject: [PATCH 2/3] [CI] Modify Nightly task to run opencl:cpu testing on
different CPUs (#12548)
We have flakyness in nightly testing results. Having more variety would
helpfully provide some insights on conditions when it happens.
The task is only executed once a day, so extra resources needed
shouldn't affect the load on the runners much.
---
.github/workflows/sycl-nightly.yml | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/sycl-nightly.yml b/.github/workflows/sycl-nightly.yml
index 28df4a8b8de13..0b464c75d33b6 100644
--- a/.github/workflows/sycl-nightly.yml
+++ b/.github/workflows/sycl-nightly.yml
@@ -48,8 +48,20 @@ jobs:
target_devices: opencl:gpu
reset_gpu: true
- - name: OCL CPU
- runner: '["Linux", "x86-cpu"]'
+ - name: OCL CPU (AMD)
+ runner: '["Linux", "amdgpu"]'
+ image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
+ image_options: -u 1001
+ target_devices: opencl:cpu
+
+ - name: OCL CPU (Intel/GEN12)
+ runner: '["Linux", "gen12"]'
+ image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
+ image_options: -u 1001
+ target_devices: opencl:cpu
+
+ - name: OCL CPU (Intel/Arc)
+ runner: '["Linux", "arc"]'
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
image_options: -u 1001
target_devices: opencl:cpu
From faad41d8fe3767a9520cae7613cc6ee34cea52d2 Mon Sep 17 00:00:00 2001
From: "Kenneth Benzie (Benie)" <k.benzie@codeplay.com>
Date: Fri, 2 Feb 2024 10:50:25 +0000
Subject: [PATCH 3/3] [UR][CL] Handle INTERMEDIATE binary type (#12562)
https://github.com/oneapi-src/unified-runtime/pull/1302
---
sycl/plugins/unified_runtime/CMakeLists.txt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt
index c990359e39e96..2aa0423e1e663 100644
--- a/sycl/plugins/unified_runtime/CMakeLists.txt
+++ b/sycl/plugins/unified_runtime/CMakeLists.txt
@@ -56,14 +56,14 @@ endif()
if(SYCL_PI_UR_USE_FETCH_CONTENT)
include(FetchContent)
- set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
- # commit d216eb44d5c9fe3433eecdd09b10e3e79ac25bd7
- # Merge: 40517d2b fc1f3066
+ set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime")
+ # commit 9363574db721d2388c7d76a10edb128764872352
+ # Merge: 553a6b82 5e513738
# Author: Kenneth Benzie (Benie) <k.benzie@codeplay.com>
- # Date: Wed Jan 31 10:38:07 2024 +0000
- # Merge pull request #1226 from hdelan/get-native-mem-on-device2
- # [UR] Add extra param to urMemGetNativeHandle
- set(UNIFIED_RUNTIME_TAG d216eb44d5c9fe3433eecdd09b10e3e79ac25bd7)
+ # Date: Thu Feb 1 11:50:16 2024 +0000
+ # Merge pull request #1302 from kbenzie/benie/cl-binary-type-intermediate
+ # [CL] Handle INTERMEDIATE binary type
+ set(UNIFIED_RUNTIME_TAG 9363574db721d2388c7d76a10edb128764872352)
if(SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO)
set(UNIFIED_RUNTIME_REPO "${SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO}")