diff --git a/SYCL/AtomicRef/atomic_memory_order.cpp b/SYCL/AtomicRef/atomic_memory_order.cpp index bb6ec01358..517ce985dc 100644 --- a/SYCL/AtomicRef/atomic_memory_order.cpp +++ b/SYCL/AtomicRef/atomic_memory_order.cpp @@ -3,9 +3,9 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out -// L0, OpenCL, and ROCm backends don't currently support +// L0, OpenCL, and HIP backends don't currently support // info::device::atomic_memory_order_capabilities -// UNSUPPORTED: level_zero || opencl || rocm +// UNSUPPORTED: level_zero || opencl || hip // NOTE: General tests for atomic memory order capabilities. diff --git a/SYCL/AtomicRef/atomic_memory_order_acq_rel.cpp b/SYCL/AtomicRef/atomic_memory_order_acq_rel.cpp index d55f030287..cf29eb608c 100644 --- a/SYCL/AtomicRef/atomic_memory_order_acq_rel.cpp +++ b/SYCL/AtomicRef/atomic_memory_order_acq_rel.cpp @@ -3,9 +3,9 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out -// L0, OpenCL, and ROCm backends don't currently support +// L0, OpenCL, and HIP backends don't currently support // info::device::atomic_memory_order_capabilities -// UNSUPPORTED: level_zero || opencl || rocm +// UNSUPPORTED: level_zero || opencl || hip // NOTE: Tests load and store for acquire-release memory ordering. diff --git a/SYCL/AtomicRef/atomic_memory_order_acq_rel_atomic64.cpp b/SYCL/AtomicRef/atomic_memory_order_acq_rel_atomic64.cpp index 16e22de2d0..0634bf8409 100644 --- a/SYCL/AtomicRef/atomic_memory_order_acq_rel_atomic64.cpp +++ b/SYCL/AtomicRef/atomic_memory_order_acq_rel_atomic64.cpp @@ -3,9 +3,9 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out -// L0, OpenCL, and ROCm backends don't currently support +// L0, OpenCL, and HIP backends don't currently support // info::device::atomic_memory_order_capabilities -// UNSUPPORTED: level_zero || opencl || rocm +// UNSUPPORTED: level_zero || opencl || hip // NOTE: Tests load and store for acquire-release memory ordering with 64-bit // values. diff --git a/SYCL/AtomicRef/atomic_memory_order_seq_cst.cpp b/SYCL/AtomicRef/atomic_memory_order_seq_cst.cpp index 2f2b28b232..b26afb2461 100644 --- a/SYCL/AtomicRef/atomic_memory_order_seq_cst.cpp +++ b/SYCL/AtomicRef/atomic_memory_order_seq_cst.cpp @@ -3,9 +3,9 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out -// L0, OpenCL, and ROCm backends don't currently support +// L0, OpenCL, and HIP backends don't currently support // info::device::atomic_memory_order_capabilities -// UNSUPPORTED: level_zero || opencl || rocm +// UNSUPPORTED: level_zero || opencl || hip // NOTE: Tests load and store for sequentially consistent memory ordering. diff --git a/SYCL/AtomicRef/atomic_memory_order_seq_cst_atomic64.cpp b/SYCL/AtomicRef/atomic_memory_order_seq_cst_atomic64.cpp index 68cdb44baa..0548977fcf 100644 --- a/SYCL/AtomicRef/atomic_memory_order_seq_cst_atomic64.cpp +++ b/SYCL/AtomicRef/atomic_memory_order_seq_cst_atomic64.cpp @@ -3,9 +3,9 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out -// L0, OpenCL, and ROCm backends don't currently support +// L0, OpenCL, and HIP backends don't currently support // info::device::atomic_memory_order_capabilities -// UNSUPPORTED: level_zero || opencl || rocm +// UNSUPPORTED: level_zero || opencl || hip // NOTE: Tests load and store for sequentially consistent memory ordering with // 64-bit values. diff --git a/SYCL/Basic/aspects.cpp b/SYCL/Basic/aspects.cpp index bc5b04f4ff..2792a77814 100644 --- a/SYCL/Basic/aspects.cpp +++ b/SYCL/Basic/aspects.cpp @@ -1,9 +1,8 @@ // RUN: %clangxx -fsycl %s -o %t.out // RUN: env SYCL_DEVICE_FILTER=%sycl_be %t.out // -// Hip is missing some of the parameters tested here so it fails with ROCm for -// NVIDIA -// XFAIL: rocm_nvidia +// Hip is missing some of the parameters tested here so it fails with NVIDIA +// XFAIL: hip_nvidia //==--------------- aspects.cpp - SYCL device test ------------------------==// // diff --git a/SYCL/Basic/image/image.cpp b/SYCL/Basic/image/image.cpp index 924b1626aa..e083b53949 100644 --- a/SYCL/Basic/image/image.cpp +++ b/SYCL/Basic/image/image.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: rocm +// UNSUPPORTED: hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Basic/image/image_accessor_readsampler.cpp b/SYCL/Basic/image/image_accessor_readsampler.cpp index 6d53e65592..379c1552dc 100644 --- a/SYCL/Basic/image/image_accessor_readsampler.cpp +++ b/SYCL/Basic/image/image_accessor_readsampler.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // CUDA cannot support SYCL 1.2.1 images. // // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out diff --git a/SYCL/Basic/image/image_accessor_readwrite.cpp b/SYCL/Basic/image/image_accessor_readwrite.cpp index 928488d277..e656275f7a 100644 --- a/SYCL/Basic/image/image_accessor_readwrite.cpp +++ b/SYCL/Basic/image/image_accessor_readwrite.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // CUDA cannot support SYCL 1.2.1 images. // // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out diff --git a/SYCL/Basic/image/image_accessor_readwrite_half.cpp b/SYCL/Basic/image/image_accessor_readwrite_half.cpp index f5c16dfa9e..53a3a0ce0a 100644 --- a/SYCL/Basic/image/image_accessor_readwrite_half.cpp +++ b/SYCL/Basic/image/image_accessor_readwrite_half.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // CUDA cannot support SYCL 1.2.1 images. // // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out diff --git a/SYCL/Basic/image/image_array.cpp b/SYCL/Basic/image/image_array.cpp index 712fd05f9a..51dcc2f207 100644 --- a/SYCL/Basic/image/image_array.cpp +++ b/SYCL/Basic/image/image_array.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // CUDA cannot support SYCL 1.2.1 images. // // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out diff --git a/SYCL/Basic/image/image_read.cpp b/SYCL/Basic/image/image_read.cpp index 6932c24286..f76b891297 100644 --- a/SYCL/Basic/image/image_read.cpp +++ b/SYCL/Basic/image/image_read.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: rocm +// UNSUPPORTED: hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Basic/image/image_read_fp16.cpp b/SYCL/Basic/image/image_read_fp16.cpp index 950f09b363..2d415d2c6d 100644 --- a/SYCL/Basic/image/image_read_fp16.cpp +++ b/SYCL/Basic/image/image_read_fp16.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: rocm +// UNSUPPORTED: hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Basic/image/image_sample.cpp b/SYCL/Basic/image/image_sample.cpp index 35dd3fee71..e4bc20b184 100644 --- a/SYCL/Basic/image/image_sample.cpp +++ b/SYCL/Basic/image/image_sample.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip #include diff --git a/SYCL/Basic/image/image_write.cpp b/SYCL/Basic/image/image_write.cpp index a6cd9784e2..3f4aa66d7f 100644 --- a/SYCL/Basic/image/image_write.cpp +++ b/SYCL/Basic/image/image_write.cpp @@ -3,7 +3,7 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // TODO: re-enable on cuda device. // See https://github.com/intel/llvm/issues/1542#issuecomment-707877817 for more // details. diff --git a/SYCL/Basic/image/image_write_fp16.cpp b/SYCL/Basic/image/image_write_fp16.cpp index 712e16bd07..ffbd777012 100644 --- a/SYCL/Basic/image/image_write_fp16.cpp +++ b/SYCL/Basic/image/image_write_fp16.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: rocm +// UNSUPPORTED: hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Basic/image/srgba-read.cpp b/SYCL/Basic/image/srgba-read.cpp index f53c636020..c1b6dbd959 100644 --- a/SYCL/Basic/image/srgba-read.cpp +++ b/SYCL/Basic/image/srgba-read.cpp @@ -4,8 +4,7 @@ // XFAIL: level_zero // UNSUPPORTED: cuda -// UNSUPPORTED: rocm_nvidia -// UNSUPPORTED: rocm_amd +// UNSUPPORTED: hip #include diff --git a/SYCL/Basic/intel-ext-device.cpp b/SYCL/Basic/intel-ext-device.cpp index e64cb21eee..ea9e45c159 100644 --- a/SYCL/Basic/intel-ext-device.cpp +++ b/SYCL/Basic/intel-ext-device.cpp @@ -4,8 +4,7 @@ // // REQUIRES: gpu // UNSUPPORTED: cuda -// UNSUPPORTED: rocm_nvidia -// UNSUPPORTED: rocm_amd +// UNSUPPORTED: hip //==--------- intel-ext-device.cpp - SYCL device test ------------==// // diff --git a/SYCL/Basic/kernel_bundle/kernel_bundle_api.cpp b/SYCL/Basic/kernel_bundle/kernel_bundle_api.cpp index e69700338b..84a6466cba 100644 --- a/SYCL/Basic/kernel_bundle/kernel_bundle_api.cpp +++ b/SYCL/Basic/kernel_bundle/kernel_bundle_api.cpp @@ -6,7 +6,7 @@ // RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER // // -fsycl-device-code-split is not supported for cuda -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip #include diff --git a/SYCL/Basic/span.cpp b/SYCL/Basic/span.cpp index f7c4091244..db45ce35c2 100644 --- a/SYCL/Basic/span.cpp +++ b/SYCL/Basic/span.cpp @@ -3,8 +3,8 @@ // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out // -// Fails to release USM pointer on ROCm for NVIDIA -// XFAIL: rocm_nvidia +// Fails to release USM pointer on HIP for NVIDIA +// XFAIL: hip_nvidia #include #include diff --git a/SYCL/DeprecatedFeatures/FunctionPointers/fp-as-kernel-arg.cpp b/SYCL/DeprecatedFeatures/FunctionPointers/fp-as-kernel-arg.cpp index bf00a343a5..5c47a3007c 100644 --- a/SYCL/DeprecatedFeatures/FunctionPointers/fp-as-kernel-arg.cpp +++ b/SYCL/DeprecatedFeatures/FunctionPointers/fp-as-kernel-arg.cpp @@ -1,5 +1,5 @@ // REQUIRES: TEMPORARILY_DISABLED -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // CUDA does not support the function pointer as kernel argument extension. // RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl -D__SYCL_INTERNAL_API %s -o %t.out diff --git a/SYCL/DeprecatedFeatures/FunctionPointers/pass-fp-through-buffer.cpp b/SYCL/DeprecatedFeatures/FunctionPointers/pass-fp-through-buffer.cpp index 922c802257..d97a67a7b2 100644 --- a/SYCL/DeprecatedFeatures/FunctionPointers/pass-fp-through-buffer.cpp +++ b/SYCL/DeprecatedFeatures/FunctionPointers/pass-fp-through-buffer.cpp @@ -1,5 +1,5 @@ // REQUIRES: TEMPORARILY_DISABLED -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // CUDA does not support the function pointer as kernel argument extension. // RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl -D__SYCL_INTERNAL_API %s -o %t.out diff --git a/SYCL/DeviceCodeSplit/aot-gpu.cpp b/SYCL/DeviceCodeSplit/aot-gpu.cpp index dc5968697a..fc95116e89 100644 --- a/SYCL/DeviceCodeSplit/aot-gpu.cpp +++ b/SYCL/DeviceCodeSplit/aot-gpu.cpp @@ -1,5 +1,5 @@ // REQUIRES: ocloc, gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // CUDA does neither support device code splitting nor SPIR. // // RUN: %clangxx -fsycl -fsycl-device-code-split=per_source \ diff --git a/SYCL/DeviceCodeSplit/split-per-kernel.cpp b/SYCL/DeviceCodeSplit/split-per-kernel.cpp index 720cdee46f..6eeacfc9db 100644 --- a/SYCL/DeviceCodeSplit/split-per-kernel.cpp +++ b/SYCL/DeviceCodeSplit/split-per-kernel.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // CUDA does not support device code splitting. // // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-device-code-split=per_kernel -o %t.out %s diff --git a/SYCL/DeviceCodeSplit/split-per-source-main.cpp b/SYCL/DeviceCodeSplit/split-per-source-main.cpp index ec2e1baa1d..571e03ff60 100644 --- a/SYCL/DeviceCodeSplit/split-per-source-main.cpp +++ b/SYCL/DeviceCodeSplit/split-per-source-main.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // CUDA does not support device code splitting. // // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-device-code-split=per_source -I %S/Inputs -o %t.out %s %S/Inputs/split-per-source-second-file.cpp diff --git a/SYCL/ESIMD/BitonicSortK.cpp b/SYCL/ESIMD/BitonicSortK.cpp index f6331d36ee..c47a41200a 100644 --- a/SYCL/ESIMD/BitonicSortK.cpp +++ b/SYCL/ESIMD/BitonicSortK.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/BitonicSortKv2.cpp b/SYCL/ESIMD/BitonicSortKv2.cpp index d96d2214f6..9aaee21ea6 100644 --- a/SYCL/ESIMD/BitonicSortKv2.cpp +++ b/SYCL/ESIMD/BitonicSortKv2.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/PrefixSum.cpp b/SYCL/ESIMD/PrefixSum.cpp index 72a38cb75e..14a8610a9e 100644 --- a/SYCL/ESIMD/PrefixSum.cpp +++ b/SYCL/ESIMD/PrefixSum.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out 20 // RUN: %GPU_RUN_PLACEHOLDER %t.out 20 diff --git a/SYCL/ESIMD/Prefix_Local_sum1.cpp b/SYCL/ESIMD/Prefix_Local_sum1.cpp index 037c5d4d2f..62aa730869 100644 --- a/SYCL/ESIMD/Prefix_Local_sum1.cpp +++ b/SYCL/ESIMD/Prefix_Local_sum1.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out 20 // RUN: %GPU_RUN_PLACEHOLDER %t.out 20 diff --git a/SYCL/ESIMD/Prefix_Local_sum2.cpp b/SYCL/ESIMD/Prefix_Local_sum2.cpp index 01404da74c..259a6b6d26 100644 --- a/SYCL/ESIMD/Prefix_Local_sum2.cpp +++ b/SYCL/ESIMD/Prefix_Local_sum2.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out 20 // RUN: %GPU_RUN_PLACEHOLDER %t.out 20 diff --git a/SYCL/ESIMD/Prefix_Local_sum3.cpp b/SYCL/ESIMD/Prefix_Local_sum3.cpp index 438ac6e1b0..dd18f1a9f8 100644 --- a/SYCL/ESIMD/Prefix_Local_sum3.cpp +++ b/SYCL/ESIMD/Prefix_Local_sum3.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/Stencil.cpp b/SYCL/ESIMD/Stencil.cpp index e28e596f28..fa4d391dfe 100644 --- a/SYCL/ESIMD/Stencil.cpp +++ b/SYCL/ESIMD/Stencil.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/accessor.cpp b/SYCL/ESIMD/accessor.cpp index 33a5d94d1c..0ee005b834 100644 --- a/SYCL/ESIMD/accessor.cpp +++ b/SYCL/ESIMD/accessor.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -D_CRT_SECURE_NO_WARNINGS=1 %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/accessor_gather_scatter.cpp b/SYCL/ESIMD/accessor_gather_scatter.cpp index 89907d6b29..bf2025d276 100644 --- a/SYCL/ESIMD/accessor_gather_scatter.cpp +++ b/SYCL/ESIMD/accessor_gather_scatter.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // diff --git a/SYCL/ESIMD/accessor_load_store.cpp b/SYCL/ESIMD/accessor_load_store.cpp index 7ef3f209bd..7873ef4dd5 100644 --- a/SYCL/ESIMD/accessor_load_store.cpp +++ b/SYCL/ESIMD/accessor_load_store.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // diff --git a/SYCL/ESIMD/api/esimd_bit_ops.cpp b/SYCL/ESIMD/api/esimd_bit_ops.cpp index 61a6676960..04883f4ad5 100644 --- a/SYCL/ESIMD/api/esimd_bit_ops.cpp +++ b/SYCL/ESIMD/api/esimd_bit_ops.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -fsycl-device-code-split=per_kernel -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // diff --git a/SYCL/ESIMD/api/simd_binop_integer_promotion.cpp b/SYCL/ESIMD/api/simd_binop_integer_promotion.cpp index e9c7cc9050..ca6b2eebf7 100644 --- a/SYCL/ESIMD/api/simd_binop_integer_promotion.cpp +++ b/SYCL/ESIMD/api/simd_binop_integer_promotion.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // diff --git a/SYCL/ESIMD/api/simd_memory_access.cpp b/SYCL/ESIMD/api/simd_memory_access.cpp index 7b185dca27..16493fcc47 100644 --- a/SYCL/ESIMD/api/simd_memory_access.cpp +++ b/SYCL/ESIMD/api/simd_memory_access.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // diff --git a/SYCL/ESIMD/api/simd_subscript_operator.cpp b/SYCL/ESIMD/api/simd_subscript_operator.cpp index 9157b10014..f60caaaad7 100644 --- a/SYCL/ESIMD/api/simd_subscript_operator.cpp +++ b/SYCL/ESIMD/api/simd_subscript_operator.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // diff --git a/SYCL/ESIMD/ext_math.cpp b/SYCL/ESIMD/ext_math.cpp index 2985af16d6..b90a4901ad 100644 --- a/SYCL/ESIMD/ext_math.cpp +++ b/SYCL/ESIMD/ext_math.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_192.cpp b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_192.cpp index 87e4fed379..2faf3878ce 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_192.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_192.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_256.cpp b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_256.cpp index 7659cf9ac8..72236af213 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_256.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_256.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_512.cpp b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_512.cpp index 12470b701c..3271c15e10 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_512.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_512.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_64.cpp b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_64.cpp index e4a8cca487..7c06119235 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_64.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_64.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_96.cpp b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_96.cpp index 675edeeb4c..0a59567c4a 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_96.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_96.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/fp_args_size/fp_args_int_size_192.cpp b/SYCL/ESIMD/fp_args_size/fp_args_int_size_192.cpp index bd7e128267..14ea5b79f6 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_int_size_192.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_int_size_192.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/fp_args_size/fp_args_int_size_256.cpp b/SYCL/ESIMD/fp_args_size/fp_args_int_size_256.cpp index 279c10a5aa..22ce3d1b22 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_int_size_256.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_int_size_256.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/fp_args_size/fp_args_int_size_512.cpp b/SYCL/ESIMD/fp_args_size/fp_args_int_size_512.cpp index 1651c0c217..c0c535b71c 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_int_size_512.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_int_size_512.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/fp_args_size/fp_args_int_size_64.cpp b/SYCL/ESIMD/fp_args_size/fp_args_int_size_64.cpp index 28af1a4700..028e4695d6 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_int_size_64.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_int_size_64.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/fp_args_size/fp_args_int_size_96.cpp b/SYCL/ESIMD/fp_args_size/fp_args_int_size_96.cpp index e4d5a5e15f..2344dfab70 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_int_size_96.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_int_size_96.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/fp_call_from_func.cpp b/SYCL/ESIMD/fp_call_from_func.cpp index 292d03f370..dec41df4a6 100644 --- a/SYCL/ESIMD/fp_call_from_func.cpp +++ b/SYCL/ESIMD/fp_call_from_func.cpp @@ -10,7 +10,7 @@ // UNSUPPORTED: TEMPORARY_DISABLED // RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // // The test hangs after driver update to 21.23.20043 // REQUIRES: TEMPORARY_DISABLE diff --git a/SYCL/ESIMD/fp_call_recursive.cpp b/SYCL/ESIMD/fp_call_recursive.cpp index 5dd43e1230..b26424784a 100644 --- a/SYCL/ESIMD/fp_call_recursive.cpp +++ b/SYCL/ESIMD/fp_call_recursive.cpp @@ -8,7 +8,7 @@ // REQUIRES: gpu // Recursion is not supported in ESIMD (intel/llvm PR#3390) // REQUIRES: TEMPORARY_DISBLED -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // diff --git a/SYCL/ESIMD/fp_in_phi.cpp b/SYCL/ESIMD/fp_in_phi.cpp index ae63a56f25..8e73d272ab 100644 --- a/SYCL/ESIMD/fp_in_phi.cpp +++ b/SYCL/ESIMD/fp_in_phi.cpp @@ -12,7 +12,7 @@ // UNSUPPORTED: windows // RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // // The test checks that ESIMD kernels correctly handle function pointers as // arguments of LLVM's PHI function. diff --git a/SYCL/ESIMD/fp_in_select.cpp b/SYCL/ESIMD/fp_in_select.cpp index 08c70655ba..82f85f564f 100644 --- a/SYCL/ESIMD/fp_in_select.cpp +++ b/SYCL/ESIMD/fp_in_select.cpp @@ -12,7 +12,7 @@ // UNSUPPORTED: windows // RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // The test fails on JITing due to use of too many registers // REQUIRES: TEMPORARY_DISBLED // diff --git a/SYCL/ESIMD/histogram.cpp b/SYCL/ESIMD/histogram.cpp index 97fb4b97d5..7070b10303 100644 --- a/SYCL/ESIMD/histogram.cpp +++ b/SYCL/ESIMD/histogram.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/histogram_256_slm.cpp b/SYCL/ESIMD/histogram_256_slm.cpp index 55d8910ed1..1013967a54 100644 --- a/SYCL/ESIMD/histogram_256_slm.cpp +++ b/SYCL/ESIMD/histogram_256_slm.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/histogram_256_slm_spec.cpp b/SYCL/ESIMD/histogram_256_slm_spec.cpp index 8713b7c1ba..ac70a597ab 100644 --- a/SYCL/ESIMD/histogram_256_slm_spec.cpp +++ b/SYCL/ESIMD/histogram_256_slm_spec.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // TODO enable on Windows // REQUIRES: linux && gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out 16 diff --git a/SYCL/ESIMD/histogram_256_slm_spec_2020.cpp b/SYCL/ESIMD/histogram_256_slm_spec_2020.cpp index 689265abc7..8a794ffd67 100644 --- a/SYCL/ESIMD/histogram_256_slm_spec_2020.cpp +++ b/SYCL/ESIMD/histogram_256_slm_spec_2020.cpp @@ -1,6 +1,6 @@ // TODO enable on Windows // REQUIRES: linux && gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out 16 diff --git a/SYCL/ESIMD/histogram_2d.cpp b/SYCL/ESIMD/histogram_2d.cpp index ce7c32badd..dbce52d45c 100644 --- a/SYCL/ESIMD/histogram_2d.cpp +++ b/SYCL/ESIMD/histogram_2d.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/histogram_raw_send.cpp b/SYCL/ESIMD/histogram_raw_send.cpp index 3fcae5afa2..b0262fa1fe 100644 --- a/SYCL/ESIMD/histogram_raw_send.cpp +++ b/SYCL/ESIMD/histogram_raw_send.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/kmeans/kmeans.cpp b/SYCL/ESIMD/kmeans/kmeans.cpp index e2fa4e4823..ec4f217a99 100644 --- a/SYCL/ESIMD/kmeans/kmeans.cpp +++ b/SYCL/ESIMD/kmeans/kmeans.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -I%S/.. -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out %S/points.csv // RUN: %GPU_RUN_PLACEHOLDER %t.out %S/points.csv diff --git a/SYCL/ESIMD/linear/linear.cpp b/SYCL/ESIMD/linear/linear.cpp index 938d5043b8..e22aa9dafe 100644 --- a/SYCL/ESIMD/linear/linear.cpp +++ b/SYCL/ESIMD/linear/linear.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -I%S/.. -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out %S/linear_in.bmp %S/linear_gold_hw.bmp // RUN: %GPU_RUN_PLACEHOLDER %t.out %S/linear_in.bmp %S/linear_gold_hw.bmp diff --git a/SYCL/ESIMD/mandelbrot/mandelbrot.cpp b/SYCL/ESIMD/mandelbrot/mandelbrot.cpp index c2bff56b15..ff4f5fd425 100644 --- a/SYCL/ESIMD/mandelbrot/mandelbrot.cpp +++ b/SYCL/ESIMD/mandelbrot/mandelbrot.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -I%S/.. -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out %T/output.ppm %S/golden_hw.ppm diff --git a/SYCL/ESIMD/mandelbrot/mandelbrot_spec.cpp b/SYCL/ESIMD/mandelbrot/mandelbrot_spec.cpp index 57aae67383..a71f02e9b6 100644 --- a/SYCL/ESIMD/mandelbrot/mandelbrot_spec.cpp +++ b/SYCL/ESIMD/mandelbrot/mandelbrot_spec.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // TODO enable on Windows // REQUIRES: linux && gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -I%S/.. -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out %T/output_spec.ppm %S/golden_hw.ppm 512 -2.09798 -1.19798 0.004 4.0 diff --git a/SYCL/ESIMD/matrix_transpose.cpp b/SYCL/ESIMD/matrix_transpose.cpp index 02d63ba4b4..b7024874d0 100644 --- a/SYCL/ESIMD/matrix_transpose.cpp +++ b/SYCL/ESIMD/matrix_transpose.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/matrix_transpose2.cpp b/SYCL/ESIMD/matrix_transpose2.cpp index 32ff8f0ff5..a118c980d5 100644 --- a/SYCL/ESIMD/matrix_transpose2.cpp +++ b/SYCL/ESIMD/matrix_transpose2.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/matrix_transpose_glb.cpp b/SYCL/ESIMD/matrix_transpose_glb.cpp index e56438446e..2c21c16a45 100644 --- a/SYCL/ESIMD/matrix_transpose_glb.cpp +++ b/SYCL/ESIMD/matrix_transpose_glb.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/matrix_transpose_usm.cpp b/SYCL/ESIMD/matrix_transpose_usm.cpp index d192945d5d..70f637ae7d 100644 --- a/SYCL/ESIMD/matrix_transpose_usm.cpp +++ b/SYCL/ESIMD/matrix_transpose_usm.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_192.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_192.cpp index d29bd61b51..3f573adc7a 100644 --- a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_192.cpp +++ b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_192.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_256.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_256.cpp index 354cab56f9..d16246544d 100644 --- a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_256.cpp +++ b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_256.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_512.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_512.cpp index c4f30b036c..914c8cfe1a 100644 --- a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_512.cpp +++ b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_512.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_64.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_64.cpp index 2de84ab59f..23c813c2d8 100644 --- a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_64.cpp +++ b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_64.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_96.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_96.cpp index db27423033..2825fcc5c8 100644 --- a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_96.cpp +++ b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_96.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_192.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_192.cpp index 593f8be956..c3c381312f 100644 --- a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_192.cpp +++ b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_192.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_256.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_256.cpp index 879fe48bc7..085c1d9495 100644 --- a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_256.cpp +++ b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_256.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_512.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_512.cpp index 2052f9d0da..e08be9e7d9 100644 --- a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_512.cpp +++ b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_512.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_64.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_64.cpp index 3f36c7c17c..0db59cc4ab 100644 --- a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_64.cpp +++ b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_64.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_96.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_96.cpp index 93e494a80b..9b661848d6 100644 --- a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_96.cpp +++ b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_96.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/noinline_call_from_func.cpp b/SYCL/ESIMD/noinline_call_from_func.cpp index 4633bb84a4..03c109f5b7 100644 --- a/SYCL/ESIMD/noinline_call_from_func.cpp +++ b/SYCL/ESIMD/noinline_call_from_func.cpp @@ -12,7 +12,7 @@ // REQUIRES: TEMPORARY_DISABLED // RUN: %clangxx -fsycl %s -o %t.out // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // // The test checks that ESIMD kernels support call of noinline function from // within other functions. diff --git a/SYCL/ESIMD/noinline_call_recursive.cpp b/SYCL/ESIMD/noinline_call_recursive.cpp index c6083d01f6..b3a5e41287 100644 --- a/SYCL/ESIMD/noinline_call_recursive.cpp +++ b/SYCL/ESIMD/noinline_call_recursive.cpp @@ -8,7 +8,7 @@ // REQUIRES: gpu // Recursion is not supported in ESIMD (intel/llvm PR#3390) // REQUIRES: TEMPORARY_DISBLED -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out // diff --git a/SYCL/ESIMD/private_memory/pm_access_1.cpp b/SYCL/ESIMD/private_memory/pm_access_1.cpp index dbad4ed2e6..3e1425bfd5 100644 --- a/SYCL/ESIMD/private_memory/pm_access_1.cpp +++ b/SYCL/ESIMD/private_memory/pm_access_1.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // Temporarily disabled due to flaky behavior // REQUIRES: TEMPORARY_DISABLED // RUN: %clangxx -fsycl -Xs "-stateless-stack-mem-size=131072" -I%S/.. %S/Inputs/pm_common.cpp -o %t.out diff --git a/SYCL/ESIMD/private_memory/pm_access_2.cpp b/SYCL/ESIMD/private_memory/pm_access_2.cpp index d4d9298b5c..9b3bf9bf16 100644 --- a/SYCL/ESIMD/private_memory/pm_access_2.cpp +++ b/SYCL/ESIMD/private_memory/pm_access_2.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // Temporarily disabled due to flaky behavior // REQUIRES: TEMPORARY_DISABLED // RUN: %clangxx -fsycl -Xs "-stateless-stack-mem-size=131072" -I%S/.. %S/Inputs/pm_common.cpp -o %t.out diff --git a/SYCL/ESIMD/private_memory/pm_access_3.cpp b/SYCL/ESIMD/private_memory/pm_access_3.cpp index 71da297ba1..621f77df9d 100644 --- a/SYCL/ESIMD/private_memory/pm_access_3.cpp +++ b/SYCL/ESIMD/private_memory/pm_access_3.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // Temporarily disabled due to flaky behavior // REQUIRES: TEMPORARY_DISABLED // RUN: %clangxx -fsycl -Xs "-stateless-stack-mem-size=131072" -I%S/.. %S/Inputs/pm_common.cpp -o %t.out diff --git a/SYCL/ESIMD/reduction.cpp b/SYCL/ESIMD/reduction.cpp index 9e7fe9869e..cf0a86606e 100644 --- a/SYCL/ESIMD/reduction.cpp +++ b/SYCL/ESIMD/reduction.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/regression/big_const_initializer.cpp b/SYCL/ESIMD/regression/big_const_initializer.cpp index 9cbafaf5d7..9941f6b8d5 100644 --- a/SYCL/ESIMD/regression/big_const_initializer.cpp +++ b/SYCL/ESIMD/regression/big_const_initializer.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/regression/dgetrf.cpp b/SYCL/ESIMD/regression/dgetrf.cpp index d8ac134e4d..bbf0b5f8bf 100644 --- a/SYCL/ESIMD/regression/dgetrf.cpp +++ b/SYCL/ESIMD/regression/dgetrf.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -DUSE_REF %s -I%S/.. -o %t.ref.out // RUN: %clangxx -fsycl %s -I%S/.. -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.ref.out 3 2 1 diff --git a/SYCL/ESIMD/regression/noinline_bypointers_vadd.cpp b/SYCL/ESIMD/regression/noinline_bypointers_vadd.cpp index c6bf4bb2e0..8b233adb47 100644 --- a/SYCL/ESIMD/regression/noinline_bypointers_vadd.cpp +++ b/SYCL/ESIMD/regression/noinline_bypointers_vadd.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // XFAIL: * diff --git a/SYCL/ESIMD/regression/operator_decrement.cpp b/SYCL/ESIMD/regression/operator_decrement.cpp index 9745fc7fe9..d7029ca89e 100644 --- a/SYCL/ESIMD/regression/operator_decrement.cpp +++ b/SYCL/ESIMD/regression/operator_decrement.cpp @@ -8,7 +8,7 @@ // This is a test for a bug found simd_view::operator-- // // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/regression/store_zero_const.cpp b/SYCL/ESIMD/regression/store_zero_const.cpp index 698b31b333..ee5de62f27 100644 --- a/SYCL/ESIMD/regression/store_zero_const.cpp +++ b/SYCL/ESIMD/regression/store_zero_const.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -fsycl-device-code-split=per_kernel -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/regression/unused_load.cpp b/SYCL/ESIMD/regression/unused_load.cpp index 7b6e1d6ed7..3d9ae61e46 100644 --- a/SYCL/ESIMD/regression/unused_load.cpp +++ b/SYCL/ESIMD/regression/unused_load.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/slm_barrier.cpp b/SYCL/ESIMD/slm_barrier.cpp index 92b3b7af23..b29af975cb 100644 --- a/SYCL/ESIMD/slm_barrier.cpp +++ b/SYCL/ESIMD/slm_barrier.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/slm_split_barrier.cpp b/SYCL/ESIMD/slm_split_barrier.cpp index 5970a56423..a4ecbf09aa 100644 --- a/SYCL/ESIMD/slm_split_barrier.cpp +++ b/SYCL/ESIMD/slm_split_barrier.cpp @@ -8,7 +8,7 @@ // REQUIRES: gpu // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip #include "esimd_test_utils.hpp" diff --git a/SYCL/ESIMD/spec_const/spec_const_bool.cpp b/SYCL/ESIMD/spec_const/spec_const_bool.cpp index 1b9e14eb5b..0f386b3916 100644 --- a/SYCL/ESIMD/spec_const/spec_const_bool.cpp +++ b/SYCL/ESIMD/spec_const/spec_const_bool.cpp @@ -14,7 +14,7 @@ // UNSUPPORTED: windows // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip #include diff --git a/SYCL/ESIMD/spec_const/spec_const_char.cpp b/SYCL/ESIMD/spec_const/spec_const_char.cpp index cc357a5e1b..509f0675bc 100644 --- a/SYCL/ESIMD/spec_const/spec_const_char.cpp +++ b/SYCL/ESIMD/spec_const/spec_const_char.cpp @@ -16,7 +16,7 @@ // type size. // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip #include diff --git a/SYCL/ESIMD/spec_const/spec_const_double.cpp b/SYCL/ESIMD/spec_const/spec_const_double.cpp index 0e5e058c0b..b2a89993a7 100644 --- a/SYCL/ESIMD/spec_const/spec_const_double.cpp +++ b/SYCL/ESIMD/spec_const/spec_const_double.cpp @@ -14,7 +14,7 @@ // UNSUPPORTED: windows // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip #include diff --git a/SYCL/ESIMD/spec_const/spec_const_float.cpp b/SYCL/ESIMD/spec_const/spec_const_float.cpp index 0bd21a9372..80c618c8a0 100644 --- a/SYCL/ESIMD/spec_const/spec_const_float.cpp +++ b/SYCL/ESIMD/spec_const/spec_const_float.cpp @@ -14,7 +14,7 @@ // UNSUPPORTED: windows // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip #include diff --git a/SYCL/ESIMD/spec_const/spec_const_int.cpp b/SYCL/ESIMD/spec_const/spec_const_int.cpp index e71876cda4..0b31ac5d20 100644 --- a/SYCL/ESIMD/spec_const/spec_const_int.cpp +++ b/SYCL/ESIMD/spec_const/spec_const_int.cpp @@ -14,7 +14,7 @@ // UNSUPPORTED: windows // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip #include diff --git a/SYCL/ESIMD/spec_const/spec_const_int64.cpp b/SYCL/ESIMD/spec_const/spec_const_int64.cpp index c2e2323ebc..97ab567932 100644 --- a/SYCL/ESIMD/spec_const/spec_const_int64.cpp +++ b/SYCL/ESIMD/spec_const/spec_const_int64.cpp @@ -14,7 +14,7 @@ // UNSUPPORTED: windows // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip #include diff --git a/SYCL/ESIMD/spec_const/spec_const_short.cpp b/SYCL/ESIMD/spec_const/spec_const_short.cpp index 046450c766..1f93479574 100644 --- a/SYCL/ESIMD/spec_const/spec_const_short.cpp +++ b/SYCL/ESIMD/spec_const/spec_const_short.cpp @@ -16,7 +16,7 @@ // type size. // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip #include diff --git a/SYCL/ESIMD/spec_const/spec_const_uchar.cpp b/SYCL/ESIMD/spec_const/spec_const_uchar.cpp index f33003f3cd..cc85a3b909 100644 --- a/SYCL/ESIMD/spec_const/spec_const_uchar.cpp +++ b/SYCL/ESIMD/spec_const/spec_const_uchar.cpp @@ -16,7 +16,7 @@ // type size. // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip #include diff --git a/SYCL/ESIMD/spec_const/spec_const_uint.cpp b/SYCL/ESIMD/spec_const/spec_const_uint.cpp index fbd802874d..abeda3e8e2 100644 --- a/SYCL/ESIMD/spec_const/spec_const_uint.cpp +++ b/SYCL/ESIMD/spec_const/spec_const_uint.cpp @@ -14,7 +14,7 @@ // UNSUPPORTED: windows // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip #include diff --git a/SYCL/ESIMD/spec_const/spec_const_uint64.cpp b/SYCL/ESIMD/spec_const/spec_const_uint64.cpp index d1e2d7ab10..f22a2343fe 100644 --- a/SYCL/ESIMD/spec_const/spec_const_uint64.cpp +++ b/SYCL/ESIMD/spec_const/spec_const_uint64.cpp @@ -14,7 +14,7 @@ // UNSUPPORTED: windows // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip #include diff --git a/SYCL/ESIMD/spec_const/spec_const_ushort.cpp b/SYCL/ESIMD/spec_const/spec_const_ushort.cpp index d8bf35e99c..69e4074fa7 100644 --- a/SYCL/ESIMD/spec_const/spec_const_ushort.cpp +++ b/SYCL/ESIMD/spec_const/spec_const_ushort.cpp @@ -18,7 +18,7 @@ // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %clangxx -fsycl -I%S/.. -DSYCL2020 %s -o %t.2020.out // RUN: %GPU_RUN_PLACEHOLDER %t.2020.out -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip #include diff --git a/SYCL/ESIMD/spec_const_redefine_esimd.cpp b/SYCL/ESIMD/spec_const_redefine_esimd.cpp index 7ceda7a795..5848e7a70a 100755 --- a/SYCL/ESIMD/spec_const_redefine_esimd.cpp +++ b/SYCL/ESIMD/spec_const_redefine_esimd.cpp @@ -4,7 +4,7 @@ // program builds at run-time // RUN: %clangxx -DSYCL_DISABLE_FALLBACK_ASSERT -fsycl %s -o %t.out // RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip //==----------- spec_const_redefine_esimd.cpp ------------------------------==// // diff --git a/SYCL/ESIMD/stencil2.cpp b/SYCL/ESIMD/stencil2.cpp index 1f6cd4c066..9f6799b704 100644 --- a/SYCL/ESIMD/stencil2.cpp +++ b/SYCL/ESIMD/stencil2.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/sycl_esimd_mix.cpp b/SYCL/ESIMD/sycl_esimd_mix.cpp index f741972b57..b3052f374f 100644 --- a/SYCL/ESIMD/sycl_esimd_mix.cpp +++ b/SYCL/ESIMD/sycl_esimd_mix.cpp @@ -9,7 +9,7 @@ // in the same program . // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: env SYCL_PI_TRACE=-1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER --check-prefixes=CHECK,CHECK-NO-VAR // RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_PI_TRACE=-1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER --check-prefixes=CHECK,CHECK-WITH-VAR diff --git a/SYCL/ESIMD/test_id_3d.cpp b/SYCL/ESIMD/test_id_3d.cpp index 1863251376..152f4af8ac 100644 --- a/SYCL/ESIMD/test_id_3d.cpp +++ b/SYCL/ESIMD/test_id_3d.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/vadd_1d.cpp b/SYCL/ESIMD/vadd_1d.cpp index de66524362..97cef787e3 100644 --- a/SYCL/ESIMD/vadd_1d.cpp +++ b/SYCL/ESIMD/vadd_1d.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: env SYCL_PI_TRACE=-1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER diff --git a/SYCL/ESIMD/vadd_2d.cpp b/SYCL/ESIMD/vadd_2d.cpp index 28e762777e..253645c85a 100644 --- a/SYCL/ESIMD/vadd_2d.cpp +++ b/SYCL/ESIMD/vadd_2d.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/vadd_2d_acc.cpp b/SYCL/ESIMD/vadd_2d_acc.cpp index 22d42e5300..7533573e7f 100644 --- a/SYCL/ESIMD/vadd_2d_acc.cpp +++ b/SYCL/ESIMD/vadd_2d_acc.cpp @@ -9,7 +9,7 @@ // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // The test checks that 2D workitem addressing works correctly with SIMD // kernels. diff --git a/SYCL/ESIMD/vadd_raw_send.cpp b/SYCL/ESIMD/vadd_raw_send.cpp index eb81dcc68d..61807c98d6 100644 --- a/SYCL/ESIMD/vadd_raw_send.cpp +++ b/SYCL/ESIMD/vadd_raw_send.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/ESIMD/vadd_usm.cpp b/SYCL/ESIMD/vadd_usm.cpp index ce59f40096..1ecbf13d93 100644 --- a/SYCL/ESIMD/vadd_usm.cpp +++ b/SYCL/ESIMD/vadd_usm.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: gpu -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/FilterSelector/select.cpp b/SYCL/FilterSelector/select.cpp index a0485457b0..af5a98909d 100644 --- a/SYCL/FilterSelector/select.cpp +++ b/SYCL/FilterSelector/select.cpp @@ -39,7 +39,7 @@ int main() { bool HasLevelZeroDevices = false; bool HasOpenCLDevices = false; bool HasCUDADevices = false; - bool HasROCmDevices = false; + bool HasHIPDevices = false; bool HasOpenCLGPU = false; bool HasLevelZeroGPU = false; @@ -51,8 +51,8 @@ int main() { HasOpenCLDevices = true; } else if (Backend == backend::cuda) { HasCUDADevices = true; - } else if (Backend == backend::rocm) { - HasROCmDevices = true; + } else if (Backend == backend::hip) { + HasHIPDevices = true; } } @@ -67,7 +67,7 @@ int main() { std::cout << "HasLevelZeroDevices = " << HasLevelZeroDevices << std::endl; std::cout << "HasOpenCLDevices = " << HasOpenCLDevices << std::endl; std::cout << "HasCUDADevices = " << HasCUDADevices << std::endl; - std::cout << "HasROCmDevices = " << HasROCmDevices << std::endl; + std::cout << "HasHIPDevices = " << HasHIPDevices << std::endl; std::cout << "HasOpenCLGPU = " << HasOpenCLGPU << std::endl; std::cout << "HasLevelZeroGPU = " << HasLevelZeroGPU << std::endl; @@ -202,15 +202,15 @@ int main() { std::cout << "...PASS" << std::endl; } - if (HasROCmDevices) { - std::cout << "Test 'rocm'"; - device d19(ext::oneapi::filter_selector("rocm")); - assert(d19.get_platform().get_backend() == backend::rocm); + if (HasHIPDevices) { + std::cout << "Test 'hip'"; + device d19(ext::oneapi::filter_selector("hip")); + assert(d19.get_platform().get_backend() == backend::hip); std::cout << "...PASS" << std::endl; - std::cout << "test 'rocm:gpu'"; - device d20(ext::oneapi::filter_selector("rocm:gpu")); - assert(d20.is_gpu() && d19.get_platform().get_backend() == backend::rocm); + std::cout << "test 'hip:gpu'"; + device d20(ext::oneapi::filter_selector("hip:gpu")); + assert(d20.is_gpu() && d19.get_platform().get_backend() == backend::hip); std::cout << "...PASS" << std::endl; } diff --git a/SYCL/GroupAlgorithm/SYCL2020/all_of.cpp b/SYCL/GroupAlgorithm/SYCL2020/all_of.cpp index 80723b5f3f..a5e9acb595 100644 --- a/SYCL/GroupAlgorithm/SYCL2020/all_of.cpp +++ b/SYCL/GroupAlgorithm/SYCL2020/all_of.cpp @@ -4,7 +4,7 @@ // RUN: %ACC_RUN_PLACEHOLDER %t.out // // Missing __spirv_GroupAll on AMD: -// XFAIL: rocm_amd +// XFAIL: hip_amd #include "support.h" #include diff --git a/SYCL/GroupAlgorithm/SYCL2020/any_of.cpp b/SYCL/GroupAlgorithm/SYCL2020/any_of.cpp index 9f681ec20c..ad3737ba21 100644 --- a/SYCL/GroupAlgorithm/SYCL2020/any_of.cpp +++ b/SYCL/GroupAlgorithm/SYCL2020/any_of.cpp @@ -4,7 +4,7 @@ // RUN: %ACC_RUN_PLACEHOLDER %t.out // // Missing __spirv_GroupAny on AMD: -// XFAIL: rocm_amd +// XFAIL: hip_amd #include "support.h" #include diff --git a/SYCL/GroupAlgorithm/SYCL2020/exclusive_scan.cpp b/SYCL/GroupAlgorithm/SYCL2020/exclusive_scan.cpp index d827d71ce6..e26c2db4a3 100644 --- a/SYCL/GroupAlgorithm/SYCL2020/exclusive_scan.cpp +++ b/SYCL/GroupAlgorithm/SYCL2020/exclusive_scan.cpp @@ -5,7 +5,7 @@ // // Missing __spirv_GroupIAdd, __spirv_GroupBroadcast, __spirv_GroupSMin and // __spirv_GroupSMax on AMD: -// XFAIL: rocm_amd +// XFAIL: hip_amd // TODO: enable compile+runtime checks for operations defined in SPIR-V 1.3. // That requires either adding a switch to clang (-spirv-max-version=1.3) or diff --git a/SYCL/GroupAlgorithm/SYCL2020/group_broadcast.cpp b/SYCL/GroupAlgorithm/SYCL2020/group_broadcast.cpp index dafec4e8eb..4dae082705 100644 --- a/SYCL/GroupAlgorithm/SYCL2020/group_broadcast.cpp +++ b/SYCL/GroupAlgorithm/SYCL2020/group_broadcast.cpp @@ -4,7 +4,7 @@ // RUN: %ACC_RUN_PLACEHOLDER %t.out // // Missing __spirv_GroupBroadcast on AMD: -// XFAIL: rocm_amd +// XFAIL: hip_amd #include "support.h" #include diff --git a/SYCL/GroupAlgorithm/SYCL2020/inclusive_scan.cpp b/SYCL/GroupAlgorithm/SYCL2020/inclusive_scan.cpp index f2b9f7ce53..c1ea0e56f0 100644 --- a/SYCL/GroupAlgorithm/SYCL2020/inclusive_scan.cpp +++ b/SYCL/GroupAlgorithm/SYCL2020/inclusive_scan.cpp @@ -5,7 +5,7 @@ // // Missing __spirv_GroupIAdd, __spirv_GroupBroadcast, __spirv_GroupSMin and // __spirv_GroupSMax on AMD: -// XFAIL: rocm_amd +// XFAIL: hip_amd // TODO: enable compile+runtime checks for operations defined in SPIR-V 1.3. // That requires either adding a switch to clang (-spirv-max-version=1.3) or diff --git a/SYCL/GroupAlgorithm/SYCL2020/none_of.cpp b/SYCL/GroupAlgorithm/SYCL2020/none_of.cpp index b2b0eb0d7d..9e85175441 100644 --- a/SYCL/GroupAlgorithm/SYCL2020/none_of.cpp +++ b/SYCL/GroupAlgorithm/SYCL2020/none_of.cpp @@ -4,7 +4,7 @@ // RUN: %ACC_RUN_PLACEHOLDER %t.out // // Missing __spirv_GroupAll and __spirv_GroupAny on AMD: -// XFAIL: rocm_amd +// XFAIL: hip_amd #include "support.h" #include diff --git a/SYCL/GroupAlgorithm/SYCL2020/permute_select.cpp b/SYCL/GroupAlgorithm/SYCL2020/permute_select.cpp index a863942294..8a65ff9f29 100644 --- a/SYCL/GroupAlgorithm/SYCL2020/permute_select.cpp +++ b/SYCL/GroupAlgorithm/SYCL2020/permute_select.cpp @@ -5,7 +5,7 @@ // // Missing __spirv_SubgroupId, __spirv_SubgroupMaxSize, __spirv_SubgroupShuffle* // on AMD: -// XFAIL: rocm_amd +// XFAIL: hip_amd // //==------------ permute_select.cpp -*- C++ -*-----------------------------===// // diff --git a/SYCL/GroupAlgorithm/SYCL2020/reduce.cpp b/SYCL/GroupAlgorithm/SYCL2020/reduce.cpp index 2c968ce04f..540a382fb6 100644 --- a/SYCL/GroupAlgorithm/SYCL2020/reduce.cpp +++ b/SYCL/GroupAlgorithm/SYCL2020/reduce.cpp @@ -4,7 +4,7 @@ // RUN: %ACC_RUN_PLACEHOLDER %t.out // // Missinsg __spirv_GroupIAdd, __spirv_GroupSMin and __spirv_GroupSMax on AMD: -// XFAIL: rocm_amd +// XFAIL: hip_amd // TODO: enable compile+runtime checks for operations defined in SPIR-V 1.3. // That requires either adding a switch to clang (-spirv-max-version=1.3) or diff --git a/SYCL/GroupAlgorithm/SYCL2020/shift_left_right.cpp b/SYCL/GroupAlgorithm/SYCL2020/shift_left_right.cpp index 790eb5030d..891a0ab6ae 100644 --- a/SYCL/GroupAlgorithm/SYCL2020/shift_left_right.cpp +++ b/SYCL/GroupAlgorithm/SYCL2020/shift_left_right.cpp @@ -5,7 +5,7 @@ // // Missing __spirv_SubgroupId, __spirv_SubgroupMaxSize, __spirv_SubgroupShuffle* // on AMD: -// XFAIL: rocm_amd +// XFAIL: hip_amd // //==------------ shift_left_right.cpp -*- C++ -*----------------------------==// // diff --git a/SYCL/GroupAlgorithm/back_to_back_collectives.cpp b/SYCL/GroupAlgorithm/back_to_back_collectives.cpp index 5c5d14fd33..0505a0e22c 100644 --- a/SYCL/GroupAlgorithm/back_to_back_collectives.cpp +++ b/SYCL/GroupAlgorithm/back_to_back_collectives.cpp @@ -5,7 +5,7 @@ // RUN: %ACC_RUN_PLACEHOLDER %t.out // // Missing __spirv_GroupIAdd on AMD: -// XFAIL: rocm_amd +// XFAIL: hip_amd #include #include diff --git a/SYCL/Plugin/enqueue-arg-order-image.cpp b/SYCL/Plugin/enqueue-arg-order-image.cpp index b08f793dd8..d4e9ae5f8f 100644 --- a/SYCL/Plugin/enqueue-arg-order-image.cpp +++ b/SYCL/Plugin/enqueue-arg-order-image.cpp @@ -1,5 +1,5 @@ // Temporarily disabled due to CUDA context related failures. -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // Native images are created with host pointers only with host unified memory // support, enforce it for this test. diff --git a/SYCL/Plugin/sycl-ls-gpu-default-any.cpp b/SYCL/Plugin/sycl-ls-gpu-default-any.cpp index 3dfb5b6112..84a04640e2 100644 --- a/SYCL/Plugin/sycl-ls-gpu-default-any.cpp +++ b/SYCL/Plugin/sycl-ls-gpu-default-any.cpp @@ -20,4 +20,4 @@ // is present. // The test crashed on CUDA CI machines with the latest OpenCL GPU RT // (21.19.19792). -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip diff --git a/SYCL/Plugin/sycl-ls-gpu-hip.cpp b/SYCL/Plugin/sycl-ls-gpu-hip.cpp new file mode 100644 index 0000000000..7442466dc1 --- /dev/null +++ b/SYCL/Plugin/sycl-ls-gpu-hip.cpp @@ -0,0 +1,15 @@ +// REQUIRES: gpu, hip, sycl-ls + +// RUN: env SYCL_DEVICE_FILTER=hip sycl-ls --verbose >%t.hip.out +// RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-HIP,CHECK-CUSTOM-GPU-HIP --input-file %t.hip.out + +// CHECK-BUILTIN-GPU-HIP: gpu_selector(){{.*}}GPU :{{.*}}HIP +// CHECK-CUSTOM-GPU-HIP: custom_selector(gpu){{.*}}GPU :{{.*}}HIP + +//==---- sycl-ls-gpu-hip.cpp - SYCL test for discovered/selected devices --==// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// diff --git a/SYCL/Plugin/sycl-ls-gpu-rocm.cpp b/SYCL/Plugin/sycl-ls-gpu-rocm.cpp deleted file mode 100644 index ad4dee20a0..0000000000 --- a/SYCL/Plugin/sycl-ls-gpu-rocm.cpp +++ /dev/null @@ -1,15 +0,0 @@ -// REQUIRES: gpu, rocm, sycl-ls - -// RUN: env SYCL_DEVICE_FILTER=rocm sycl-ls --verbose >%t.rocm.out -// RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-ROCM,CHECK-CUSTOM-GPU-ROCM --input-file %t.rocm.out - -// CHECK-BUILTIN-GPU-ROCM: gpu_selector(){{.*}}GPU :{{.*}}ROCM -// CHECK-CUSTOM-GPU-ROCM: custom_selector(gpu){{.*}}GPU :{{.*}}ROCM - -//==---- sycl-ls-gpu-rocm.cpp - SYCL test for discovered/selected devices --==// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// diff --git a/SYCL/Plugin/sycl-ls-gpu-sycl-be.cpp b/SYCL/Plugin/sycl-ls-gpu-sycl-be.cpp index bb7dee9927..fd110aec76 100644 --- a/SYCL/Plugin/sycl-ls-gpu-sycl-be.cpp +++ b/SYCL/Plugin/sycl-ls-gpu-sycl-be.cpp @@ -1,4 +1,4 @@ -// REQUIRES: gpu, cuda, rocm, opencl, sycl-ls +// REQUIRES: gpu, cuda, hip, opencl, sycl-ls // RUN: sycl-ls --verbose >%t.default.out // RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-OPENCL,CHECK-CUSTOM-GPU-OPENCL --input-file %t.default.out @@ -15,11 +15,11 @@ // CHECK-BUILTIN-GPU-CUDA: gpu_selector(){{.*}}GPU : CUDA // CHECK-CUSTOM-GPU-CUDA: custom_selector(gpu){{.*}}GPU : CUDA -// RUN: env SYCL_DEVICE_FILTER=rocm sycl-ls --verbose >%t.rocm.out -// RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-ROCM,CHECK-CUSTOM-GPU-ROCM --input-file %t.rocm.out +// RUN: env SYCL_DEVICE_FILTER=hip sycl-ls --verbose >%t.hip.out +// RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-HIP,CHECK-CUSTOM-GPU-HIP --input-file %t.hip.out -// CHECK-BUILTIN-GPU-ROCM: gpu_selector(){{.*}}GPU : ROCm -// CHECK-CUSTOM-GPU-ROCM: custom_selector(gpu){{.*}}GPU : ROCm +// CHECK-BUILTIN-GPU-HIP: gpu_selector(){{.*}}GPU : HIP +// CHECK-CUSTOM-GPU-HIP: custom_selector(gpu){{.*}}GPU : HIP //==---- sycl-ls-gpu-sycl-be.cpp - SYCL test for discovered/selected devices //--==// diff --git a/SYCL/README.md b/SYCL/README.md index 2c70742883..8bab44e134 100644 --- a/SYCL/README.md +++ b/SYCL/README.md @@ -81,19 +81,19 @@ list of configurations. Each configuration includes backend separated from comma-separated list of target devices with colon. Example: ``` --DCHECK_SYCL_ALL="opencl:cpu,host;level_zero:gpu,host;cuda:gpu;rocm:gpu" +-DCHECK_SYCL_ALL="opencl:cpu,host;level_zero:gpu,host;cuda:gpu;hip:gpu" ``` ***SYCL_BE*** SYCL backend to be used for testing. Supported values are: - **opencl** - for OpenCL backend; - **cuda** - for CUDA backend; - - **rocm** - for ROCm backend; + - **hip** - for HIP backend; - **level_zero** - Level Zero backend. ***SYCL_TARGET_DEVICES*** comma separated list of target devices for testing. Default value is cpu,gpu,acc,host. Supported values are: - **cpu** - CPU device available in OpenCL backend only; - - **gpu** - GPU device available in OpenCL, Level Zero, CUDA, and ROCm backends; + - **gpu** - GPU device available in OpenCL, Level Zero, CUDA, and HIP backends; - **acc** - FPGA emulator device available in OpenCL backend only; - **host** - SYCL Host device available with all backends. @@ -106,12 +106,12 @@ specified by this variable. ***LEVEL_ZERO_LIBS_DIR*** path to Level Zero libraries. -***ROCM_PLATFORM*** platform selection for ROCm targeted devices. +***HIP_PLATFORM*** platform selection for HIP targeted devices. Defaults to AMD if no value is given. Supported values are: - - **AMD** - for ROCm to target AMD GPUs - - **NVIDIA** - for ROCm to target NVIDIA GPUs + - **AMD** - for HIP to target AMD GPUs + - **NVIDIA** - for HIP to target NVIDIA GPUs - ***AMD_ARCH*** Flag must be set for when using ROCm triple. + ***AMD_ARCH*** Flag must be set for when using HIP AMD triple. For example it may be set to "gfx906". @@ -134,7 +134,7 @@ unavailable. * **windows**, **linux** - host OS; * **cpu**, **gpu**, **host**, **accelerator** - target device; - * **cuda**, **rocm**, **opencl**, **level_zero** - target backend; + * **cuda**, **hip**, **opencl**, **level_zero** - target backend; * **sycl-ls** - sycl-ls tool availability; * **cl_options** - CL command line options recognized (or not) by compiler; * **opencl_icd** - OpenCL ICD loader availability; @@ -152,7 +152,7 @@ configure specific single test execution in the command line: * **dpcpp_compiler** - full path to dpcpp compiler; * **target_device** - comma-separated list of target devices (cpu, gpu, acc, host); - * **sycl_be** - SYCL backend to be used (opencl, level_zero, cuda, rocm); + * **sycl_be** - SYCL backend to be used (opencl, level_zero, cuda, hip); * **dump_ir** - if IR dumping is supported for compiler (True, False); * **gpu-intel-dg1** - tells LIT infra that Intel GPU DG1 is present in the system. It is developer / CI infra responsibility to make sure that the diff --git a/SYCL/Sampler/basic-rw-float.cpp b/SYCL/Sampler/basic-rw-float.cpp index 06c923d526..a4ee73de08 100644 --- a/SYCL/Sampler/basic-rw-float.cpp +++ b/SYCL/Sampler/basic-rw-float.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: rocm +// UNSUPPORTED: hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Sampler/basic-rw.cpp b/SYCL/Sampler/basic-rw.cpp index 4325c2e132..61f0802e83 100644 --- a/SYCL/Sampler/basic-rw.cpp +++ b/SYCL/Sampler/basic-rw.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED rocm +// UNSUPPORTED hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Sampler/normalized-clamp-linear-float.cpp b/SYCL/Sampler/normalized-clamp-linear-float.cpp index 681bc51963..506793aaf5 100644 --- a/SYCL/Sampler/normalized-clamp-linear-float.cpp +++ b/SYCL/Sampler/normalized-clamp-linear-float.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: rocm +// UNSUPPORTED: hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Sampler/normalized-clamp-nearest.cpp b/SYCL/Sampler/normalized-clamp-nearest.cpp index 7402430e75..36e5fa5b60 100644 --- a/SYCL/Sampler/normalized-clamp-nearest.cpp +++ b/SYCL/Sampler/normalized-clamp-nearest.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: rocm +// UNSUPPORTED: hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Sampler/normalized-mirror-linear-float.cpp b/SYCL/Sampler/normalized-mirror-linear-float.cpp index 147ecbbf1f..ef168082e9 100644 --- a/SYCL/Sampler/normalized-mirror-linear-float.cpp +++ b/SYCL/Sampler/normalized-mirror-linear-float.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: rocm +// UNSUPPORTED: hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Sampler/normalized-mirror-nearest.cpp b/SYCL/Sampler/normalized-mirror-nearest.cpp index d814e73114..84c9ad9c96 100644 --- a/SYCL/Sampler/normalized-mirror-nearest.cpp +++ b/SYCL/Sampler/normalized-mirror-nearest.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: rocm +// UNSUPPORTED: hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Sampler/normalized-none-linear-float.cpp b/SYCL/Sampler/normalized-none-linear-float.cpp index d09174fedd..b7b8e5b04a 100644 --- a/SYCL/Sampler/normalized-none-linear-float.cpp +++ b/SYCL/Sampler/normalized-none-linear-float.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: rocm +// UNSUPPORTED: hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Sampler/normalized-none-nearest.cpp b/SYCL/Sampler/normalized-none-nearest.cpp index 25a0f2f523..6f17e6cd25 100644 --- a/SYCL/Sampler/normalized-none-nearest.cpp +++ b/SYCL/Sampler/normalized-none-nearest.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: rocm +// UNSUPPORTED: hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Sampler/normalized-repeat-linear-float.cpp b/SYCL/Sampler/normalized-repeat-linear-float.cpp index 831b279890..f66cf6e862 100644 --- a/SYCL/Sampler/normalized-repeat-linear-float.cpp +++ b/SYCL/Sampler/normalized-repeat-linear-float.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: rocm +// UNSUPPORTED: hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Sampler/normalized-repeat-nearest.cpp b/SYCL/Sampler/normalized-repeat-nearest.cpp index 391e2ae33b..efa7395dd4 100644 --- a/SYCL/Sampler/normalized-repeat-nearest.cpp +++ b/SYCL/Sampler/normalized-repeat-nearest.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: rocm +// UNSUPPORTED: hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Sampler/unnormalized-clamp-linear-float.cpp b/SYCL/Sampler/unnormalized-clamp-linear-float.cpp index 480e278f5d..f5f4bdd1b1 100644 --- a/SYCL/Sampler/unnormalized-clamp-linear-float.cpp +++ b/SYCL/Sampler/unnormalized-clamp-linear-float.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: rocm +// UNSUPPORTED: hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Sampler/unnormalized-clamp-nearest.cpp b/SYCL/Sampler/unnormalized-clamp-nearest.cpp index b3fe38f38f..4006fa6d34 100644 --- a/SYCL/Sampler/unnormalized-clamp-nearest.cpp +++ b/SYCL/Sampler/unnormalized-clamp-nearest.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: rocm +// UNSUPPORTED: hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Sampler/unnormalized-clampedge-linear-float.cpp b/SYCL/Sampler/unnormalized-clampedge-linear-float.cpp index f2e7984206..296302e1d7 100644 --- a/SYCL/Sampler/unnormalized-clampedge-linear-float.cpp +++ b/SYCL/Sampler/unnormalized-clampedge-linear-float.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: rocm +// UNSUPPORTED: hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Sampler/unnormalized-clampedge-nearest.cpp b/SYCL/Sampler/unnormalized-clampedge-nearest.cpp index 66c3274a01..dc1fb2a06c 100644 --- a/SYCL/Sampler/unnormalized-clampedge-nearest.cpp +++ b/SYCL/Sampler/unnormalized-clampedge-nearest.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: rocm +// UNSUPPORTED: hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Sampler/unnormalized-none-linear-float.cpp b/SYCL/Sampler/unnormalized-none-linear-float.cpp index 4120288e5d..5a7087b320 100644 --- a/SYCL/Sampler/unnormalized-none-linear-float.cpp +++ b/SYCL/Sampler/unnormalized-none-linear-float.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: rocm +// UNSUPPORTED: hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Sampler/unnormalized-none-nearest.cpp b/SYCL/Sampler/unnormalized-none-nearest.cpp index d4ac662c59..fadefde39e 100644 --- a/SYCL/Sampler/unnormalized-none-nearest.cpp +++ b/SYCL/Sampler/unnormalized-none-nearest.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: rocm +// UNSUPPORTED: hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/Scheduler/HostAccDestruction.cpp b/SYCL/Scheduler/HostAccDestruction.cpp index 3b2b9f7bf8..b50571d17b 100644 --- a/SYCL/Scheduler/HostAccDestruction.cpp +++ b/SYCL/Scheduler/HostAccDestruction.cpp @@ -2,7 +2,7 @@ // RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER // RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER // RUN: env SYCL_PI_TRACE=2 %ACC_RUN_PLACEHOLDER %t.out 2>&1 %ACC_CHECK_PLACEHOLDER -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip //==---------------------- HostAccDestruction.cpp --------------------------==// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/SYCL/SpecConstants/1.2.1/composite-in-functor.cpp b/SYCL/SpecConstants/1.2.1/composite-in-functor.cpp index 4f62d4211b..4c282ad293 100644 --- a/SYCL/SpecConstants/1.2.1/composite-in-functor.cpp +++ b/SYCL/SpecConstants/1.2.1/composite-in-functor.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // // RUN: %clangxx -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out %HOST_CHECK_PLACEHOLDER diff --git a/SYCL/SpecConstants/1.2.1/composite-type.cpp b/SYCL/SpecConstants/1.2.1/composite-type.cpp index 54a1a5fc55..c407cd3c14 100644 --- a/SYCL/SpecConstants/1.2.1/composite-type.cpp +++ b/SYCL/SpecConstants/1.2.1/composite-type.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // // RUN: %clangxx -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out diff --git a/SYCL/SpecConstants/1.2.1/multiple-usages-of-composite.cpp b/SYCL/SpecConstants/1.2.1/multiple-usages-of-composite.cpp index 3f2f678acb..b88f02d447 100644 --- a/SYCL/SpecConstants/1.2.1/multiple-usages-of-composite.cpp +++ b/SYCL/SpecConstants/1.2.1/multiple-usages-of-composite.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // // RUN: %clangxx -fsycl %s -o %t.out -v // RUN: %HOST_RUN_PLACEHOLDER %t.out %HOST_CHECK_PLACEHOLDER diff --git a/SYCL/SpecConstants/1.2.1/spec_const_hw.cpp b/SYCL/SpecConstants/1.2.1/spec_const_hw.cpp index cee34d2952..00240c57f2 100644 --- a/SYCL/SpecConstants/1.2.1/spec_const_hw.cpp +++ b/SYCL/SpecConstants/1.2.1/spec_const_hw.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out diff --git a/SYCL/SpecConstants/1.2.1/spec_const_neg.cpp b/SYCL/SpecConstants/1.2.1/spec_const_neg.cpp index 6d270bbb43..c1385e3331 100644 --- a/SYCL/SpecConstants/1.2.1/spec_const_neg.cpp +++ b/SYCL/SpecConstants/1.2.1/spec_const_neg.cpp @@ -3,7 +3,7 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // Specialization constants are not supported on FPGA h/w and emulator. -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // //==----------- spec_const_hw.cpp ------------------------------------------==// // diff --git a/SYCL/SpecConstants/1.2.1/spec_const_redefine.cpp b/SYCL/SpecConstants/1.2.1/spec_const_redefine.cpp index f1990c2a42..9dcfeab37f 100644 --- a/SYCL/SpecConstants/1.2.1/spec_const_redefine.cpp +++ b/SYCL/SpecConstants/1.2.1/spec_const_redefine.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // // FIXME Disable fallback assert so that it doesn't interferes with number of // program builds at run-time diff --git a/SYCL/SpecConstants/1.2.1/specialization_constants.cpp b/SYCL/SpecConstants/1.2.1/specialization_constants.cpp index e7604df102..7f4c8000a3 100644 --- a/SYCL/SpecConstants/1.2.1/specialization_constants.cpp +++ b/SYCL/SpecConstants/1.2.1/specialization_constants.cpp @@ -3,7 +3,7 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // Specialization constants are not supported on FPGA h/w and emulator. -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // //==----------- specialization_constants.cpp -------------------------------==// // diff --git a/SYCL/SpecConstants/1.2.1/specialization_constants_negative.cpp b/SYCL/SpecConstants/1.2.1/specialization_constants_negative.cpp index 28920badc2..bbd4cdbfb6 100644 --- a/SYCL/SpecConstants/1.2.1/specialization_constants_negative.cpp +++ b/SYCL/SpecConstants/1.2.1/specialization_constants_negative.cpp @@ -3,7 +3,7 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // Specialization constants are not supported on FPGA h/w and emulator. -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // //==----------- specialization_constants_negative.cpp ----------------------==// // diff --git a/SYCL/SpecConstants/1.2.1/specialization_constants_override.cpp b/SYCL/SpecConstants/1.2.1/specialization_constants_override.cpp index d6ce5e40d3..10280ba876 100644 --- a/SYCL/SpecConstants/1.2.1/specialization_constants_override.cpp +++ b/SYCL/SpecConstants/1.2.1/specialization_constants_override.cpp @@ -3,7 +3,7 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // Specialization constants are not supported on FPGA h/w and emulator. -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // //==----------- specialization_constants_override.cpp ----------------------==// // diff --git a/SYCL/SpecConstants/1.2.1/unpacked-composite-type.cpp b/SYCL/SpecConstants/1.2.1/unpacked-composite-type.cpp index 16180fc748..a8cd84e0b6 100644 --- a/SYCL/SpecConstants/1.2.1/unpacked-composite-type.cpp +++ b/SYCL/SpecConstants/1.2.1/unpacked-composite-type.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // // RUN: %clangxx -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out %HOST_CHECK_PLACEHOLDER diff --git a/SYCL/SpecConstants/2020/handler-api.cpp b/SYCL/SpecConstants/2020/handler-api.cpp index 80c2304c75..d02892d49c 100644 --- a/SYCL/SpecConstants/2020/handler-api.cpp +++ b/SYCL/SpecConstants/2020/handler-api.cpp @@ -13,7 +13,7 @@ // RUN: %GPU_RUN_PLACEHOLDER %t.out // FIXME: ACC devices use emulation path, which is not yet supported // FIXME: CUDA uses emulation path, which is not yet supported -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip #include #include diff --git a/SYCL/SpecConstants/2020/host_apis.cpp b/SYCL/SpecConstants/2020/host_apis.cpp index c373291938..c84276b489 100644 --- a/SYCL/SpecConstants/2020/host_apis.cpp +++ b/SYCL/SpecConstants/2020/host_apis.cpp @@ -2,8 +2,7 @@ // RUN: %t.out // UNSUPPORTED: cuda -// UNSUPPORTED: rocm_nvidia -// UNSUPPORTED: rocm_amd +// UNSUPPORTED: hip #include diff --git a/SYCL/SpecConstants/2020/kernel-bundle-api.cpp b/SYCL/SpecConstants/2020/kernel-bundle-api.cpp index 3d0b296a76..82022bfcbb 100644 --- a/SYCL/SpecConstants/2020/kernel-bundle-api.cpp +++ b/SYCL/SpecConstants/2020/kernel-bundle-api.cpp @@ -13,7 +13,7 @@ // RUN: %GPU_RUN_PLACEHOLDER %t.out // FIXME: ACC devices use emulation path, which is not yet supported // FIXME: CUDA uses emulation path, which is not yet supported -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip #include #include diff --git a/SYCL/SpecConstants/2020/kernel_lambda_with_kernel_handler_arg.cpp b/SYCL/SpecConstants/2020/kernel_lambda_with_kernel_handler_arg.cpp index dd7a27b8db..6ccaa4f427 100644 --- a/SYCL/SpecConstants/2020/kernel_lambda_with_kernel_handler_arg.cpp +++ b/SYCL/SpecConstants/2020/kernel_lambda_with_kernel_handler_arg.cpp @@ -2,7 +2,7 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // // Hits an assert in the Lower Work Group Scope Code pass on AMD: -// XFAIL: rocm_amd +// XFAIL: hip_amd // This test checks all possible scenarios of running single_task, parallel_for // and parallel_for_work_group to verify that this code compiles and runs diff --git a/SYCL/SpecConstants/2020/non_native/aot_w_kernel_handler_wo_spec_consts.cpp b/SYCL/SpecConstants/2020/non_native/aot_w_kernel_handler_wo_spec_consts.cpp index f0a71e5110..d71bcce751 100644 --- a/SYCL/SpecConstants/2020/non_native/aot_w_kernel_handler_wo_spec_consts.cpp +++ b/SYCL/SpecConstants/2020/non_native/aot_w_kernel_handler_wo_spec_consts.cpp @@ -2,7 +2,7 @@ // RUN: %CPU_RUN_PLACEHOLDER %t.out // // Hits an assert in the Lower Work Group Scope Code pass on AMD: -// XFAIL: rocm_amd +// XFAIL: hip_amd // This test checks correctness of compiling and running of application with // kernel lambdas containing kernel_handler arguments and w/o usage of diff --git a/SYCL/SpecConstants/2020/non_native/gpu.cpp b/SYCL/SpecConstants/2020/non_native/gpu.cpp index 879fc95e94..0beda8bf13 100644 --- a/SYCL/SpecConstants/2020/non_native/gpu.cpp +++ b/SYCL/SpecConstants/2020/non_native/gpu.cpp @@ -2,9 +2,8 @@ // UNSUPPORTED: cuda // CUDA is not compatible with SPIR. // -// UNSUPPORTED: rocm_nvidia -// UNSUPPORTED: rocm_amd -// ROCm is not compatible with SPIR. +// UNSUPPORTED: hip +// HIP 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/common.cpp -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/SubGroup/info.cpp b/SYCL/SubGroup/info.cpp index ff78d04d16..6ca9914355 100644 --- a/SYCL/SubGroup/info.cpp +++ b/SYCL/SubGroup/info.cpp @@ -1,5 +1,5 @@ // See https://github.com/intel/llvm/issues/2922 for more info -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/SubGroup/reduce_spirv13.cpp b/SYCL/SubGroup/reduce_spirv13.cpp index a11766d1c5..f6f5cc885a 100644 --- a/SYCL/SubGroup/reduce_spirv13.cpp +++ b/SYCL/SubGroup/reduce_spirv13.cpp @@ -2,7 +2,7 @@ // #2252 Disable until all variants of built-ins are available in OpenCL CPU // runtime for every supported ISA -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out diff --git a/SYCL/SubGroup/reduce_spirv13_fp16.cpp b/SYCL/SubGroup/reduce_spirv13_fp16.cpp index 336c883177..ccf4434fec 100644 --- a/SYCL/SubGroup/reduce_spirv13_fp16.cpp +++ b/SYCL/SubGroup/reduce_spirv13_fp16.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/SubGroup/reduce_spirv13_fp64.cpp b/SYCL/SubGroup/reduce_spirv13_fp64.cpp index 28c3c052c9..fbb155e4e1 100644 --- a/SYCL/SubGroup/reduce_spirv13_fp64.cpp +++ b/SYCL/SubGroup/reduce_spirv13_fp64.cpp @@ -2,7 +2,7 @@ // #2252 Disable until all variants of built-ins are available in OpenCL CPU // runtime for every supported ISA -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out diff --git a/SYCL/SubGroup/scan_spirv13.cpp b/SYCL/SubGroup/scan_spirv13.cpp index 407b2b23c3..0894f16c88 100644 --- a/SYCL/SubGroup/scan_spirv13.cpp +++ b/SYCL/SubGroup/scan_spirv13.cpp @@ -2,7 +2,7 @@ // #2252 Disable until all variants of built-ins are available in OpenCL CPU // runtime for every supported ISA -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out diff --git a/SYCL/SubGroup/scan_spirv13_fp16.cpp b/SYCL/SubGroup/scan_spirv13_fp16.cpp index ed3563986c..de2c5e3f6a 100644 --- a/SYCL/SubGroup/scan_spirv13_fp16.cpp +++ b/SYCL/SubGroup/scan_spirv13_fp16.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/SubGroup/scan_spirv13_fp64.cpp b/SYCL/SubGroup/scan_spirv13_fp64.cpp index 72626fe497..377bec1979 100644 --- a/SYCL/SubGroup/scan_spirv13_fp64.cpp +++ b/SYCL/SubGroup/scan_spirv13_fp64.cpp @@ -2,7 +2,7 @@ // #2252 Disable until all variants of built-ins are available in OpenCL CPU // runtime for every supported ISA -// UNSUPPORTED: cuda || rocm +// UNSUPPORTED: cuda || hip // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out diff --git a/SYCL/USM/dep_events.cpp b/SYCL/USM/dep_events.cpp index 2b992d0fdb..5815df8e86 100644 --- a/SYCL/USM/dep_events.cpp +++ b/SYCL/USM/dep_events.cpp @@ -12,9 +12,9 @@ // RUN: %GPU_RUN_PLACEHOLDER %t1.out // RUN: %ACC_RUN_PLACEHOLDER %t1.out // -// XFAIL: cuda || rocm +// XFAIL: cuda || hip // TODO enable the test when cuda_piextUSMEnqueuePrefetch and -// rocm_piextUSMEnqueuePrefetch starts handling flags +// hip_piextUSMEnqueuePrefetch starts handling flags #include diff --git a/SYCL/lit.cfg.py b/SYCL/lit.cfg.py index 2484d67119..669df84b04 100644 --- a/SYCL/lit.cfg.py +++ b/SYCL/lit.cfg.py @@ -157,7 +157,7 @@ # Mapping from SYCL_BE backend definition style to SYCL_DEVICE_FILTER used # for backward compatibility try: - config.sycl_be = { 'PI_OPENCL': 'opencl', 'PI_CUDA': 'cuda', 'PI_ROCM': 'rocm', 'PI_LEVEL_ZERO': 'level_zero'}[config.sycl_be] + config.sycl_be = { 'PI_OPENCL': 'opencl', 'PI_CUDA': 'cuda', 'PI_HIP': 'hip', 'PI_LEVEL_ZERO': 'level_zero'}[config.sycl_be] except: # do nothing a we expect that new format of plugin values are used pass @@ -171,20 +171,24 @@ if config.dump_ir_supported: config.available_features.add('dump_ir') -if config.sycl_be not in ['host', 'opencl', 'cuda', 'rocm', 'level_zero']: +if config.sycl_be not in ['host', 'opencl', 'cuda', 'hip', 'level_zero']: lit_config.error("Unknown SYCL BE specified '" + config.sycl_be + - "' supported values are opencl, cuda, rocm, level_zero") + "' supported values are opencl, cuda, hip, level_zero") -# If ROCM_PLATFORM flag is not set, default to AMD, and check if ROCM platform is supported -supported_rocm_platforms=["AMD", "NVIDIA"] -if config.rocm_platform == "": - config.rocm_platform = "AMD" -if config.rocm_platform not in supported_rocm_platforms: - lit_config.error("Unknown ROCm platform '" + config.rocm_platform + "' supported platforms are " + ', '.join(supported_rocm_platforms)) +# If HIP_PLATFORM flag is not set, default to AMD, and check if HIP platform is supported +supported_hip_platforms=["AMD", "NVIDIA"] +if config.hip_platform == "": + config.hip_platform = "AMD" +if config.hip_platform not in supported_hip_platforms: + lit_config.error("Unknown HIP platform '" + config.hip_platform + "' supported platforms are " + ', '.join(supported_hip_platforms)) -if config.sycl_be == "rocm" and config.rocm_platform == "AMD": +if config.sycl_be == "hip" and config.hip_platform == "AMD": + config.available_features.add('hip_amd') arch_flag = '-Xsycl-target-backend=amdgcn-amd-amdhsa-sycldevice --offload-arch=' + config.amd_arch +elif config.sycl_be == "hip" and config.hip_platform == "NVIDIA": + config.available_features.add('hip_nvidia') + arch_flag = "" else: arch_flag = "" @@ -303,9 +307,9 @@ config.substitutions.append( ('%ACC_RUN_PLACEHOLDER', acc_run_substitute) ) config.substitutions.append( ('%ACC_CHECK_PLACEHOLDER', acc_check_substitute) ) -if config.sycl_be == 'cuda' or (config.sycl_be == 'rocm' and config.rocm_platform == 'NVIDIA'): +if config.sycl_be == 'cuda' or (config.sycl_be == 'hip' and config.hip_platform == 'NVIDIA'): config.substitutions.append( ('%sycl_triple', "nvptx64-nvidia-cuda-sycldevice" ) ) -elif config.sycl_be == 'rocm' and config.rocm_platform == 'AMD': +elif config.sycl_be == 'hip' and config.hip_platform == 'AMD': config.substitutions.append( ('%sycl_triple', "amdgcn-amd-amdhsa-sycldevice" ) ) else: config.substitutions.append( ('%sycl_triple', "spir64-unknown-unknown-sycldevice" ) ) diff --git a/SYCL/lit.site.cfg.py.in b/SYCL/lit.site.cfg.py.in index 1d784297cf..b0ee4db3ed 100644 --- a/SYCL/lit.site.cfg.py.in +++ b/SYCL/lit.site.cfg.py.in @@ -22,7 +22,7 @@ config.level_zero_include = "@LEVEL_ZERO_INCLUDE@" config.opencl_include_dir = os.path.join(config.sycl_include, 'sycl') config.target_devices = lit_config.params.get("target_devices", "@SYCL_TARGET_DEVICES@") config.sycl_be = lit_config.params.get("sycl_be", "@SYCL_BE@") -config.rocm_platform = "@ROCM_PLATFORM@" +config.hip_platform = "@HIP_PLATFORM@" config.amd_arch = "@AMD_ARCH@" config.sycl_threads_lib = '@SYCL_THREADS_LIB@' config.extra_environment = lit_config.params.get("extra_environment", "@LIT_EXTRA_ENVIRONMENT@")