Merge branch 'sycl-upstream' into maxime/profiling_v2

reble · Feb 2, 2024 · 30ab2fe · 30ab2fe
2 parents 46bce9c + faad41d
commit 30ab2fe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git 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

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