Skip to content

Commit 6922ad0

Browse files
[SYCL] Remove HIP Nvidia infrastructure support
As noted in intel#14432 the configuration isn't supported/tested anymore and there were some PRs removing related `XFAIL`s (intel#16287, intel#16307, and possibly others). This PR goes a step further removes all the support for that configuration.
1 parent 1a7e2f0 commit 6922ad0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+44
-76
lines changed

sycl/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -415,11 +415,6 @@ option(SYCL_INCLUDE_TESTS
415415
"Generate build targets for the SYCL unit tests."
416416
${LLVM_INCLUDE_TESTS})
417417

418-
# Ensure that HIP platform is uppercase, to match buildbot's output.
419-
if(NOT "${SYCL_BUILD_PI_HIP_PLATFORM}" STREQUAL "")
420-
string(TOUPPER ${SYCL_BUILD_PI_HIP_PLATFORM} SYCL_BUILD_PI_HIP_PLATFORM)
421-
endif()
422-
423418
add_subdirectory(tools)
424419

425420
if (WIN32)
@@ -523,7 +518,7 @@ if("hip" IN_LIST SYCL_ENABLE_BACKENDS)
523518
"HIP support requires adding \"libclc\" to the CMake argument \"LLVM_ENABLE_PROJECTS\"")
524519
endif()
525520

526-
if(NOT TARGET lld AND "${SYCL_BUILD_PI_HIP_PLATFORM}" STREQUAL "AMD")
521+
if(NOT TARGET lld)
527522
message(FATAL_ERROR
528523
"HIP support requires adding \"lld\" to the CMake argument \"LLVM_ENABLE_PROJECTS\"")
529524
endif()

sycl/test-e2e/Adapters/enqueue-arg-order-buffer.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// UNSUPPORTED: hip_nvidia
21
// RUN: %{build} -Wno-error=deprecated-declarations -o %t.out
32
// RUN: env SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s
43

sycl/test-e2e/AtomicRef/assignment_atomic64_generic.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
33
// RUN: %{run} %t.out
44

5-
// UNSUPPORTED: hip_amd
5+
// UNSUPPORTED: hip
66
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/15791
77

88
#include "assignment.h"

sycl/test-e2e/AtomicRef/exchange.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %{build} -o %t.out
22
// RUN: %{run} %t.out
33

4-
// UNSUPPORTED: hip_amd
4+
// UNSUPPORTED: hip
55
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/15791
66

77
#include "exchange.h"

sycl/test-e2e/Basic/built-ins.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// RUN: %{run} %t_var.out | FileCheck %s
66

77
// Hits an assertion and kernel page fault with AMD:
8-
// UNSUPPORTED: hip_amd
8+
// UNSUPPORTED: hip
99
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/14404
1010

1111
#include <sycl/detail/core.hpp>

sycl/test-e2e/Basic/host-task-dependency.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s
33
//
44
// TODO: Behaviour is unstable for level zero on Windows. Enable when fixed.
5-
// TODO: The test is sporadically fails on CUDA. Enable when fixed.
6-
// UNSUPPORTED: (windows && level_zero) || hip_nvidia
5+
// UNSUPPORTED: (windows && level_zero)
76

87
#define SYCL2020_DISABLE_DEPRECATION_WARNINGS
98

sycl/test-e2e/DeviceGlobal/device_global_static.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// UNSUPPORTED: opencl && gpu
55
// UNSUPPORTED-TRACKER: GSD-4287
66
//
7-
// UNSUPPORTED: hip_amd
7+
// UNSUPPORTED: hip
88
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/15329
99
//
1010
// Tests static device_global access through device kernels.

sycl/test-e2e/DeviceImageDependencies/NewOffloadDriver/free_function_kernels.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// UNSUPPORTED: cuda
99
// UNSUPPORTED-INTENDED: Not implemented yet for Nvidia/AMD backends.
1010

11-
// XFAIL: hip_amd
11+
// XFAIL: hip
1212
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/15742
1313

1414
#include <iostream>

sycl/test-e2e/DeviceImageDependencies/free_function_kernels.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// The name mangling for free function kernels currently does not work with PTX.
88
// UNSUPPORTED: cuda
99

10-
// XFAIL: hip_amd
10+
// XFAIL: hip
1111
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/15742
1212

1313
#include <iostream>

sycl/test-e2e/HierPar/hier_par_wgscope.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: %{run} %t.out
44
//
55
// Test hangs on AMD
6-
// UNSUPPORTED: hip_amd
6+
// UNSUPPORTED: hip
77

88
//==- hier_par_wgscope.cpp --- hierarchical parallelism test for WG scope---==//
99
//

0 commit comments

Comments
 (0)