Merge remote-tracking branch 'upstream/intel' into remove_program_class

Author: Alexander Batashev

SYCL/AOT/accelerator.cpp

@@ -8,5 +8,5 @@
 
 // REQUIRES: aoc, accelerator
 
-// RUN: %clangxx -fsycl -fsycl-targets=spir64_fpga-unknown-unknown-sycldevice %S/Inputs/aot.cpp -o %t.out
+// RUN: %clangxx -fsycl -fsycl-targets=spir64_fpga %S/Inputs/aot.cpp -o %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out

SYCL/AOT/cpu.cpp

@@ -8,8 +8,8 @@
 
 // REQUIRES: opencl-aot, cpu
 
-// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64-unknown-unknown-sycldevice %S/Inputs/aot.cpp -o %t.out
+// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/Inputs/aot.cpp -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 
 // Test that opencl-aot can handle multiple build options.
-// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64-unknown-unknown-sycldevice  %S/Inputs/aot.cpp -Xsycl-target-backend "--bo=-g" -Xsycl-target-backend "--bo=-cl-opt-disable" -o %t2.out
+// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64  %S/Inputs/aot.cpp -Xsycl-target-backend "--bo=-g" -Xsycl-target-backend "--bo=-cl-opt-disable" -o %t2.out

SYCL/AOT/gpu.cpp

@@ -10,5 +10,5 @@
 // UNSUPPORTED: cuda
 // CUDA is not compatible with SPIR.
 //
-// RUN: %clangxx -fsycl -fsycl-targets=spir64_gen-unknown-unknown-sycldevice -Xsycl-target-backend=spir64_gen-unknown-unknown-sycldevice "-device *" %S/Inputs/aot.cpp -o %t.out
+// RUN: %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen "-device *" %S/Inputs/aot.cpp -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out

SYCL/AOT/multiple-devices.cpp

@@ -12,7 +12,7 @@
 
 // 1-command compilation case
 // Targeting CPU, GPU, FPGA
-// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64-unknown-unknown-sycldevice,spir64_gen-unknown-unknown-sycldevice,spir64_fpga-unknown-unknown-sycldevice -Xsycl-target-backend=spir64_gen-unknown-unknown-sycldevice "-device *" %S/Inputs/aot.cpp -o %t_all.out
+// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64,spir64_gen,spir64_fpga -Xsycl-target-backend=spir64_gen "-device *" %S/Inputs/aot.cpp -o %t_all.out
 // RUN: %HOST_RUN_PLACEHOLDER %t_all.out
 // RUN: %CPU_RUN_PLACEHOLDER %t_all.out
 // RUN: %GPU_RUN_PLACEHOLDER %t_all.out
@@ -26,7 +26,7 @@
 // Produce object file, spirv, device images to combine these differently
 // at link-time, thus testing various AOT-compiled images configurations
 // RUN: %clangxx -fsycl %S/Inputs/aot.cpp -c -o %t.o
-// RUN: %clangxx -fsycl -fsycl-link-targets=spir64-unknown-unknown-sycldevice %t.o -o %t.spv
+// RUN: %clangxx -fsycl -fsycl-link-targets=spir64 %t.o -o %t.spv
 // AOT-compile device binary images
 // Neither of AOT tools can compile several files, hence, here is this
 // workaround

SYCL/AOT/spec_const_aot.cpp

@@ -1,6 +1,6 @@
 // REQUIRES: opencl-aot, cpu
 //
-// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64-unknown-unknown-sycldevice %s -o %t.out
+// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %s -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 //
 // The test checks that the specialization constant feature works with ahead

SYCL/AOT/with-llvm-bc.cpp

@@ -8,8 +8,8 @@
 
 // REQUIRES: cpu, dump_ir
 
