Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Commit 12712bc

Browse files
npmillernpmiller
authored
[SYCL][HIP] Fix shuffles and reductions (#759)
These tests are fixed by intel/llvm#5359
1 parent 98f5b9d commit 12712bc

14 files changed

+20
-41
lines changed

‎SYCL/Reduction/reduction_big_data.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
// RUN: %ACC_RUN_PLACEHOLDER %t.out
44
// RUN: %CPU_RUN_PLACEHOLDER %t.out
55
//
6-
// Missing __spirv_GroupFMax on AMD, error message `Group algorithms are not
7-
// supported on host device` on Nvidia.
8-
// XFAIL: hip_amd || hip_nvidia
6+
// `Group algorithms are not supported on host device` on Nvidia.
7+
// XFAIL: hip_nvidia
8+
//
99
// UNSUPPORTED: ze_debug-1,ze_debug4
1010

1111
// RUNx: %HOST_RUN_PLACEHOLDER %t.out

‎SYCL/Reduction/reduction_nd_s0_dw.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
// RUN: %GPU_RUN_PLACEHOLDER %t.out
44
// RUN: %ACC_RUN_PLACEHOLDER %t.out
55
//
6-
// Missing __spirv_GroupIAdd, __spirv_GroupSMin, __spirv_GroupSMax on AMD, error
7-
// message `Group algorithms are not supported on host device.` on HIP Nvidia.
8-
// XFAIL: hip_amd || hip_nvidia
6+
// `Group algorithms are not supported on host device.` on HIP Nvidia.
7+
// XFAIL: hip_nvidia
98

109
// TODO: test disabled due to sporadic fails in level_zero:gpu RT.
1110
// UNSUPPORTED: linux && level_zero

‎SYCL/Reduction/reduction_nd_s0_rw.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
// RUN: %GPU_RUN_PLACEHOLDER %t.out
44
// RUN: %ACC_RUN_PLACEHOLDER %t.out
55
//
6-
// Missing __spirv_GroupIAdd, __spirv_GroupSMin, __spirv_GroupSMax on AMD, error
7-
// message `Group algorithms are not supported on host device.` on Nvidia.
8-
// XFAIL: hip_amd || hip_nvidia
6+
// `Group algorithms are not supported on host device.` on Nvidia.
7+
// XFAIL: hip_nvidia
98

109
// TODO: test disabled due to sporadic fails in level_zero:gpu RT.
1110
// UNSUPPORTED: linux && level_zero

‎SYCL/Reduction/reduction_nd_s1_dw.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
// RUN: %GPU_RUN_PLACEHOLDER %t.out
55
// RUN: %ACC_RUN_PLACEHOLDER %t.out
66
//
7-
// Missing __spirv_GroupIAdd, __spirv_GroupSMin, __spirv_GroupSMax on AMD, error
8-
// message `Group algorithms are not supported on host device.` on Nvidia.
9-
// XFAIL: hip_amd || hip_nvidia
7+
// `Group algorithms are not supported on host device.` on Nvidia.
8+
// XFAIL: hip_nvidia
109

1110
// TODO: test disabled due to sporadic fails in level_zero:gpu RT.
1211
// UNSUPPORTED: linux && level_zero

‎SYCL/Reduction/reduction_nd_s1_rw.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
// RUN: %GPU_RUN_PLACEHOLDER %t.out
44
// RUN: %ACC_RUN_PLACEHOLDER %t.out
55
//
6-
// Missing __spirv_GroupIAdd, __spirv_GroupSMin, __spirv_GroupSMax on AMD, error
7-
// message `Group algorithms are not supported on host device.` on Nvidia.
8-
// XFAIL: hip_amd || hip_nvidia
6+
// `Group algorithms are not supported on host device.` on Nvidia.
7+
// XFAIL: hip_nvidia
98

109
// TODO: test disabled due to sporadic fails in level_zero:gpu RT.
1110
// UNSUPPORTED: linux && level_zero

‎SYCL/Reduction/reduction_placeholder.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
// RUN: %GPU_RUN_PLACEHOLDER %t.out
44
// RUN: %ACC_RUN_PLACEHOLDER %t.out
55
//
6-
// Missing __spirv_GroupIAdd, __spirv_GroupFMin on AMD, error message `Group
7-
// algorithms are not supported on host device.` on Nvidia.
8-
// XFAIL: hip_amd || hip_nvidia
6+
// `Group algorithms are not supported on host device.` on Nvidia.
7+
// XFAIL: hip_nvidia
8+
//
99
// UNSUPPORTED: ze_debug-1,ze_debug4
1010

1111
// RUNx: %HOST_RUN_PLACEHOLDER %t.out

‎SYCL/Reduction/reduction_queue_parallel_for.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
// RUN: %ACC_RUN_PLACEHOLDER %t.out
44
// RUN: %CPU_RUN_PLACEHOLDER %t.out
55
//
6-
// Missing __spirv_GroupIAdd on AMD, error message `Group algorithms are not
7-
// supported on host device.` on Nvidia.
8-
// XFAIL: hip_amd || hip_nvidia
6+
// `Group algorithms are not supported on host device.` on Nvidia.
7+
// XFAIL: hip_nvidia
98

109
// TODO: test disabled due to sporadic fails in level_zero:gpu RT.
1110
// UNSUPPORTED: linux && level_zero

‎SYCL/Reduction/reduction_usm.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
// RUN: %GPU_RUN_PLACEHOLDER %t.out
44
// RUN: %ACC_RUN_PLACEHOLDER %t.out
55
//
6-
// Missing __spirv_GroupIAdd, __spirv_GroupFMin, __spirv_GroupFMax on AMD, error
7-
// message `Group algorithms are not supported on host device.` on Nvidia.
8-
// XFAIL: hip_amd || hip_nvidia
6+
// `Group algorithms are not supported on host device.` on Nvidia.
7+
// XFAIL: hip_nvidia
98

109
// TODO: test disabled due to sporadic fails in level_zero:gpu RT.
1110
// UNSUPPORTED: linux && level_zero

‎SYCL/Reduction/reduction_usm_dw.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
// TODO: test disabled due to sporadic fails in level_zero:gpu RT.
77
// UNSUPPORTED: linux && level_zero
88
//
9-
// Missing __spirv_GroupIAdd, __spirv_GroupFMin, __spirv_GroupFMax on AMD, error
10-
// message `Group algorithms are not supported on host device` on Nvidia.
11-
// XFAIL: hip_amd || hip_nvidia
9+
// `Group algorithms are not supported on host device` on Nvidia.
10+
// XFAIL: hip_nvidia
1211

1312
// This test performs basic checks of parallel_for(nd_range, reduction, func)
1413
// with reductions initialized with USM var. It tests only SYCL-2020 reduction

‎SYCL/SubGroup/broadcast.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
// RUN: %GPU_RUN_PLACEHOLDER %t.out
55
// RUN: %ACC_RUN_PLACEHOLDER %t.out
66

7-
// XFAIL: hip_amd
8-
97
//==--------- broadcast.cpp - SYCL sub_group broadcast test ----*- C++ -*---==//
108
//
119
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

‎SYCL/SubGroup/broadcast_fp16.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
22
// RUN: %GPU_RUN_PLACEHOLDER %t.out
33

4-
// XFAIL: hip_amd
5-
64
//==---- broadcast_fp16.cpp - SYCL sub_group broadcast test ----*- C++ -*---==//
75
//
86
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

‎SYCL/SubGroup/broadcast_fp64.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
// RUN: %GPU_RUN_PLACEHOLDER %t.out
55
// RUN: %ACC_RUN_PLACEHOLDER %t.out
66

7-
// XFAIL: hip_amd
8-
97
//==----- broadcast_fp64.cpp - SYCL sub_group broadcast test ----*- C++ -*--==//
108
//
119
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

‎SYCL/SubGroup/generic-shuffle.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
// UNSUPPORTED: hip_amd
21
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
32
// RUN: %HOST_RUN_PLACEHOLDER %t.out
43
// RUN: %CPU_RUN_PLACEHOLDER %t.out
54
// RUN: %GPU_RUN_PLACEHOLDER %t.out
65
// RUN: %ACC_RUN_PLACEHOLDER %t.out
76
//
8-
// Missing __spirv_SubgroupShuffleINTEL, __spirv_SubgroupShuffleUpINTEL,
9-
// __spirv_SubgroupShuffleDownINTEL, __spirv_SubgroupShuffleXorINTEL on AMD
10-
//
117
//==-- generic_shuffle.cpp - SYCL sub_group generic shuffle test *- C++ -*--==//
128
//
139
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

‎SYCL/SubGroup/shuffle_fp64.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
// UNSUPPORTED: hip_amd
21
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
32
// RUN: %HOST_RUN_PLACEHOLDER %t.out
43
// RUN: %CPU_RUN_PLACEHOLDER %t.out
54
// RUN: %GPU_RUN_PLACEHOLDER %t.out
65
// RUN: %ACC_RUN_PLACEHOLDER %t.out
76
//
8-
// Missing __spirv_SubgroupShuffleINTEL, __spirv_SubgroupShuffleUpINTEL,
9-
// __spirv_SubgroupShuffleDownINTEL, __spirv_SubgroupShuffleXorINTEL on AMD
10-
//
117
//==------- shuffle_fp64.cpp - SYCL sub_group shuffle test -----*- C++ -*---==//
128
//
139
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

0 commit comments

Comments
 (0)