[llvm] 99212b9 - [Mips, i686, others] Convert tests to check 'target=...'
Paul Robinson via llvm-commits
llvm-commits at lists.llvm.org
Tue Dec 6 15:13:41 PST 2022
Author: Paul Robinson
Date: 2022-12-06T15:13:32-08:00
New Revision: 99212b945adc5aa0e2cf4d30b305200284969bca
URL: https://github.com/llvm/llvm-project/commit/99212b945adc5aa0e2cf4d30b305200284969bca
DIFF: https://github.com/llvm/llvm-project/commit/99212b945adc5aa0e2cf4d30b305200284969bca.diff
LOG: [Mips,i686,others] Convert tests to check 'target=...'
Part of the project to eliminate special handling for triples in lit
expressions.
Added:
Modified:
llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
llvm/test/LTO/X86/parallel.ll
Removed:
################################################################################
diff --git a/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll b/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
index 24a732f88ecf3..5281b67ee2802 100644
--- a/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
@@ -1,6 +1,6 @@
; RUN: %lli -jit-kind=mcjit -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null
; RUN: %lli -lljit-platform=Inactive -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null
-; XFAIL: mips-, mipsel-, i686, i386
+; XFAIL: target={{(mips|mipsel)-.*}}, target={{(i686|i386).*}}
declare i32 @FB()
diff --git a/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll b/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
index a824b4a394582..80c90cbf5be39 100644
--- a/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
@@ -1,6 +1,7 @@
; REQUIRES: cxx-shared-library
; RUN: %lli -jit-kind=mcjit -relocation-model=pic -code-model=large %s
-; XFAIL: cygwin, windows-msvc, windows-gnu, mips-, mipsel-, i686, i386, aarch64, arm
+; XFAIL: target={{.*-(cygwin|windows-msvc|windows-gnu)}}
+; XFAIL: target={{(mips|mipsel)-.*}}, target={{(i686|i386).*}}, target={{(aarch64|arm).*}}
declare ptr @__cxa_allocate_exception(i64)
declare void @__cxa_throw(ptr, ptr, ptr)
declare i32 @__gxx_personality_v0(...)
diff --git a/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll b/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
index c3e52897d5fa9..ce4b9a58abcf9 100644
--- a/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
@@ -1,6 +1,6 @@
; RUN: %lli -jit-kind=mcjit -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -relocation-model=pic -code-model=small %s > /dev/null
; RUN: %lli -lljit-platform=Inactive -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -relocation-model=pic -code-model=small %s > /dev/null
-; XFAIL: mips-, mipsel-, i686, i386
+; XFAIL: target={{(mips|mipsel)-.*}}, target={{(i686|i386).*}}
declare i32 @FB()
diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll b/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
index 115aa74d6f9fa..48f592f4b59cd 100644
--- a/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
@@ -1,7 +1,8 @@
; RUN: %lli -jit-kind=mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
; RUN: -relocation-model=pic -code-model=small %s > /dev/null
-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, windows-gnu, windows-msvc
-; UNSUPPORTED: powerpc64-unknown-linux-gnu
+; XFAIL: target={{(mips|mipsel)-.*}}, target={{(aarch64|arm).*}}, target={{(i686|i386).*}}
+; XFAIL: target={{.*-windows-(gnu|msvc)}}
+; UNSUPPORTED: target=powerpc64-unknown-linux-gnu
; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
@count = global i32 1, align 4
diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll b/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
index 703e1cb354e87..28dc6bb1f7aae 100644
--- a/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
@@ -1,6 +1,7 @@
; RUN: %lli -jit-kind=mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
; RUN: -O0 -relocation-model=pic -code-model=small %s
-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, windows-gnu, windows-msvc
+; XFAIL: target={{(mips|mipsel)-.*}}, target={{(aarch64|arm).*}}, target={{(i686|i386).*}}
+; XFAIL: target={{.*-windows-(gnu|msvc)}}
; UNSUPPORTED: powerpc64-unknown-linux-gnu
; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
diff --git a/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll b/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
index cfdebf793be20..513e252a988c1 100644
--- a/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
@@ -1,5 +1,5 @@
; RUN: %lli -jit-kind=mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
-; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm
+; XFAIL: target={{(mips|mipsel)-.*}}, target={{(i686|i386).*}}, target={{(aarch64|arm).*}}
define i32 @main() nounwind {
entry:
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll b/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
index 4a348e224bbb4..8b4531d1534da 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
@@ -1,6 +1,6 @@
; RUN: %lli -jit-kind=mcjit -relocation-model=pic -code-model=small %s > /dev/null
; RUN: %lli -lljit-platform=Inactive -relocation-model=pic -code-model=small %s > /dev/null
-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
+; XFAIL: target={{(mips|mipsel)-.*}}, target={{(aarch64|arm).*}}, target={{(i686|i386).*}}
@count = global i32 1, align 4
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll b/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
index 214a9d90189bc..4e8d89536da5d 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
@@ -1,6 +1,6 @@
; RUN: %lli -jit-kind=mcjit -O0 -relocation-model=pic -code-model=small %s
; RUN: %lli -lljit-platform=Inactive -O0 -relocation-model=pic -code-model=small %s
-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
+; XFAIL: target={{(mips|mipsel)-.*}}, target={{(aarch64|arm).*}}, target={{(i686|i386).*}}
@.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
@ptr = global ptr @.str, align 4
diff --git a/llvm/test/LTO/X86/parallel.ll b/llvm/test/LTO/X86/parallel.ll
index 34235ec0202b8..03b162a973b55 100644
--- a/llvm/test/LTO/X86/parallel.ll
+++ b/llvm/test/LTO/X86/parallel.ll
@@ -4,7 +4,7 @@
; RUN: llvm-nm %t.o.1 | FileCheck --check-prefix=CHECK1 %s
; FIXME: Investigate test failures on these architectures.
-; UNSUPPORTED: mips, mipsel, aarch64, powerpc64
+; UNSUPPORTED: target={{(mips|mipsel)-.*}}, target=aarch64{{.*}}, target=powerpc64{{.*}}
target triple = "x86_64-unknown-linux-gnu"
More information about the llvm-commits
mailing list