-// RUN: %clangxx -fsycl -fsycl-targets=spir64-unknown-unknown-sycldevice -c %S/Inputs/aot.cpp -o %t.o
-// RUN: %clangxx -fsycl -fsycl-link-targets=spir64-unknown-unknown-sycldevice %t.o -o %t.spv
+// RUN: %clangxx -fsycl -fsycl-targets=spir64 -c %S/Inputs/aot.cpp -o %t.o
+// RUN: %clangxx -fsycl -fsycl-link-targets=spir64 %t.o -o %t.spv
 // RUN: llvm-spirv -r %t.spv -o %t.bc
 // RUN: %clangxx -fsycl -fsycl-add-targets=spir64:%t.bc %t.o -o %t.out
 //

SYCL/AtomicRef/add.cpp

@@ -1,5 +1,5 @@
 // RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out \
-// RUN: -Xsycl-target-backend=nvptx64-nvidia-cuda-sycldevice --cuda-gpu-arch=sm_60
+// RUN: -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_60
 // RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out

SYCL/AtomicRef/add_atomic64.cpp

@@ -1,5 +1,5 @@
 // RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out \
-// RUN: -Xsycl-target-backend=nvptx64-nvidia-cuda-sycldevice --cuda-gpu-arch=sm_60
+// RUN: -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_60
 // RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out

SYCL/AtomicRef/sub.cpp

@@ -1,5 +1,5 @@
 // RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out \
-// RUN: -Xsycl-target-backend=nvptx64-nvidia-cuda-sycldevice --cuda-gpu-arch=sm_60
+// RUN: -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_60
 // RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out

SYCL/AtomicRef/sub_atomic64.cpp

@@ -1,5 +1,5 @@
 // RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out \
-// RUN: -Xsycl-target-backend=nvptx64-nvidia-cuda-sycldevice --cuda-gpu-arch=sm_60
+// RUN: -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_60
 // RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out

SYCL/BFloat16/bfloat16_type.cpp

@@ -1,4 +1,4 @@
-// UNSUPPORTED: cuda
+// UNSUPPORTED: cuda || hip
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
 // TODO currently the feature isn't supported on most of the devices
 //      need to enable the test when the aspect and device_if feature are

SYCL/Basic/barrier_order.cpp

@@ -3,7 +3,7 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
-// UNSUPPORTED: cuda
+// UNSUPPORTED: cuda || hip
 
 #include <CL/sycl.hpp>
 #include <stdlib.h>

SYCL/Basic/buffer/buffer_full_copy.cpp

@@ -5,6 +5,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t2.out
 // RUN: %GPU_RUN_PLACEHOLDER %t2.out
 // RUN: %ACC_RUN_PLACEHOLDER %t2.out
+//
+// Incorrect results with hip
+// XFAIL: hip
 
 //==------------- buffer_full_copy.cpp - SYCL buffer basic test ------------==//
 //

SYCL/Basic/buffer/subbuffer.cpp

@@ -4,6 +4,8 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 //
+// Test failing with hip on AMD
+// XFAIL: hip_amd
 //==---------- subbuffer.cpp --- sub-buffer basic test ---------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

SYCL/Basic/device_code_dae.cpp

@@ -1,7 +1,7 @@
 // NOTE A temporary test before this compilation flow is enabled by default in
 // driver
-// UNSUPPORTED: cuda
-// CUDA does not support SPIR-V.
+// UNSUPPORTED: cuda || hip
+// CUDA and HIP don't support SPIR-V.
 // RUN: %clangxx -fsycl-device-only -Xclang -fenable-sycl-dae -Xclang -fsycl-int-header=int_header.h %s -c -o device_code.bc -Wno-sycl-strict
 // RUN: %clangxx %cxx_std_optionc++17 %include_option int_header.h %debug_option -c %s -o host_code.o %sycl_options -Wno-sycl-strict
 // FIXME Added explicit offline linking step here until online-linking support

SYCL/Basic/device_event.cpp

@@ -4,6 +4,9 @@
 // RUN: %ACC_RUN_PLACEHOLDER %t.run
 // TODO: nd_item::barrier() is not implemented on HOST
 // RUNx: %HOST_RUN_PLACEHOLDER %t.run
+//
+// Crashes on AMD
+// XFAIL: hip_amd
 
 //==--------device_event.cpp - SYCL class device_event test ----------------==//
 //

