From 471b138cd2a444a946591271c9c1b668e396c616 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Fri, 9 Dec 2022 00:52:21 +0300 Subject: [PATCH] [NFC] Port all Verifier tests to `-passes=` syntax --- llvm/test/Verifier/dbg-invalid-vector.ll | 2 +- llvm/test/Verifier/di-subroutine-localvar.ll | 2 +- llvm/test/Verifier/fp-intrinsics.ll | 10 +++++----- llvm/test/Verifier/non-integral-pointers.ll | 2 +- llvm/test/Verifier/preallocated-valid.ll | 2 +- llvm/test/Verifier/recursive-struct-param.ll | 2 +- llvm/test/Verifier/statepoint.ll | 2 +- llvm/test/Verifier/swifttailcc-musttail-valid.ll | 2 +- llvm/test/Verifier/tbaa.ll | 2 +- llvm/test/Verifier/vp-intrinsics.ll | 2 +- llvm/test/Verifier/weak-dllimport.ll | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/llvm/test/Verifier/dbg-invalid-vector.ll b/llvm/test/Verifier/dbg-invalid-vector.ll index 0f5156a..6b5e1ca 100644 --- a/llvm/test/Verifier/dbg-invalid-vector.ll +++ b/llvm/test/Verifier/dbg-invalid-vector.ll @@ -1,4 +1,4 @@ -; RUN: opt -temporarily-allow-old-pass-syntax -verify -disable-output <%s 2>&1 | FileCheck %s +; RUN: opt -passes=verify -disable-output <%s 2>&1 | FileCheck %s ; ; This test creates an invalid vector by defining multiple elements for the ; vector's DICompositeType definition. A vector should only have one element diff --git a/llvm/test/Verifier/di-subroutine-localvar.ll b/llvm/test/Verifier/di-subroutine-localvar.ll index 76d6412f..d4edc4a 100644 --- a/llvm/test/Verifier/di-subroutine-localvar.ll +++ b/llvm/test/Verifier/di-subroutine-localvar.ll @@ -1,4 +1,4 @@ -; RUN: opt -temporarily-allow-old-pass-syntax %s -verify 2>&1 | FileCheck %s +; RUN: opt %s -passes=verify 2>&1 | FileCheck %s ; CHECK: invalid type ; CHECK: !20 = !DILocalVariable(name: "f", scope: !21, file: !13, line: 970, type: !14) ; CHECK: !14 = !DISubroutineType(types: !15) diff --git a/llvm/test/Verifier/fp-intrinsics.ll b/llvm/test/Verifier/fp-intrinsics.ll index b3257e4..cabb1ae 100644 --- a/llvm/test/Verifier/fp-intrinsics.ll +++ b/llvm/test/Verifier/fp-intrinsics.ll @@ -1,8 +1,8 @@ -; RUN: opt -temporarily-allow-old-pass-syntax -verify -S < %s 2>&1 | FileCheck --check-prefix=CHECK1 %s -; RUN: sed -e s/.T2:// %s | not opt -temporarily-allow-old-pass-syntax -verify -disable-output 2>&1 | FileCheck --check-prefix=CHECK2 %s -; RUN: sed -e s/.T3:// %s | not opt -temporarily-allow-old-pass-syntax -verify -disable-output 2>&1 | FileCheck --check-prefix=CHECK3 %s -; RUN: sed -e s/.T4:// %s | not opt -temporarily-allow-old-pass-syntax -verify -disable-output 2>&1 | FileCheck --check-prefix=CHECK4 %s -; RUN: sed -e s/.T5:// %s | not opt -temporarily-allow-old-pass-syntax -verify -disable-output 2>&1 | FileCheck --check-prefix=CHECK5 %s +; RUN: opt -passes=verify -S < %s 2>&1 | FileCheck --check-prefix=CHECK1 %s +; RUN: sed -e s/.T2:// %s | not opt -passes=verify -disable-output 2>&1 | FileCheck --check-prefix=CHECK2 %s +; RUN: sed -e s/.T3:// %s | not opt -passes=verify -disable-output 2>&1 | FileCheck --check-prefix=CHECK3 %s +; RUN: sed -e s/.T4:// %s | not opt -passes=verify -disable-output 2>&1 | FileCheck --check-prefix=CHECK4 %s +; RUN: sed -e s/.T5:// %s | not opt -passes=verify -disable-output 2>&1 | FileCheck --check-prefix=CHECK5 %s ; Common declarations used for all runs. declare double @llvm.experimental.constrained.fadd.f64(double, double, metadata, metadata) diff --git a/llvm/test/Verifier/non-integral-pointers.ll b/llvm/test/Verifier/non-integral-pointers.ll index 29b57b4..30090fe 100644 --- a/llvm/test/Verifier/non-integral-pointers.ll +++ b/llvm/test/Verifier/non-integral-pointers.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -temporarily-allow-old-pass-syntax -verify -S < %s 2>&1 | FileCheck %s +; RUN: opt -passes=verify -S < %s 2>&1 | FileCheck %s target datalayout = "e-ni:4:6" diff --git a/llvm/test/Verifier/preallocated-valid.ll b/llvm/test/Verifier/preallocated-valid.ll index 09bd746..4a1bbb3 100644 --- a/llvm/test/Verifier/preallocated-valid.ll +++ b/llvm/test/Verifier/preallocated-valid.ll @@ -1,4 +1,4 @@ -; RUN: opt -temporarily-allow-old-pass-syntax -S %s -verify +; RUN: opt -S %s -passes=verify declare token @llvm.call.preallocated.setup(i32) declare i8* @llvm.call.preallocated.arg(token, i32) diff --git a/llvm/test/Verifier/recursive-struct-param.ll b/llvm/test/Verifier/recursive-struct-param.ll index 57b49ab..6c8fe956 100644 --- a/llvm/test/Verifier/recursive-struct-param.ll +++ b/llvm/test/Verifier/recursive-struct-param.ll @@ -1,4 +1,4 @@ -; RUN: opt -temporarily-allow-old-pass-syntax -verify < %s +; RUN: opt -passes=verify < %s %struct.__sFILE = type { %struct.__sFILE } diff --git a/llvm/test/Verifier/statepoint.ll b/llvm/test/Verifier/statepoint.ll index 1b91aee..feb3679 100644 --- a/llvm/test/Verifier/statepoint.ll +++ b/llvm/test/Verifier/statepoint.ll @@ -1,4 +1,4 @@ -; RUN: opt -temporarily-allow-old-pass-syntax -S %s -verify | FileCheck %s +; RUN: opt -S %s -passes=verify | FileCheck %s declare void @use(...) declare i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(token, i32, i32) diff --git a/llvm/test/Verifier/swifttailcc-musttail-valid.ll b/llvm/test/Verifier/swifttailcc-musttail-valid.ll index 916d2ca..d33a135 100644 --- a/llvm/test/Verifier/swifttailcc-musttail-valid.ll +++ b/llvm/test/Verifier/swifttailcc-musttail-valid.ll @@ -1,4 +1,4 @@ -; RUN: opt -temporarily-allow-old-pass-syntax -verify %s +; RUN: opt -passes=verify %s define swifttailcc void @valid_attrs(i64* sret(i64) %ret, i8* byval(i8) %byval, i8* swiftself %self, i8* swiftasync %ctx) { musttail call swifttailcc void @valid_attrs(i64* sret(i64) %ret, i8* byval(i8) %byval, i8* swiftself %self, i8* swiftasync %ctx) diff --git a/llvm/test/Verifier/tbaa.ll b/llvm/test/Verifier/tbaa.ll index 128c960..725f83c 100644 --- a/llvm/test/Verifier/tbaa.ll +++ b/llvm/test/Verifier/tbaa.ll @@ -1,5 +1,5 @@ ; RUN: not llvm-as < %s 2>&1 | FileCheck %s -; RUN: llvm-as -disable-verify < %s | opt -temporarily-allow-old-pass-syntax -verify -S | FileCheck %s --check-prefix=STRIP +; RUN: llvm-as -disable-verify < %s | opt -passes=verify -S | FileCheck %s --check-prefix=STRIP ; STRIP-NOT: tbaa ; STRIP: @f_0 diff --git a/llvm/test/Verifier/vp-intrinsics.ll b/llvm/test/Verifier/vp-intrinsics.ll index 0621bd0..9aeb3d6 100644 --- a/llvm/test/Verifier/vp-intrinsics.ll +++ b/llvm/test/Verifier/vp-intrinsics.ll @@ -1,4 +1,4 @@ -; RUN: opt -temporarily-allow-old-pass-syntax --verify --disable-output %s +; RUN: opt -passes=verify --disable-output %s define void @test_vp_int(<8 x i32> %i0, <8 x i32> %i1, <8 x i1> %m, i32 %n) { %r0 = call <8 x i32> @llvm.vp.add.v8i32(<8 x i32> %i0, <8 x i32> %i1, <8 x i1> %m, i32 %n) diff --git a/llvm/test/Verifier/weak-dllimport.ll b/llvm/test/Verifier/weak-dllimport.ll index 49bc1ca..4924389 100644 --- a/llvm/test/Verifier/weak-dllimport.ll +++ b/llvm/test/Verifier/weak-dllimport.ll @@ -1,4 +1,4 @@ -; RUN: opt -temporarily-allow-old-pass-syntax -verify < %s 2>&1 | FileCheck %s +; RUN: opt -passes=verify < %s 2>&1 | FileCheck %s ; CHECK-NOT: Global is marked as dllimport, but not external target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" -- 2.7.4