Skip to content

[SYCL] Remove HIP Nvidia tests/CI support #16611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 14, 2025
Merged

[SYCL] Remove HIP Nvidia tests/CI support #16611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6922ad0
[SYCL] Remove HIP Nvidia infrastructure support
aelovikov-intel Jan 13, 2025
37dfb6e
Revert changes in sycl/CMakeLists.txt
aelovikov-intel Jan 13, 2025
7996feb
Same change for sycl-jit/test
aelovikov-intel Jan 13, 2025
a4f8002
clang-format
aelovikov-intel Jan 13, 2025
7e8e1a4
Fix `e2e_test_requirements/no-unsupported-without-info.cpp`
aelovikov-intel Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sycl-jit/test/internalization/promote-private-non-unit-hip.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; REQUIRES: hip_amd
; REQUIRES: hip
; RUN: opt -load-pass-plugin %shlibdir/SYCLKernelJIT%shlibext \
; RUN: -passes=sycl-internalization -S %s | FileCheck %s

Expand Down
2 changes: 1 addition & 1 deletion sycl-jit/test/kernel-fusion/check-failed-remapping-amdgpu.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; REQUIRES: hip_amd
; REQUIRES: hip
; RUN: opt -load-pass-plugin %shlibdir/SYCLKernelJIT%shlibext \
; RUN: -passes=sycl-kernel-fusion -S %s | FileCheck %s

Expand Down
2 changes: 1 addition & 1 deletion sycl-jit/test/kernel-fusion/check-remapping-amdgpu.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; REQUIRES: hip_amd
; REQUIRES: hip
; RUN: opt -load-pass-plugin %shlibdir/SYCLKernelJIT%shlibext \
; RUN: -passes=sycl-kernel-fusion -S %s | FileCheck %s

Expand Down
2 changes: 1 addition & 1 deletion sycl-jit/test/kernel-fusion/check-remapping-interproc-amdgpu.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; REQUIRES: hip_amd
; REQUIRES: hip
; RUN: opt -load-pass-plugin %shlibdir/SYCLKernelJIT%shlibext \
; RUN: -passes=sycl-kernel-fusion -S %s | FileCheck %s