SYCL/Basic/enqueue_barrier.cpp

@@ -5,7 +5,7 @@
 
 // The test is failing sporadically on Windows OpenCL RTs
 // Disabling on windows until fixed
-// UNSUPPORTED: cuda || windows
+// UNSUPPORTED: cuda || windows || hip
 
 #include <CL/sycl.hpp>
 #include <sycl/ext/intel/fpga_device_selector.hpp>

SYCL/Basic/free_function_queries/free_function_queries_sub_group.cpp

@@ -1,5 +1,5 @@
-// UNSUPPORTED: cuda
-// CUDA compilation and runtime do not yet support sub-groups.
+// UNSUPPORTED: cuda || hip
+// CUDA and HIP compilation and runtime do not yet support sub-groups.
 //
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: %HOST_RUN_PLACEHOLDER %t.out

SYCL/Basic/get_backend.cpp

@@ -1,6 +1,9 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: env SYCL_DEVICE_FILTER=%sycl_be %t.out
 //
+// Failing on HIP AMD
+// XFAIL: hip_amd
+//
 //==----------------- get_backend.cpp ------------------------==//
 // This is a test of get_backend().
 // Do not set SYCL_DEVICE_FILTER. We do not want the preferred

SYCL/Basic/group_async_copy.cpp

@@ -3,6 +3,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.run
 // RUN: %ACC_RUN_PLACEHOLDER %t.run
 // RUN: env SYCL_DEVICE_FILTER=host %t.run
+//
+// Crashes on AMD
+// XFAIL: hip_amd
 
 #include <CL/sycl.hpp>
 #include <iostream>

SYCL/Basic/handler/handler_set_args.cpp

@@ -2,6 +2,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
+//
+// Memory access fault on AMD
+// XFAIL: hip_amd
 //==--------------- handler_set_args.cpp -------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

SYCL/Basic/host_platform_avail.cpp

@@ -2,7 +2,7 @@
 // RUN: %HOST_RUN_PLACEHOLDER %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
-// RUN: %ACC_RUN_PLACEHOLDER %t1.out
+// RUN: env SYCL_DEVICE_FILTER=acc,host %t1.out
 
 //==------ host_platform_avail.cpp - Host Platform Availability test -------==//
 //

SYCL/Basic/image/image_read.h

@@ -6,8 +6,6 @@
  * the OpenCL 1.2 specification, Section 8. Image Addressing and Filtering
  *
  * https://www.khronos.org/registry/OpenCL/specs/opencl-1.2.pdf#page=329
- *
- * Confirmed to pass with -fsycl-targets=spir64-unknown-linux-sycldevice
  */
 
 #include <CL/sycl.hpp>

SYCL/Basic/image/image_write.h

@@ -6,8 +6,6 @@
  * the OpenCL 1.2 specification, Section 8. Image Addressing and Filtering
  *
  * https://www.khronos.org/registry/OpenCL/specs/opencl-1.2.pdf#page=329
- *
- * Confirmed to pass with -fsycl-targets=spir64-unknown-linux-sycldevice
  */
 
 #include <CL/sycl.hpp>

SYCL/Basic/info.cpp

@@ -3,6 +3,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
+//
+// Hits a terminate on HIP AMD
+// XFAIL: hip_amd
 
 //==----------------info.cpp - SYCL objects get_info() test ----------------==//
 //

SYCL/Basic/kernel_info.cpp

@@ -5,6 +5,9 @@
 //
 // Fail is flaky for level_zero, enable when fixed.
 // UNSUPPORTED: level_zero
+//
+// Failing on HIP AMD
+// XFAIL: hip_amd
 
 //==--- kernel_info.cpp - SYCL kernel info test ----------------------------==//
 //

SYCL/Basic/linear-sub_group.cpp

@@ -3,6 +3,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
+//
+// Missing built-ins on AMD
+// XFAIL: hip_amd
 //==--------------- linear-sub_group.cpp - SYCL linear id test -------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

SYCL/Basic/parallel_for_indexers.cpp

