Author: carlobertolli Date: 2024-01-12T15:01:30-06:00 New Revision: 09a3a18b2d9a83c1f0399f60fe7673af40edcee4
URL: https://github.com/llvm/llvm-project/commit/09a3a18b2d9a83c1f0399f60fe7673af40edcee4 DIFF: https://github.com/llvm/llvm-project/commit/09a3a18b2d9a83c1f0399f60fe7673af40edcee4.diff LOG: Revert "[OpenMP] Fix two usm tests for amdgpus." Added: Modified: openmp/libomptarget/test/lit.cfg openmp/libomptarget/test/lit.site.cfg.in openmp/libomptarget/test/unified_shared_memory/api.c openmp/libomptarget/test/unified_shared_memory/close_enter_exit.c Removed: ################################################################################ diff --git a/openmp/libomptarget/test/lit.cfg b/openmp/libomptarget/test/lit.cfg index b278c3a248fe47..9078561e3198e6 100644 --- a/openmp/libomptarget/test/lit.cfg +++ b/openmp/libomptarget/test/lit.cfg @@ -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') diff --git a/openmp/libomptarget/test/lit.site.cfg.in b/openmp/libomptarget/test/lit.site.cfg.in index 7c75aaa18fa770..2d638118838727 100644 --- a/openmp/libomptarget/test/lit.site.cfg.in +++ b/openmp/libomptarget/test/lit.site.cfg.in @@ -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@" diff --git a/openmp/libomptarget/test/unified_shared_memory/api.c b/openmp/libomptarget/test/unified_shared_memory/api.c index 0c6a937dab7faa..4f0f93b9bf5096 100644 --- a/openmp/libomptarget/test/unified_shared_memory/api.c +++ b/openmp/libomptarget/test/unified_shared_memory/api.c @@ -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> diff --git a/openmp/libomptarget/test/unified_shared_memory/close_enter_exit.c b/openmp/libomptarget/test/unified_shared_memory/close_enter_exit.c index b116c652f47e99..71be4c9177b063 100644 --- a/openmp/libomptarget/test/unified_shared_memory/close_enter_exit.c +++ b/openmp/libomptarget/test/unified_shared_memory/close_enter_exit.c @@ -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 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits