[NVPTX] Convert tests to check 'target=nvptx.*'

pogo59 · pogo59 · commit f4eb87f40336 · 2022-12-01T09:01:48.000-08:00
Part of the project to eliminate special handling for triples in lit
expressions.
diff --git a/llvm/test/CodeGen/Generic/2007-12-17-InvokeAsm.ll b/llvm/test/CodeGen/Generic/2007-12-17-InvokeAsm.ll
@@ -1,7 +1,7 @@
 ; RUN: llc -no-integrated-as < %s
 
 ; The test uses inline assembly with x86-specific constraints.
-; UNSUPPORTED: nvptx
+; UNSUPPORTED: target=nvptx{{.*}}
 
 
 define fastcc void @bc__support__high_resolution_time__initialize_clock_rate() personality i32 (...)* @__gxx_personality_v0 {
diff --git a/llvm/test/CodeGen/Generic/2009-03-17-LSR-APInt.ll b/llvm/test/CodeGen/Generic/2009-03-17-LSR-APInt.ll
@@ -2,7 +2,7 @@
 ; PR3806
 
 ; NVPTX does not support 'alias' yet
-; XFAIL: nvptx
+; XFAIL: target=nvptx{{.*}}
 
 	%struct..0__pthread_mutex_s = type { i32, i32, i32, i32, i32, i32, %struct.__pthread_list_t }
 	%struct.Alignment = type { i32 }
diff --git a/llvm/test/CodeGen/Generic/2010-11-04-BigByval.ll b/llvm/test/CodeGen/Generic/2010-11-04-BigByval.ll
@@ -4,7 +4,7 @@
 ; The test is intentionally disabled only for the NVPTX target
 ; (i.e. not for nvptx-registered-target feature) due to excessive runtime.
 ; Please note, that there are NVPTX special testcases for "byval"
-; UNSUPPORTED: nvptx
+; UNSUPPORTED: target=nvptx{{.*}}
 
 %big = type [131072 x i8]
 
diff --git a/llvm/test/CodeGen/Generic/2010-ZeroSizedArg.ll b/llvm/test/CodeGen/Generic/2010-ZeroSizedArg.ll
@@ -2,7 +2,7 @@
 ; PR4975
 
 ; NVPTX does not support zero sized type arg
-; UNSUPPORTED: nvptx
+; UNSUPPORTED: target=nvptx{{.*}}
 
 %0 = type <{ [0 x i32] }>
 %union.T0 = type { }
diff --git a/llvm/test/CodeGen/Generic/APIntLoadStore.ll b/llvm/test/CodeGen/Generic/APIntLoadStore.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s > %t
 
 ; NVPTX does not support arbitrary integer types and has acceptable subset tested in NVPTX/APIntLoadStore.ll
-; UNSUPPORTED: nvptx
+; UNSUPPORTED: target=nvptx{{.*}}
 
 @i1_l = external global i1		; <i1*> [#uses=1]
 @i1_s = external global i1		; <i1*> [#uses=1]
diff --git a/llvm/test/CodeGen/Generic/APIntParam.ll b/llvm/test/CodeGen/Generic/APIntParam.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s > %t
 
 ; NVPTX does not support arbitrary integer types and has acceptable subset tested in NVPTX/APIntParam.ll
-; UNSUPPORTED: nvptx
+; UNSUPPORTED: target=nvptx{{.*}}
 
 @i1_s = external global i1		; <i1*> [#uses=1]
 @i2_s = external global i2		; <i2*> [#uses=1]
diff --git a/llvm/test/CodeGen/Generic/APIntSextParam.ll b/llvm/test/CodeGen/Generic/APIntSextParam.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s > %t
 
 ; NVPTX does not support arbitrary integer types and has acceptable subset tested in NVPTX/APIntSextParam.ll
-; UNSUPPORTED: nvptx
+; UNSUPPORTED: target=nvptx{{.*}}
 
 @i1_s = external global i1		; <i1*> [#uses=1]
 @i2_s = external global i2		; <i2*> [#uses=1]
diff --git a/llvm/test/CodeGen/Generic/APIntZextParam.ll b/llvm/test/CodeGen/Generic/APIntZextParam.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s > %t
 
 ; NVPTX does not support arbitrary integer types and has acceptable subset tested in NVPTX/APIntZextParam.ll
-; UNSUPPORTED: nvptx
+; UNSUPPORTED: target=nvptx{{.*}}
 
 @i1_s = external global i1		; <i1*> [#uses=1]
 @i2_s = external global i2		; <i2*> [#uses=1]
diff --git a/llvm/test/CodeGen/Generic/ForceStackAlign.ll b/llvm/test/CodeGen/Generic/ForceStackAlign.ll
@@ -9,7 +9,7 @@
 ; XFAIL: sparc
 
 ; NVPTX cannot select dynamic_stackalloc
-; XFAIL: nvptx
+; XFAIL: target=nvptx{{.*}}
 
 define i32 @f(i8* %p) nounwind {
 entry:
diff --git a/llvm/test/CodeGen/Generic/add-with-overflow-128.ll b/llvm/test/CodeGen/Generic/add-with-overflow-128.ll
@@ -2,7 +2,7 @@
 
 ; NVPTX fails to LowerFormalArguments for arg type i96
 ; the arg byte size must be one of the {16, 8, 4, 2}
-; XFAIL: nvptx
+; XFAIL: target=nvptx{{.*}}
 
 @ok = internal constant [4 x i8] c"%d\0A\00"
 @no = internal constant [4 x i8] c"no\0A\00"
diff --git a/llvm/test/CodeGen/Generic/addr-label.ll b/llvm/test/CodeGen/Generic/addr-label.ll
@@ -4,7 +4,7 @@
 ; REQUIRES: arm-registered-target
 
 ; NVPTX cannot select BlockAddress
-; XFAIL: nvptx
+; XFAIL: target=nvptx{{.*}}
 
 ;; Reference to a label that gets deleted.
 define i8* @test1() nounwind {
diff --git a/llvm/test/CodeGen/Generic/empty-load-store.ll b/llvm/test/CodeGen/Generic/empty-load-store.ll
@@ -2,7 +2,7 @@
 ; PR2612
 
 ; Triggers a crash on assertion as NVPTX does not support 0-sized arrays.
-; UNSUPPORTED: nvptx
+; UNSUPPORTED: target=nvptx{{.*}}
 
 @current_foo = internal global {  } zeroinitializer
 
diff --git a/llvm/test/CodeGen/Generic/externally_available.ll b/llvm/test/CodeGen/Generic/externally_available.ll
@@ -6,7 +6,7 @@
 ; so that users won't run into errors in situations like:
 ; clang -target powerpc-ibm-aix -xc -<<<$'extern inline __attribute__((__gnu_inline__)) void foo() {}\nvoid bar() { foo(); }' -O -Xclang -disable-llvm-passes
 
-; XFAIL: nvptx
+; XFAIL: target=nvptx{{.*}}
 ; unexpected emitting of the global var, while the function is not emitted as expected
 
 ; test_function should not be emitted to the .s file.
diff --git a/llvm/test/CodeGen/Generic/fpowi-promote.ll b/llvm/test/CodeGen/Generic/fpowi-promote.ll
@@ -3,7 +3,7 @@
 ; PR1239
 
 ; Undefined external symbol "__powisf2"
-; XFAIL: nvptx
+; XFAIL: target=nvptx{{.*}}
 
 define float @test(float %tmp23302331, i32 %tmp23282329 ) {
 
diff --git a/llvm/test/CodeGen/Generic/icmp-illegal.ll b/llvm/test/CodeGen/Generic/icmp-illegal.ll
@@ -2,7 +2,7 @@
 
 ; NVPTX fails to LowerFormalArguments for arg size > i128
 ; the arg byte size must be one of the {16, 8, 4, 2}
-; XFAIL: nvptx
+; XFAIL: target=nvptx{{.*}}
 
 ; CHECK-LABEL: test_ult
 define i1 @test_ult(i256 %a) nounwind {
diff --git a/llvm/test/CodeGen/Generic/intrinsics.ll b/llvm/test/CodeGen/Generic/intrinsics.ll
@@ -2,7 +2,7 @@
 ; RUN: llc -O0 < %s
 
 ; NVPTX can't select sinf(float)/sin(double)
-; XFAIL: nvptx
+; XFAIL: target=nvptx{{.*}}
 
 ;; SQRT
 declare float @llvm.sqrt.f32(float)
diff --git a/llvm/test/CodeGen/Generic/live-debug-label.ll b/llvm/test/CodeGen/Generic/live-debug-label.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -stop-after=virtregrewriter -o - | FileCheck %s
 ;
 ; NVPTX produces a different order of the BBs
-; XFAIL: nvptx
+; XFAIL: target=nvptx{{.*}}
 
 ; Generated with "clang++ -g -O1 -S -emit-llvm"
 ;
diff --git a/llvm/test/CodeGen/Generic/llc-start-stop.ll b/llvm/test/CodeGen/Generic/llc-start-stop.ll
@@ -1,5 +1,5 @@
 ; NVPTX customizes the list of passes so the test cannot find what it expects
-; XFAIL: nvptx
+; XFAIL: target=nvptx{{.*}}
 
 ; Note: -verify-machineinstrs is used in order to make this test compatible with EXPENSIVE_CHECKS.
 ; RUN: llc < %s -debug-pass=Structure -stop-after=loop-reduce -verify-machineinstrs -o /dev/null 2>&1 \
diff --git a/llvm/test/CodeGen/Generic/pr12507.ll b/llvm/test/CodeGen/Generic/pr12507.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s
 
 ; NVPTX failed to lower arg i160, as size > 64
-; UNSUPPORTED: nvptx
+; UNSUPPORTED: target=nvptx{{.*}}
 
 @c = external global i32, align 4
 
diff --git a/llvm/test/CodeGen/Generic/pr24662.ll b/llvm/test/CodeGen/Generic/pr24662.ll
@@ -2,7 +2,7 @@
 ; RUN: llc < %s
 
 ; NVPTX failed to lower i670010, as size > 64
-; UNSUPPORTED: nvptx
+; UNSUPPORTED: target=nvptx{{.*}}
 
 define i60 @PR24662a() {
   ret i60 trunc (i670010 fptoui(float 0x400D9999A0000000 to i670010) to i60)
diff --git a/llvm/test/CodeGen/Generic/stacksave-restore.ll b/llvm/test/CodeGen/Generic/stacksave-restore.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s
 
 ; NVPTX can not select llvm.stacksave (dynamic_stackalloc) and llvm.stackrestore
-; UNSUPPORTED: nvptx
+; UNSUPPORTED: target=nvptx{{.*}}
 
 declare i8* @llvm.stacksave()
 
diff --git a/llvm/test/CodeGen/Generic/zero-sized-array.ll b/llvm/test/CodeGen/Generic/zero-sized-array.ll
@@ -2,7 +2,7 @@
 ; PR9900
 
 ; NVPTX does not support zero sized type arg
-; UNSUPPORTED: nvptx
+; UNSUPPORTED: target=nvptx{{.*}}
 
 %zero = type [0 x i8]
 %foobar = type { i32, %zero }
diff --git a/llvm/test/CodeGen/MLRegalloc/default-eviction-advisor.ll b/llvm/test/CodeGen/MLRegalloc/default-eviction-advisor.ll
@@ -8,7 +8,7 @@
 ; RUN: llc -O2 -regalloc-enable-advisor=default < %s 2>&1 | FileCheck %s --check-prefix=DEFAULT
 
 ; regalloc-enable-advisor is not enabled for NVPTX
-; UNSUPPORTED: nvptx
+; UNSUPPORTED: target=nvptx{{.*}}
 
 define void @f2(i64 %lhs, i64 %rhs, i64* %addr) {
   %sum = add i64 %lhs, %rhs
diff --git a/llvm/test/CodeGen/MLRegalloc/default-priority-advisor.ll b/llvm/test/CodeGen/MLRegalloc/default-priority-advisor.ll
@@ -8,7 +8,7 @@
 ; RUN: llc -O2 -regalloc-enable-priority-advisor=default < %s 2>&1 | FileCheck %s --check-prefix=DEFAULT
 
 ; regalloc-enable-priority-advisor is not enabled for NVPTX
-; UNSUPPORTED: nvptx
+; UNSUPPORTED: target=nvptx{{.*}}
 
 define void @f2(i64 %lhs, i64 %rhs, i64* %addr) {
   %sum = add i64 %lhs, %rhs
diff --git a/llvm/test/Feature/optnone-llc.ll b/llvm/test/Feature/optnone-llc.ll
@@ -6,7 +6,7 @@
 ; RUN: llc -O1 -debug-only=isel -fast-isel=false %s -o /dev/null 2>&1 | FileCheck %s --check-prefix=NOFAST
 
 ; REQUIRES: asserts, default_triple
-; UNSUPPORTED: nvptx
+; UNSUPPORTED: target=nvptx{{.*}}
 
 ; This test verifies that we don't run Machine Function optimizations
 ; on optnone functions, and that we can turn off FastISel.
diff --git a/llvm/test/MC/AsmParser/include.ll b/llvm/test/MC/AsmParser/include.ll
@@ -1,5 +1,5 @@
 ; RUN: llc -I %p/Inputs -filetype asm -o - %s | FileCheck %s
-; UNSUPPORTED: -zos,nvptx
+; UNSUPPORTED: -zos,target=nvptx{{.*}}
 ; REQUIRES: default_triple
 
 module asm ".include \22module.x\22"
diff --git a/llvm/test/MC/AsmParser/macro-same-context.ll b/llvm/test/MC/AsmParser/macro-same-context.ll
@@ -1,6 +1,6 @@
 ;; Test that macros in inline assembly blocks share the same context,
 ;; thus a definition is available to the whole file. PR36110
-; UNSUPPORTED: -zos,nvptx
+; UNSUPPORTED: -zos,target=nvptx{{.*}}
 ; RUN: not llc < %s 2>&1 | FileCheck %s
 ; REQUIRES: default_triple
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`; RUN: llc < %s -stop-after=virtregrewriter -o - \| FileCheck %s`
`2`	`2`	`;`
`3`	`3`	`; NVPTX produces a different order of the BBs`
`4`		`-; XFAIL: nvptx`
	`4`	`+; XFAIL: target=nvptx{{.*}}`
`5`	`5`
`6`	`6`	`; Generated with "clang++ -g -O1 -S -emit-llvm"`
`7`	`7`	`;`