@@ -5,6 +5,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t2.out
 // RUN: %GPU_RUN_PLACEHOLDER %t2.out
 // RUN: %ACC_RUN_PLACEHOLDER %t2.out
+//
+// Incorrect results with hip on AMD
+// XFAIL: hip_amd
 
 #include <CL/sycl.hpp>
 

SYCL/Basic/query_emulate_subdevice.cpp

@@ -2,5 +2,5 @@
 // RUN: env CreateMultipleSubDevices=2 EnableTimestampPacket=1 \
 // RUN: NEOReadDebugKeys=1 SYCL_DEVICE_FILTER="gpu" %t.out
 
-// UNSUPPORTED: gpu-intel-dg1,cuda
+// UNSUPPORTED: gpu-intel-dg1,cuda,hip
 #include "query.hpp"

SYCL/Basic/reqd_work_group_size.cpp

@@ -2,6 +2,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
+//
+// Failing negative test with HIP
+// XFAIL: hip
 
 #include <CL/sycl.hpp>
 

SYCL/Basic/scalar_vec_access.cpp

@@ -3,6 +3,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER
 // RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER
 // RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER
+//
+// Missing built-ins on AMD
+// XFAIL: hip_amd
 
 //==------- scalar_vec_access.cpp - SYCL scalar access to vec test ---------==//
 //

SYCL/Basic/stream/stream.cpp

@@ -4,6 +4,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER
 // RUN: %GPU_RUN_ON_LINUX_PLACEHOLDER %t.out %GPU_CHECK_ON_LINUX_PLACEHOLDER
 // RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER
+//
+// Missing built-ins on AMD
+// XFAIL: hip_amd
 
 //==------------------ stream.cpp - SYCL stream basic test -----------------==//
 //

SYCL/Basic/submit_barrier.cpp

@@ -3,7 +3,7 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
-// UNSUPPORTED: cuda
+// UNSUPPORTED: cuda || hip
 
 #include <CL/sycl.hpp>
 #include <stdlib.h>

SYCL/Config/kernel_from_file.cpp

@@ -1,5 +1,5 @@
-// UNSUPPORTED: cuda
-// CUDA does not support SPIR-V.
+// UNSUPPORTED: cuda || hip
+// CUDA and HIP don't support SPIR-V.
 
 // FIXME Disabled fallback assert as it'll require either online linking or
 // explicit offline linking step here

SYCL/Config/select_device.cpp

@@ -38,7 +38,7 @@
 //
 // REQUIRES: gpu
 //
-// XFAIL: cuda
+// XFAIL: cuda || hip
 //
 // TODO: Update this test when SYCL_DEVICE_FILTER support in enabled.
 

SYCL/DeprecatedFeatures/basic-program.cpp

@@ -1,4 +1,4 @@
-// XFAIL: cuda
+// XFAIL: cuda || hip
 // RUN: %clangxx -D__SYCL_INTERNAL_API -fsycl -fsycl-targets=%sycl_triple  %s -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out

SYCL/DeprecatedFeatures/get-options.cpp

@@ -3,7 +3,7 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
-// XFAIL: cuda
+// XFAIL: cuda || hip
 
 #include <CL/sycl.hpp>
 

SYCL/DeprecatedFeatures/kernel-and-program.cpp

@@ -3,7 +3,7 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
-// XFAIL: cuda
+// XFAIL: cuda || hip
 
 //==--- kernel-and-program.cpp - SYCL kernel/program test ------------------==//
 //

SYCL/DeprecatedFeatures/parallel_for_range.cpp

@@ -1,6 +1,9 @@
 // XFAIL: level_zero&&gpu
 // UNSUPPORTED: windows
 // Level0 testing times out on Windows.
+//
+// Failing on HIP AMD
+// UNSUPPORTED: hip_amd
 
 // RUN: %clangxx -D__SYCL_INTERNAL_API -fsycl -fno-sycl-id-queries-fit-in-int -fsycl-targets=%sycl_triple  %s -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out

SYCL/DeprecatedFeatures/program_link.cpp

