[SYCL][HIP] Fix shuffles and reductions (#759)

These tests are fixed by #5359
intel · Jan 26, 2022 · b238ad2 · b238ad2
1 parent 9e3efa0
commit b238ad2
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 41 deletions.
diff --git a/SYCL/Reduction/reduction_big_data.cpp b/SYCL/Reduction/reduction_big_data.cpp
@@ -3,9 +3,9 @@
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 //
-// Missing __spirv_GroupFMax on AMD, error message `Group algorithms are not
-// supported on host device` on Nvidia.
-// XFAIL: hip_amd || hip_nvidia
+// `Group algorithms are not supported on host device` on Nvidia.
+// XFAIL: hip_nvidia
+//
 // UNSUPPORTED: ze_debug-1,ze_debug4
 
 // RUNx: %HOST_RUN_PLACEHOLDER %t.out

diff --git a/SYCL/Reduction/reduction_nd_s0_dw.cpp b/SYCL/Reduction/reduction_nd_s0_dw.cpp
@@ -3,9 +3,8 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 //
-// Missing __spirv_GroupIAdd, __spirv_GroupSMin, __spirv_GroupSMax on AMD, error
-// message `Group algorithms are not supported on host device.` on HIP Nvidia.
-// XFAIL: hip_amd || hip_nvidia
+// `Group algorithms are not supported on host device.` on HIP Nvidia.
+// XFAIL: hip_nvidia
 
 // TODO: test disabled due to sporadic fails in level_zero:gpu RT.
 // UNSUPPORTED: linux && level_zero

diff --git a/SYCL/Reduction/reduction_nd_s0_rw.cpp b/SYCL/Reduction/reduction_nd_s0_rw.cpp
@@ -3,9 +3,8 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 //
-// Missing __spirv_GroupIAdd, __spirv_GroupSMin, __spirv_GroupSMax on AMD, error
-// message `Group algorithms are not supported on host device.` on Nvidia.
-// XFAIL: hip_amd || hip_nvidia
+// `Group algorithms are not supported on host device.` on Nvidia.
+// XFAIL: hip_nvidia
 
 // TODO: test disabled due to sporadic fails in level_zero:gpu RT.
 // UNSUPPORTED: linux && level_zero

diff --git a/SYCL/Reduction/reduction_nd_s1_dw.cpp b/SYCL/Reduction/reduction_nd_s1_dw.cpp
@@ -4,9 +4,8 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 //
-// Missing __spirv_GroupIAdd, __spirv_GroupSMin, __spirv_GroupSMax on AMD, error
-// message `Group algorithms are not supported on host device.` on Nvidia.
-// XFAIL: hip_amd || hip_nvidia
+// `Group algorithms are not supported on host device.` on Nvidia.
+// XFAIL: hip_nvidia
 
 // TODO: test disabled due to sporadic fails in level_zero:gpu RT.
 // UNSUPPORTED: linux && level_zero

diff --git a/SYCL/Reduction/reduction_nd_s1_rw.cpp b/SYCL/Reduction/reduction_nd_s1_rw.cpp
@@ -3,9 +3,8 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 //
-// Missing __spirv_GroupIAdd, __spirv_GroupSMin, __spirv_GroupSMax on AMD, error
-// message `Group algorithms are not supported on host device.` on Nvidia.
-// XFAIL: hip_amd || hip_nvidia
+// `Group algorithms are not supported on host device.` on Nvidia.
+// XFAIL: hip_nvidia
 
 // TODO: test disabled due to sporadic fails in level_zero:gpu RT.
 // UNSUPPORTED: linux && level_zero

diff --git a/SYCL/Reduction/reduction_placeholder.cpp b/SYCL/Reduction/reduction_placeholder.cpp
@@ -3,9 +3,9 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 //
-// Missing __spirv_GroupIAdd, __spirv_GroupFMin on AMD, error message `Group
-// algorithms are not supported on host device.` on Nvidia.
-// XFAIL: hip_amd || hip_nvidia
+// `Group algorithms are not supported on host device.` on Nvidia.
+// XFAIL: hip_nvidia
+//
 // UNSUPPORTED: ze_debug-1,ze_debug4
 
 // RUNx: %HOST_RUN_PLACEHOLDER %t.out

diff --git a/SYCL/Reduction/reduction_queue_parallel_for.cpp b/SYCL/Reduction/reduction_queue_parallel_for.cpp
@@ -3,9 +3,8 @@
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 //
-// Missing __spirv_GroupIAdd on AMD, error message `Group algorithms are not
-// supported on host device.` on Nvidia.
-// XFAIL: hip_amd || hip_nvidia
+// `Group algorithms are not supported on host device.` on Nvidia.
+// XFAIL: hip_nvidia
 
 // TODO: test disabled due to sporadic fails in level_zero:gpu RT.
 // UNSUPPORTED: linux && level_zero

diff --git a/SYCL/Reduction/reduction_usm.cpp b/SYCL/Reduction/reduction_usm.cpp
@@ -3,9 +3,8 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 //
-// Missing __spirv_GroupIAdd, __spirv_GroupFMin, __spirv_GroupFMax on AMD, error
-// message `Group algorithms are not supported on host device.` on Nvidia.
-// XFAIL: hip_amd || hip_nvidia
+// `Group algorithms are not supported on host device.` on Nvidia.
+// XFAIL: hip_nvidia
 
 // TODO: test disabled due to sporadic fails in level_zero:gpu RT.
 // UNSUPPORTED: linux && level_zero

diff --git a/SYCL/Reduction/reduction_usm_dw.cpp b/SYCL/Reduction/reduction_usm_dw.cpp
@@ -6,9 +6,8 @@
 // TODO: test disabled due to sporadic fails in level_zero:gpu RT.
 // UNSUPPORTED: linux && level_zero
 //
-// Missing __spirv_GroupIAdd, __spirv_GroupFMin, __spirv_GroupFMax on AMD, error
-// message `Group algorithms are not supported on host device` on Nvidia.
-// XFAIL: hip_amd || hip_nvidia
+// `Group algorithms are not supported on host device` on Nvidia.
+// XFAIL: hip_nvidia
 
 // This test performs basic checks of parallel_for(nd_range, reduction, func)
 // with reductions initialized with USM var. It tests only SYCL-2020 reduction

diff --git a/SYCL/SubGroup/broadcast.cpp b/SYCL/SubGroup/broadcast.cpp
@@ -4,8 +4,6 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// XFAIL: hip_amd
-
 //==--------- broadcast.cpp - SYCL sub_group broadcast test ----*- C++ -*---==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff --git a/SYCL/SubGroup/broadcast_fp16.cpp b/SYCL/SubGroup/broadcast_fp16.cpp
@@ -1,8 +1,6 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
-// XFAIL: hip_amd
-
 //==---- broadcast_fp16.cpp - SYCL sub_group broadcast test ----*- C++ -*---==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff --git a/SYCL/SubGroup/broadcast_fp64.cpp b/SYCL/SubGroup/broadcast_fp64.cpp
@@ -4,8 +4,6 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// XFAIL: hip_amd
-
 //==----- broadcast_fp64.cpp - SYCL sub_group broadcast test ----*- C++ -*--==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff --git a/SYCL/SubGroup/generic-shuffle.cpp b/SYCL/SubGroup/generic-shuffle.cpp
@@ -1,13 +1,9 @@
-// UNSUPPORTED: hip_amd
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 //
-// Missing __spirv_SubgroupShuffleINTEL, __spirv_SubgroupShuffleUpINTEL,
-// __spirv_SubgroupShuffleDownINTEL, __spirv_SubgroupShuffleXorINTEL on AMD
-//
 //==-- generic_shuffle.cpp - SYCL sub_group generic shuffle test *- C++ -*--==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

diff --git a/SYCL/SubGroup/shuffle_fp64.cpp b/SYCL/SubGroup/shuffle_fp64.cpp
@@ -1,13 +1,9 @@
-// UNSUPPORTED: hip_amd
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 //
-// Missing __spirv_SubgroupShuffleINTEL, __spirv_SubgroupShuffleUpINTEL,
-// __spirv_SubgroupShuffleDownINTEL, __spirv_SubgroupShuffleXorINTEL on AMD
-//
 //==------- shuffle_fp64.cpp - SYCL sub_group shuffle test -----*- C++ -*---==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.