Revert "[OpenMP] Fix two usm tests for amdgpus." (#77983)

Reverts llvm/llvm-project#77851
This commit is contained in:
carlobertolli 2024-01-12 15:01:49 -06:00 committed by GitHub
parent 4c41449edd
commit 93efa2b8b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 11 deletions

View File

@ -117,10 +117,7 @@ if config.libomptarget_current_target.startswith('nvptx'):
# If the architecture is invalid, assume it is supported.
supports_unified_shared_memory = True
if config.libomptarget_current_target.startswith('amdgcn'):
if not (config.amdgpu_test_arch == "gfx908" or
config.amdgpu_test_arch == "gfx90a" or
config.amdgpu_test_arch == "gfx942") :
supports_unified_shared_memory = False
supports_unified_shared_memory = False
if supports_unified_shared_memory:
config.available_features.add('unified_shared_memory')

View File

@ -10,7 +10,6 @@ config.test_extra_flags = "@OPENMP_TEST_FLAGS@"
config.cuda_path = "@CUDA_TOOLKIT_ROOT_DIR@"
config.cuda_libdir = "@CUDA_LIBDIR@"
config.cuda_test_arch = "@LIBOMPTARGET_DEP_CUDA_ARCH@"
config.amdgpu_test_arch = "@LIBOMPTARGET_AMDGPU_DETECTED_ARCH_LIST@"
config.libomptarget_obj_root = "@CMAKE_CURRENT_BINARY_DIR@/@CURRENT_TARGET@"
config.library_dir = "@LIBOMPTARGET_LIBRARY_DIR@"
config.llvm_library_dir = "@LIBOMPTARGET_LLVM_LIBRARY_DIR@"

View File

@ -1,9 +1,10 @@
// RUN: %libomptarget-compile-generic
// RUN: env HSA_XNACK=1 \
// RUN: %libomptarget-run-generic | %fcheck-generic
// RUN: %libomptarget-compile-run-and-check-generic
// XFAIL: nvptx64-nvidia-cuda
// XFAIL: nvptx64-nvidia-cuda-LTO
// Fails on amdgpu with error: GPU Memory Error
// UNSUPPORTED: amdgcn-amd-amdhsa
#include <omp.h>
#include <stdio.h>

View File

@ -1,11 +1,11 @@
// RUN: %libomptarget-compile-generic
// RUN: env HSA_XNACK=1 \
// RUN: %libomptarget-run-generic | %fcheck-generic
// RUN: %libomptarget-compile-run-and-check-generic
// REQUIRES: unified_shared_memory
// UNSUPPORTED: clang-6, clang-7, clang-8, clang-9
// Fails on amdgpu with error: GPU Memory Error
// Fails on nvptx with error: an illegal memory access was encountered
// XFAIL: amdgcn-amd-amdhsa
// XFAIL: nvptx64-nvidia-cuda
// XFAIL: nvptx64-nvidia-cuda-LTO