@@ -6,6 +6,9 @@
 // RUN: %CPU_RUN_PLACEHOLDER SYCL_PI_TRACE=-1 SYCL_PROGRAM_COMPILE_OPTIONS="-cl-opt-disable" %t.out %CPU_CHECK_PLACEHOLDER --check-prefix=CHECK-IS-OPT-DISABLE
 // RUN: %GPU_RUN_PLACEHOLDER SYCL_PI_TRACE=-1 SYCL_PROGRAM_COMPILE_OPTIONS="-cl-opt-disable" %t.out %GPU_CHECK_PLACEHOLDER --check-prefix=CHECK-IS-OPT-DISABLE
 // RUN: %ACC_RUN_PLACEHOLDER SYCL_PI_TRACE=-1 SYCL_PROGRAM_COMPILE_OPTIONS="-cl-opt-disable" %t.out %ACCPU_CHECK_PLACEHOLDER --check-prefix=CHECK-IS-OPT-DISABLE
+//
+// Hits an assertion on AMD with multiple GPUs available
+// XFAIL: hip_amd
 
 #include <CL/sycl.hpp>
 #include <iostream>

SYCL/DeviceCodeSplit/aot-accelerator.cpp

@@ -1,4 +1,4 @@
 // REQUIRES: aoc, accelerator
 
-// RUN: %clangxx -fsycl -fsycl-device-code-split=per_source -fsycl-targets=spir64_fpga-unknown-unknown-sycldevice -I %S/Inputs -o %t.out %S/split-per-source-main.cpp %S/Inputs/split-per-source-second-file.cpp
+// RUN: %clangxx -fsycl -fsycl-device-code-split=per_source -fsycl-targets=spir64_fpga -I %S/Inputs -o %t.out %S/split-per-source-main.cpp %S/Inputs/split-per-source-second-file.cpp
 // RUN: %ACC_RUN_PLACEHOLDER %t.out

SYCL/DeviceCodeSplit/aot-cpu.cpp

@@ -1,4 +1,4 @@
 // REQUIRES: opencl-aot, cpu
 
-// RUN: %clangxx -fsycl -fsycl-device-code-split=per_source -fsycl-targets=spir64_x86_64-unknown-unknown-sycldevice -I %S/Inputs -o %t.out %S/split-per-source-main.cpp %S/Inputs/split-per-source-second-file.cpp
+// RUN: %clangxx -fsycl -fsycl-device-code-split=per_source -fsycl-targets=spir64_x86_64 -I %S/Inputs -o %t.out %S/split-per-source-main.cpp %S/Inputs/split-per-source-second-file.cpp
 // RUN: %CPU_RUN_PLACEHOLDER %t.out

SYCL/DeviceCodeSplit/aot-gpu.cpp

@@ -3,8 +3,8 @@
 // CUDA does neither support device code splitting nor SPIR.
 //
 // RUN: %clangxx -fsycl -fsycl-device-code-split=per_source \
-// RUN:   -fsycl-targets=spir64_gen-unknown-unknown-sycldevice \
-// RUN:   -Xsycl-target-backend=spir64_gen-unknown-unknown-sycldevice \
+// RUN:   -fsycl-targets=spir64_gen \
+// RUN:   -Xsycl-target-backend=spir64_gen \
 // RUN:   "-device *" -I %S/Inputs -o %t.out \
 // RUN:   %S/split-per-source-main.cpp \
 // RUN:   %S/Inputs/split-per-source-second-file.cpp

SYCL/DeviceLib/assert-aot.cpp

@@ -1,5 +1,5 @@
 // REQUIRES: opencl-aot, cpu, linux
 
-// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64-unknown-unknown-sycldevice %S/assert.cpp -o %t.aot.out
+// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/assert.cpp -o %t.aot.out
 // RUN: %CPU_RUN_PLACEHOLDER EXPECTED_SIGNAL=SIGABRT SHOULD_CRASH=1 %t.aot.out 2>%t.aot.msg
 // RUN: FileCheck %S/assert.cpp --input-file %t.aot.msg --check-prefixes=CHECK-MESSAGE