From 8890b871ad9c0502b644e2c1d5a559d5f20d5a70 Mon Sep 17 00:00:00 2001 From: Nicolas Miller Date: Thu, 30 May 2024 11:21:43 +0100 Subject: [PATCH 1/2] [SYCL][HIP] Remove unsupported from O0 tests on AMD This was tracked down to a bug in ROCm that seems to be fixed with newer versions, and the CI is now on ROCm 6+ so these should be fine. ROCm ticket: https://github.com/ROCm/clr/pull/13 The reduce over group test works on W6800 and MI210, but it seems for gfx1031 it reports not supporting shared USM, note that HIP for gfx1031 isn't officially supported by AMD. --- .../GroupAlgorithm/SYCL2020/reduce_over_group_size.cpp | 6 +++--- sycl/test-e2e/HierPar/hier_par_wgscope_O0.cpp | 4 ---- sycl/test-e2e/Regression/unoptimized_stream.cpp | 3 --- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/sycl/test-e2e/GroupAlgorithm/SYCL2020/reduce_over_group_size.cpp b/sycl/test-e2e/GroupAlgorithm/SYCL2020/reduce_over_group_size.cpp index cf9bb8cf5c850..693314b02782f 100644 --- a/sycl/test-e2e/GroupAlgorithm/SYCL2020/reduce_over_group_size.cpp +++ b/sycl/test-e2e/GroupAlgorithm/SYCL2020/reduce_over_group_size.cpp @@ -1,8 +1,8 @@ -// Test hangs on AMD with https://github.com/intel/llvm/pull/8412 -// UNSUPPORTED: hip_amd - // Windows doesn't yet have full shutdown(). // UNSUPPORTED: ze_debug && windows +// +// The CI GPU doesn't report support for shared USM +// XFAIL: hip_amd // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/HierPar/hier_par_wgscope_O0.cpp b/sycl/test-e2e/HierPar/hier_par_wgscope_O0.cpp index d9677e1b93f91..6f19d9f3cdf2a 100644 --- a/sycl/test-e2e/HierPar/hier_par_wgscope_O0.cpp +++ b/sycl/test-e2e/HierPar/hier_par_wgscope_O0.cpp @@ -5,10 +5,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// - -// Test hangs on AMD with https://github.com/intel/llvm/pull/8412 -// UNSUPPORTED: hip_amd - // RUN: %{build} -O0 -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/Regression/unoptimized_stream.cpp b/sycl/test-e2e/Regression/unoptimized_stream.cpp index 82b2b1ad0d789..12c1eea03fd03 100644 --- a/sycl/test-e2e/Regression/unoptimized_stream.cpp +++ b/sycl/test-e2e/Regression/unoptimized_stream.cpp @@ -1,6 +1,3 @@ -// Test hangs on AMD with https://github.com/intel/llvm/pull/8412 -// UNSUPPORTED: hip_amd - // RUN: %{build} -O0 -o %t.out // RUN: %{run} %t.out From d009d23baa8d4d6841d64cab4b3fea8054088159 Mon Sep 17 00:00:00 2001 From: Nicolas Miller Date: Mon, 3 Jun 2024 10:36:43 +0100 Subject: [PATCH 2/2] [SYCL] Mark reduce_over_group test as requiring shared USM Co-authored-by: Steffen Larsen --- .../GroupAlgorithm/SYCL2020/reduce_over_group_size.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sycl/test-e2e/GroupAlgorithm/SYCL2020/reduce_over_group_size.cpp b/sycl/test-e2e/GroupAlgorithm/SYCL2020/reduce_over_group_size.cpp index 693314b02782f..ed705979ac4fe 100644 --- a/sycl/test-e2e/GroupAlgorithm/SYCL2020/reduce_over_group_size.cpp +++ b/sycl/test-e2e/GroupAlgorithm/SYCL2020/reduce_over_group_size.cpp @@ -1,8 +1,6 @@ // Windows doesn't yet have full shutdown(). // UNSUPPORTED: ze_debug && windows -// -// The CI GPU doesn't report support for shared USM -// XFAIL: hip_amd +// REQUIRES: aspect-usm_shared_allocations // RUN: %{build} -o %t.out // RUN: %{run} %t.out