[llvm] 26e50c4 - [ARM/Darwin] Convert tests to check 'target='

[Paul Robinson via llvm-commits]

Author: Paul Robinson
Date: 2022-12-06T06:58:39-08:00
New Revision: 26e50c4c4df10de7bd8fcad520bf11ab94331eac

URL: https://github.com/llvm/llvm-project/commit/26e50c4c4df10de7bd8fcad520bf11ab94331eac
DIFF: https://github.com/llvm/llvm-project/commit/26e50c4c4df10de7bd8fcad520bf11ab94331eac.diff

LOG: [ARM/Darwin] Convert tests to check 'target='

Part of the project to eliminate special handling for triples in lit
expressions.

Added: 
    

Modified: 
    clang/test/CodeGen/2004-02-13-IllegalVararg.c
    clang/test/Driver/clang-offload-bundler-asserts-on.c
    clang/test/Driver/clang-offload-bundler.c
    clang/test/Index/pch-from-libclang.c
    clang/test/Interpreter/simple-exception.cpp
    llvm/test/DebugInfo/Generic/empty.ll
    llvm/test/DebugInfo/Generic/gmlt.test
    llvm/test/ExecutionEngine/MCJIT/test-global-ctors.ll

Removed: 
    


################################################################################
diff  --git a/clang/test/CodeGen/2004-02-13-IllegalVararg.c b/clang/test/CodeGen/2004-02-13-IllegalVararg.c
index b3acda1f9e72f..9a2d286b77766 100644
--- a/clang/test/CodeGen/2004-02-13-IllegalVararg.c
+++ b/clang/test/CodeGen/2004-02-13-IllegalVararg.c
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1  %s -w -emit-llvm -o -
 
 // https://bugs.llvm.org/show_bug.cgi?id=46644#c6
-// XFAIL: arm64-apple
+// XFAIL: target=arm64-apple-{{.*}}
 
 float test(int X, ...) {
   __builtin_va_list ap;

diff  --git a/clang/test/Driver/clang-offload-bundler-asserts-on.c b/clang/test/Driver/clang-offload-bundler-asserts-on.c
index e92ecdf0107aa..aceda09f7bfa1 100644
--- a/clang/test/Driver/clang-offload-bundler-asserts-on.c
+++ b/clang/test/Driver/clang-offload-bundler-asserts-on.c
@@ -1,6 +1,6 @@
 // REQUIRES: x86-registered-target
 // REQUIRES: asserts
-// UNSUPPORTED: darwin, target={{.*}}-aix{{.*}}
+// UNSUPPORTED: target={{.*}}-darwin{{.*}}, target={{.*}}-aix{{.*}}
 
 // Generate the file we can bundle.
 // RUN: %clang -O0 -target %itanium_abi_triple %s -c -o %t.o

diff  --git a/clang/test/Driver/clang-offload-bundler.c b/clang/test/Driver/clang-offload-bundler.c
index 9c4b7cd2cc996..b803db5f90ca8 100644
--- a/clang/test/Driver/clang-offload-bundler.c
+++ b/clang/test/Driver/clang-offload-bundler.c
@@ -1,6 +1,6 @@
 // REQUIRES: x86-registered-target
 // REQUIRES: powerpc-registered-target
-// UNSUPPORTED: darwin, target={{.*}}-aix{{.*}}
+// UNSUPPORTED: target={{.*}}-darwin{{.*}}, target={{.*}}-aix{{.*}}
 
 //
 // Generate all the types of files we can bundle.

diff  --git a/clang/test/Index/pch-from-libclang.c b/clang/test/Index/pch-from-libclang.c
index 5ad5ecb9157a0..52722b629982c 100644
--- a/clang/test/Index/pch-from-libclang.c
+++ b/clang/test/Index/pch-from-libclang.c
@@ -1,7 +1,7 @@
 // Check that clang can use a PCH created from libclang.
 
 // https://PR46644
-// XFAIL: arm64-apple
+// XFAIL: target=arm64-apple-{{.*}}
 
 // This test doesn't use -fdisable-module-hash and hence requires that
 // CompilerInvocation::getModuleHash() computes exactly the same hash

diff  --git a/clang/test/Interpreter/simple-exception.cpp b/clang/test/Interpreter/simple-exception.cpp
index 5af656396d4a3..57e14e47a30a1 100644
--- a/clang/test/Interpreter/simple-exception.cpp
+++ b/clang/test/Interpreter/simple-exception.cpp
@@ -1,6 +1,7 @@
 // clang-format off
 // UNSUPPORTED: system-aix
-// XFAIL: arm, arm64-apple, system-windows
+// XFAIL for arm and arm64, or running on Windows.
+// XFAIL: target=arm{{.*}}, system-windows
 // RUN: cat %s | clang-repl | FileCheck %s
 extern "C" int printf(const char *, ...);
 

diff  --git a/llvm/test/DebugInfo/Generic/empty.ll b/llvm/test/DebugInfo/Generic/empty.ll
index 83b2e40b4328a..8de50ff23bb5b 100644
--- a/llvm/test/DebugInfo/Generic/empty.ll
+++ b/llvm/test/DebugInfo/Generic/empty.ll
@@ -3,7 +3,7 @@
 ; RUN: %llc_dwarf -split-dwarf-file=foo.dwo < %s -filetype=obj | llvm-dwarfdump -v - | FileCheck --check-prefix=FISSION %s
 
 ; darwin has a workaround for a linker bug so it always emits one line table entry
-; XFAIL: darwin
+; XFAIL: target={{.*}}-darwin{{.*}}
 
 ; Expect no line table entry since there are no functions and file references in this compile unit
 ; CHECK: .debug_line contents:

diff  --git a/llvm/test/DebugInfo/Generic/gmlt.test b/llvm/test/DebugInfo/Generic/gmlt.test
index 2b82cef8cb052..3cb3d9c14761c 100644
--- a/llvm/test/DebugInfo/Generic/gmlt.test
+++ b/llvm/test/DebugInfo/Generic/gmlt.test
@@ -1,4 +1,4 @@
 ; RUN: %llc_dwarf -O0 -filetype=obj < %S/../Inputs/gmlt.ll | llvm-dwarfdump -v - | FileCheck %S/../Inputs/gmlt.ll
 
 ; There's a darwin specific test in X86/gmlt, so it's okay to XFAIL this here.
-; XFAIL: darwin
+; XFAIL: target={{.*}}-darwin{{.*}}

diff  --git a/llvm/test/ExecutionEngine/MCJIT/test-global-ctors.ll b/llvm/test/ExecutionEngine/MCJIT/test-global-ctors.ll
index 1dbe9398065d0..2e95e7eda588a 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-global-ctors.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-global-ctors.ll
@@ -1,6 +1,6 @@
 ; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
-; UNSUPPORTED: darwin
+; UNSUPPORTED: target={{.*}}-darwin{{.*}}
 @var = global i32 1, align 4
 @llvm.global_ctors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 65535, ptr @ctor_func, ptr null }]
 @llvm.global_dtors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 65535, ptr @dtor_func, ptr null }]