Expand Down
2 changes: 1 addition & 1 deletion sycl-jit/test/lit.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
if "NVPTX" in config.llvm_targets_to_build:
config.available_features.add("cuda")
if "AMDGPU" in config.llvm_targets_to_build:
config.available_features.add("hip_amd")
config.available_features.add("hip")
4 changes: 2 additions & 2 deletions sycl-jit/test/materializer/basic.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
; RUN: %if hip_amd %{ opt -load-pass-plugin %shlibdir/SYCLKernelJIT%shlibext\
; RUN: %if hip %{ opt -load-pass-plugin %shlibdir/SYCLKernelJIT%shlibext\
; RUN: --mtriple amdgcn-amd-amdhsa -passes=sycl-spec-const-materializer -S %s |\
; RUN: FileCheck --check-prefix=CHECK-MATERIALIZER %s %}

; RUN: %if cuda %{ opt -load-pass-plugin %shlibdir/SYCLKernelJIT%shlibext\
; RUN: --mtriple nvptx64-nvidia-cuda -passes=sycl-spec-const-materializer -S %s |\
; RUN: FileCheck --check-prefix=CHECK-MATERIALIZER %s %}

; RUN: %if hip_amd %{ opt -load-pass-plugin %shlibdir/SYCLKernelJIT%shlibext\
; RUN: %if hip %{ opt -load-pass-plugin %shlibdir/SYCLKernelJIT%shlibext\
; RUN: --mtriple amdgcn-amd-amdhsa -passes=sycl-spec-const-materializer,early-cse,adce -S %s |\
; RUN: FileCheck --check-prefix=CHECK-MATERIALIZER-CSE %s %}

Expand Down
4 changes: 2 additions & 2 deletions sycl-jit/test/materializer/multi_type.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
; RUN: %if hip_amd %{ opt -load-pass-plugin %shlibdir/SYCLKernelJIT%shlibext\
; RUN: %if hip %{ opt -load-pass-plugin %shlibdir/SYCLKernelJIT%shlibext\
; RUN: --mtriple amdgcn-amd-amdhsa -passes=sycl-spec-const-materializer -S %s |\
; RUN: FileCheck --check-prefix=CHECK-MATERIALIZER %s %}

; RUN: %if cuda %{ opt -load-pass-plugin %shlibdir/SYCLKernelJIT%shlibext\
; RUN: --mtriple nvptx64-nvidia-cuda -passes=sycl-spec-const-materializer -S %s |\
; RUN: FileCheck --check-prefix=CHECK-MATERIALIZER %s %}

; RUN: %if hip_amd %{ opt -load-pass-plugin %shlibdir/SYCLKernelJIT%shlibext\
; RUN: %if hip %{ opt -load-pass-plugin %shlibdir/SYCLKernelJIT%shlibext\
; RUN: --mtriple amdgcn-amd-amdhsa -passes=sycl-spec-const-materializer,early-cse -S %s |\
; RUN: FileCheck --check-prefix=CHECK-MATERIALIZER-CSE %s %}

Expand Down
1 change: 0 additions & 1 deletion sycl/test-e2e/Adapters/enqueue-arg-order-buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// UNSUPPORTED: hip_nvidia
// RUN: %{build} -Wno-error=deprecated-declarations -o %t.out
// RUN: env SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s

Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/AtomicRef/assignment_atomic64_generic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
// RUN: %{run} %t.out

// UNSUPPORTED: hip_amd
// UNSUPPORTED: hip
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/15791

#include "assignment.h"
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/AtomicRef/exchange.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

// UNSUPPORTED: hip_amd
// UNSUPPORTED: hip
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/15791

#include "exchange.h"
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Basic/built-ins.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// RUN: %{run} %t_var.out | FileCheck %s

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

#include <sycl/detail/core.hpp>
Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/Basic/host-task-dependency.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s
//
// TODO: Behaviour is unstable for level zero on Windows. Enable when fixed.
// TODO: The test is sporadically fails on CUDA. Enable when fixed.
// UNSUPPORTED: (windows && level_zero) || hip_nvidia
// UNSUPPORTED: (windows && level_zero)

#define SYCL2020_DISABLE_DEPRECATION_WARNINGS

Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/DeviceGlobal/device_global_static.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// UNSUPPORTED: opencl && gpu
// UNSUPPORTED-TRACKER: GSD-4287
//
// UNSUPPORTED: hip_amd
// UNSUPPORTED: hip
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/15329
//
// Tests static device_global access through device kernels.
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/DeviceImageDependencies/NewOffloadDriver/free_function_kernels.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// UNSUPPORTED: cuda
// UNSUPPORTED-INTENDED: Not implemented yet for Nvidia/AMD backends.

// XFAIL: hip_amd
// XFAIL: hip
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/15742

#include <iostream>
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/DeviceImageDependencies/free_function_kernels.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// The name mangling for free function kernels currently does not work with PTX.
// UNSUPPORTED: cuda

// XFAIL: hip_amd
// XFAIL: hip
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/15742

#include <iostream>
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/HierPar/hier_par_wgscope.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// RUN: %{run} %t.out
//
// Test hangs on AMD
// UNSUPPORTED: hip_amd
// UNSUPPORTED: hip

//==- hier_par_wgscope.cpp --- hierarchical parallelism test for WG scope---==//
//
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/InlineAsm/asm_16_empty.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// UNSUPPORTED: cuda || hip_nvidia
// UNSUPPORTED: cuda
// REQUIRES: gpu,linux,sg-16
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/InlineAsm/asm_8_empty.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// UNSUPPORTED: cuda || hip_nvidia
// UNSUPPORTED: cuda
// REQUIRES: gpu,linux,sg-8
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_amdgcn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// REQUIRES: hip_amd, opencl, gpu, cpu
// REQUIRES: hip, opencl, gpu, cpu
// REQUIRES: build-and-run-mode

// RUN: %clangxx -fsycl -Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch=gfx906 -fsycl-targets=amdgcn-amd-amdhsa %S/Inputs/is_compatible_with_env.cpp -o %t.out
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Printf/char.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// The test is written using conversion specifiers table from cppreference [1]
// [1]: https://en.cppreference.com/w/cpp/io/c/fprintf
//
// UNSUPPORTED: hip_amd
// UNSUPPORTED: hip
//
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out | FileCheck %s
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Printf/double.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// [1]: https://en.cppreference.com/w/cpp/io/c/fprintf
//
// REQUIRES: aspect-fp64
// UNSUPPORTED: hip_amd
// UNSUPPORTED: hip
//
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out | FileCheck %s
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Printf/float.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// The test is written using conversion specifiers table from cppreference [1]
// [1]: https://en.cppreference.com/w/cpp/io/c/fprintf
//
// UNSUPPORTED: hip_amd
// UNSUPPORTED: hip
//
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out | FileCheck %s
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Printf/int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// The test is written using conversion specifiers table from cppreference [1]
// [1]: https://en.cppreference.com/w/cpp/io/c/fprintf
//
// UNSUPPORTED: hip_amd
// UNSUPPORTED: hip
// FIXME: The 'short' type gets overflown with sporadic values on CUDA.
// XFAIL: cuda
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/14734
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Printf/mixed-address-space.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// This test is written with an aim to check that experimental::printf versions
// for constant and generic address space can be used in the same module.
//
// UNSUPPORTED: hip_amd
// UNSUPPORTED: hip
// XFAIL: cuda && windows
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/14733
// FIXME: Drop the test once generic AS support is considered stable and the
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Printf/percent-symbol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// The test is written using conversion specifiers table from cppreference [1]
// [1]: https://en.cppreference.com/w/cpp/io/c/fprintf
//
// UNSUPPORTED: hip_amd
// UNSUPPORTED: hip
// XFAIL: cuda && windows
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/14733
// RUN: %{build} -o %t.out
Expand Down
6 changes: 0 additions & 6 deletions sycl/test-e2e/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,12 +184,6 @@ at the full path specified by this variable.

***CUDA_LIBS_DIR*** - path to CUDA libraries.

***HIP_PLATFORM*** - platform selection for HIP targeted devices.
Defaults to AMD if no value is given. Supported values are:

* **AMD** - for HIP to target AMD GPUs
* **NVIDIA** - for HIP to target NVIDIA GPUs

***AMD_ARCH*** - flag may be set for when using HIP AMD triple. For example it
may be set to "gfx906". Otherwise must be provided via the ***amd_arch*** LIT
parameter (e.g., ***--param amd_arch=gfx906***) at runtime via the command line
Expand Down
3 changes: 1 addition & 2 deletions sycl/test-e2e/Regression/DAE-separate-compile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
// RUN: %{run} %t.out

// Failing on HIP AMD, enable after fixed
// UNSUPPORTED: hip_amd

// UNSUPPORTED: hip

#include <iostream>
#include <sycl/detail/core.hpp>
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Regression/static-buffer-dtor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// RUN: %{run} %t.out

// Failing on HIP AMD
// UNSUPPORTED: hip_amd
// UNSUPPORTED: hip

// Windows doesn't yet have full shutdown().
// UNSUPPORTED: ze_debug && windows
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Sampler/normalized-clampedge-nearest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Missing __spirv_ImageWrite, __spirv_SampledImage,
// __spirv_ImageSampleExplicitLod on AMD
// XFAIL: hip_amd
// XFAIL: hip
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/14732

/*
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Tracing/usm/queue_copy_released_pointer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// UNSUPPORTED: windows || hip_amd
// UNSUPPORTED: windows || hip
// RUN: %{build} -o %t.out
// RUN: not --crash env SYCL_TRACE_TERMINATE_ON_WARNING=1 %{run} sycl-trace --verify %t.out | FileCheck %s

Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Tracing/usm/queue_single_task_nullptr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// UNSUPPORTED: windows || hip_amd
// UNSUPPORTED: windows || hip
// RUN: %{build} -o %t.out
// RUN: not --crash env SYCL_TRACE_TERMINATE_ON_WARNING=1 %{run} sycl-trace --verify %t.out | FileCheck %s

Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Tracing/usm/queue_single_task_released_pointer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// UNSUPPORTED: windows || hip_amd
// UNSUPPORTED: windows || hip
// RUN: %{build} -o %t.out
// RUN: not --crash env SYCL_TRACE_TERMINATE_ON_WARNING=1 %{run} sycl-trace --verify %t.out | FileCheck %s

Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/USM/memadvise_flags.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %{build} -o %t1.out
// REQUIRES: cuda || hip_amd
// REQUIRES: cuda || hip
// RUN: %{run} %t1.out

//==---------------- memadvise_flags.cpp -----------------------------------==//
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/USM/memops2d/copy2d_dhost_to_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// Temporarily disabled until the failure is addressed.
// UNSUPPORTED: (level_zero && windows)

// UNSUPPORTED: (gpu-intel-dg2 || hip_amd) && linux
// UNSUPPORTED: (gpu-intel-dg2 || hip) && linux
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/15648

#include "copy2d_common.hpp"
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/USM/memops2d/copy2d_host_to_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// Temporarily disabled until the failure is addressed.
// UNSUPPORTED: (level_zero && windows)

// UNSUPPORTED: (gpu-intel-dg2 || hip_amd) && linux
// UNSUPPORTED: (gpu-intel-dg2 || hip) && linux
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/15648

#include "copy2d_common.hpp"
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/USM/memops2d/copy2d_shared_to_dhost.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// Temporarily disabled until the failure is addressed.
// UNSUPPORTED: (level_zero && windows)

// UNSUPPORTED: (gpu-intel-dg2 || hip_amd) && linux
// UNSUPPORTED: (gpu-intel-dg2 || hip) && linux
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/15648

#include "copy2d_common.hpp"
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/USM/memops2d/copy2d_shared_to_host.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// Temporarily disabled until the failure is addressed.
// UNSUPPORTED: (level_zero && windows)

// UNSUPPORTED: (gpu-intel-dg2 || hip_amd) && linux
// UNSUPPORTED: (gpu-intel-dg2 || hip) && linux
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/15648

#include "copy2d_common.hpp"
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/USM/memops2d/memcpy2d_dhost_to_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// Temporarily disabled until the failure is addressed.
// UNSUPPORTED: (level_zero && windows)

// UNSUPPORTED: (gpu-intel-dg2 || hip_amd) && linux
// UNSUPPORTED: (gpu-intel-dg2 || hip) && linux
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/15648

#include "memcpy2d_common.hpp"
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/USM/memops2d/memcpy2d_host_to_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// Temporarily disabled until the failure is addressed.
// UNSUPPORTED: (level_zero && windows)

// UNSUPPORTED: (gpu-intel-dg2 || hip_amd) && linux
// UNSUPPORTED: (gpu-intel-dg2 || hip) && linux
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/15648

#include "memcpy2d_common.hpp"
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/USM/memops2d/memcpy2d_shared_to_dhost.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

// UNSUPPORTED: (gpu-intel-dg2 || hip_amd) && linux
// UNSUPPORTED: (gpu-intel-dg2 || hip) && linux
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/15648

// Temporarily disabled until the failure is addressed.
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/USM/memops2d/memcpy2d_shared_to_host.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// Temporarily disabled until the failure is addressed.
// UNSUPPORTED: (level_zero && windows)

// UNSUPPORTED: (gpu-intel-dg2 || hip_amd) && linux
// UNSUPPORTED: (gpu-intel-dg2 || hip) && linux
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/15648

#include "memcpy2d_common.hpp"
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/USM/memory_coherency_hip.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %{build} -o %t1.out
// REQUIRES: hip_amd
// REQUIRES: hip
// RUN: %{run} %t1.out

//==---- memory_coherency_hip.cpp -----------------------------------------==//
Expand Down
5 changes: 1 addition & 4 deletions sycl/test-e2e/format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ def get_triple(test, backend):
if backend == "cuda":
return "nvptx64-nvidia-cuda"
if backend == "hip":
if test.config.hip_platform == "NVIDIA":
return "nvptx64-nvidia-cuda"
else:
return "amdgcn-amd-amdhsa"
return "amdgcn-amd-amdhsa"
if backend == "native_cpu":
return "native_cpu"
return "spir64"
Expand Down
Loading
Loading