From cc8c2f166e85842862f1d0187dc706016d96508a Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Thu, 8 Dec 2022 02:27:32 +0300 Subject: [PATCH] [NFC] Port all MergeICmps tests to `-passes=` syntax --- llvm/test/Transforms/MergeICmps/X86/addressspaces.ll | 2 +- llvm/test/Transforms/MergeICmps/X86/alias-merge-blocks.ll | 2 +- llvm/test/Transforms/MergeICmps/X86/atomic.ll | 2 +- llvm/test/Transforms/MergeICmps/X86/entry-block-shuffled-2.ll | 2 +- llvm/test/Transforms/MergeICmps/X86/entry-block-shuffled.ll | 2 +- llvm/test/Transforms/MergeICmps/X86/gep-references-bb.ll | 2 +- llvm/test/Transforms/MergeICmps/X86/gep-used-outside.ll | 2 +- llvm/test/Transforms/MergeICmps/X86/int64-and-ptr.ll | 2 +- llvm/test/Transforms/MergeICmps/X86/last-block-produce-no-value.ll | 2 +- llvm/test/Transforms/MergeICmps/X86/multiple-blocks-does-work.ll | 2 +- llvm/test/Transforms/MergeICmps/X86/no-gep-other-work.ll | 2 +- llvm/test/Transforms/MergeICmps/X86/opaque-ptr.ll | 2 +- llvm/test/Transforms/MergeICmps/X86/pair-int32-int32.ll | 2 +- llvm/test/Transforms/MergeICmps/X86/pr36557.ll | 2 +- llvm/test/Transforms/MergeICmps/X86/pr41917.ll | 2 +- llvm/test/Transforms/MergeICmps/X86/pr53959.ll | 2 +- llvm/test/Transforms/MergeICmps/X86/split-block-does-work.ll | 2 +- llvm/test/Transforms/MergeICmps/X86/tuple-four-int8.ll | 4 ++-- llvm/test/Transforms/MergeICmps/X86/two-complex-bb.ll | 2 +- llvm/test/Transforms/MergeICmps/X86/volatile.ll | 2 +- llvm/test/Transforms/MergeICmps/pair-int32-int32.ll | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) diff --git a/llvm/test/Transforms/MergeICmps/X86/addressspaces.ll b/llvm/test/Transforms/MergeICmps/X86/addressspaces.ll index a1db03c..cc98190 100644 --- a/llvm/test/Transforms/MergeICmps/X86/addressspaces.ll +++ b/llvm/test/Transforms/MergeICmps/X86/addressspaces.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt < %s -S -mergeicmps -verify-dom-info | FileCheck %s +; RUN: opt < %s -S -passes=mergeicmps -verify-dom-info | FileCheck %s target triple = "x86_64" ; First check that we try to from a memcmp. diff --git a/llvm/test/Transforms/MergeICmps/X86/alias-merge-blocks.ll b/llvm/test/Transforms/MergeICmps/X86/alias-merge-blocks.ll index a8d28ef..5421023 100644 --- a/llvm/test/Transforms/MergeICmps/X86/alias-merge-blocks.ll +++ b/llvm/test/Transforms/MergeICmps/X86/alias-merge-blocks.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt < %s -mtriple=x86_64-unknown-unknown -mergeicmps -verify-dom-info -S | FileCheck %s --check-prefix=X86 +; RUN: opt < %s -mtriple=x86_64-unknown-unknown -passes=mergeicmps -verify-dom-info -S | FileCheck %s --check-prefix=X86 %S = type { i32, i32, i32, i32 } diff --git a/llvm/test/Transforms/MergeICmps/X86/atomic.ll b/llvm/test/Transforms/MergeICmps/X86/atomic.ll index 91a6b79..9cbeb5d 100644 --- a/llvm/test/Transforms/MergeICmps/X86/atomic.ll +++ b/llvm/test/Transforms/MergeICmps/X86/atomic.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt < %s -mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s +; RUN: opt < %s -passes=mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s %S = type { i32, i32 } diff --git a/llvm/test/Transforms/MergeICmps/X86/entry-block-shuffled-2.ll b/llvm/test/Transforms/MergeICmps/X86/entry-block-shuffled-2.ll index 905e098..e236532 100644 --- a/llvm/test/Transforms/MergeICmps/X86/entry-block-shuffled-2.ll +++ b/llvm/test/Transforms/MergeICmps/X86/entry-block-shuffled-2.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -S -mergeicmps < %s | FileCheck %s +; RUN: opt -S -passes=mergeicmps < %s | FileCheck %s target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Transforms/MergeICmps/X86/entry-block-shuffled.ll b/llvm/test/Transforms/MergeICmps/X86/entry-block-shuffled.ll index 64b5c6d..f097aed 100644 --- a/llvm/test/Transforms/MergeICmps/X86/entry-block-shuffled.ll +++ b/llvm/test/Transforms/MergeICmps/X86/entry-block-shuffled.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt < %s -mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s +; RUN: opt < %s -passes=mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s %S = type { i32, i32, i32, i32 } diff --git a/llvm/test/Transforms/MergeICmps/X86/gep-references-bb.ll b/llvm/test/Transforms/MergeICmps/X86/gep-references-bb.ll index 3570817..f40787a 100644 --- a/llvm/test/Transforms/MergeICmps/X86/gep-references-bb.ll +++ b/llvm/test/Transforms/MergeICmps/X86/gep-references-bb.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt < %s -S -mergeicmps -verify-dom-info | FileCheck %s +; RUN: opt < %s -S -passes=mergeicmps -verify-dom-info | FileCheck %s target triple = "x86_64" %Triple = type { i32, i32, i32, i32 } diff --git a/llvm/test/Transforms/MergeICmps/X86/gep-used-outside.ll b/llvm/test/Transforms/MergeICmps/X86/gep-used-outside.ll index 676506a..62185c8 100644 --- a/llvm/test/Transforms/MergeICmps/X86/gep-used-outside.ll +++ b/llvm/test/Transforms/MergeICmps/X86/gep-used-outside.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt < %s -mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s +; RUN: opt < %s -passes=mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s %S = type { i32, i32 } diff --git a/llvm/test/Transforms/MergeICmps/X86/int64-and-ptr.ll b/llvm/test/Transforms/MergeICmps/X86/int64-and-ptr.ll index f598d74..18909d6 100644 --- a/llvm/test/Transforms/MergeICmps/X86/int64-and-ptr.ll +++ b/llvm/test/Transforms/MergeICmps/X86/int64-and-ptr.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --force-update -; RUN: opt < %s -mtriple=x86_64-unknown-unknown -mergeicmps -verify-dom-info -S 2>&1 | FileCheck %s +; RUN: opt < %s -mtriple=x86_64-unknown-unknown -passes=mergeicmps -verify-dom-info -S 2>&1 | FileCheck %s ; 8-byte int and 8-byte pointer should merge into a 16-byte memcmp. diff --git a/llvm/test/Transforms/MergeICmps/X86/last-block-produce-no-value.ll b/llvm/test/Transforms/MergeICmps/X86/last-block-produce-no-value.ll index 9579aec..d63ef30 100644 --- a/llvm/test/Transforms/MergeICmps/X86/last-block-produce-no-value.ll +++ b/llvm/test/Transforms/MergeICmps/X86/last-block-produce-no-value.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt < %s -mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s +; RUN: opt < %s -passes=mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s %S = type { i32, i32, i32 } diff --git a/llvm/test/Transforms/MergeICmps/X86/multiple-blocks-does-work.ll b/llvm/test/Transforms/MergeICmps/X86/multiple-blocks-does-work.ll index b921e4e..347209b 100644 --- a/llvm/test/Transforms/MergeICmps/X86/multiple-blocks-does-work.ll +++ b/llvm/test/Transforms/MergeICmps/X86/multiple-blocks-does-work.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt < %s -mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s --check-prefix=X86 +; RUN: opt < %s -passes=mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s --check-prefix=X86 %S = type { i32, i32, i32, i32 } diff --git a/llvm/test/Transforms/MergeICmps/X86/no-gep-other-work.ll b/llvm/test/Transforms/MergeICmps/X86/no-gep-other-work.ll index 2d890a3..7038ae0 100644 --- a/llvm/test/Transforms/MergeICmps/X86/no-gep-other-work.ll +++ b/llvm/test/Transforms/MergeICmps/X86/no-gep-other-work.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -S -mergeicmps < %s | FileCheck %s +; RUN: opt -S -passes=mergeicmps < %s | FileCheck %s ; This does not use a GEP for the zero-offset comparison and requires a ; split for other work. diff --git a/llvm/test/Transforms/MergeICmps/X86/opaque-ptr.ll b/llvm/test/Transforms/MergeICmps/X86/opaque-ptr.ll index 995a045..9b68930 100644 --- a/llvm/test/Transforms/MergeICmps/X86/opaque-ptr.ll +++ b/llvm/test/Transforms/MergeICmps/X86/opaque-ptr.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -S -mergeicmps -opaque-pointers < %s | FileCheck %s +; RUN: opt -S -passes=mergeicmps -opaque-pointers < %s | FileCheck %s target triple = "x86_64-unknown-unknown" diff --git a/llvm/test/Transforms/MergeICmps/X86/pair-int32-int32.ll b/llvm/test/Transforms/MergeICmps/X86/pair-int32-int32.ll index 7a2690b..bd0dbda 100644 --- a/llvm/test/Transforms/MergeICmps/X86/pair-int32-int32.ll +++ b/llvm/test/Transforms/MergeICmps/X86/pair-int32-int32.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt < %s -passes='require,mergeicmps,verify' -mtriple=x86_64-unknown-unknown -S | FileCheck %s --check-prefix=X86 -; RUN: opt < %s -mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S -disable-simplify-libcalls | FileCheck %s --check-prefix=X86-NOBUILTIN +; RUN: opt < %s -passes=mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S -disable-simplify-libcalls | FileCheck %s --check-prefix=X86-NOBUILTIN %S = type { i32, i32 } diff --git a/llvm/test/Transforms/MergeICmps/X86/pr36557.ll b/llvm/test/Transforms/MergeICmps/X86/pr36557.ll index 3634523..9652204 100644 --- a/llvm/test/Transforms/MergeICmps/X86/pr36557.ll +++ b/llvm/test/Transforms/MergeICmps/X86/pr36557.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt < %s -mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s --check-prefix=X86 +; RUN: opt < %s -passes=mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s --check-prefix=X86 source_filename = "qabstractitemmodeltester.cpp" target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" diff --git a/llvm/test/Transforms/MergeICmps/X86/pr41917.ll b/llvm/test/Transforms/MergeICmps/X86/pr41917.ll index 0af00c7..a6a8e8d 100644 --- a/llvm/test/Transforms/MergeICmps/X86/pr41917.ll +++ b/llvm/test/Transforms/MergeICmps/X86/pr41917.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt < %s -mergeicmps -verify-dom-info -S | FileCheck %s +; RUN: opt < %s -passes=mergeicmps -verify-dom-info -S | FileCheck %s target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32" target triple = "i386-pc-windows-msvc19.11.0" diff --git a/llvm/test/Transforms/MergeICmps/X86/pr53959.ll b/llvm/test/Transforms/MergeICmps/X86/pr53959.ll index b7ba8bd..1721d53 100644 --- a/llvm/test/Transforms/MergeICmps/X86/pr53959.ll +++ b/llvm/test/Transforms/MergeICmps/X86/pr53959.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -S -mergeicmps < %s | FileCheck %s +; RUN: opt -S -passes=mergeicmps < %s | FileCheck %s target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Transforms/MergeICmps/X86/split-block-does-work.ll b/llvm/test/Transforms/MergeICmps/X86/split-block-does-work.ll index 2bbf08b..d317cbe 100644 --- a/llvm/test/Transforms/MergeICmps/X86/split-block-does-work.ll +++ b/llvm/test/Transforms/MergeICmps/X86/split-block-does-work.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt < %s -mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s --check-prefix=X86 +; RUN: opt < %s -passes=mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s --check-prefix=X86 %S = type { i32, i32, i32, i32 } diff --git a/llvm/test/Transforms/MergeICmps/X86/tuple-four-int8.ll b/llvm/test/Transforms/MergeICmps/X86/tuple-four-int8.ll index e16d5de..a245e01 100644 --- a/llvm/test/Transforms/MergeICmps/X86/tuple-four-int8.ll +++ b/llvm/test/Transforms/MergeICmps/X86/tuple-four-int8.ll @@ -1,6 +1,6 @@ ; XFAIL: * ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt < %s -mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s +; RUN: opt < %s -passes=mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s ; This is a more involved test: clang generates this weird pattern for ; tuple. Right now we skip the entry block @@ -31,7 +31,7 @@ define zeroext i1 @opeq( ; CHECK-NEXT: br label [[OPEQ_EXIT:%.*]] ; CHECK: land.elem0: ; CHECK: [[A_BASE:%.*]] = getelementptr inbounds %"class.std::tuple", %"class.std::tuple"* [[A:%.*]], i64 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0 -; CHECK: [[B_BASE:%.*]] = getelementptr inbounds %"class.std::tuple", %"class.std::tuple"* [[B:%.*]], i64 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0 +; CHECK: [[B_BASE:%.*]] = getelementptr inbounds %"class.std::tuple", %"class.std::tuple"* [[B:%.*]], i64 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0 ; CHECK-NEXT: [[TMP3:%.*]] = load i8, i8* [[A_BASE]], align 1 ; CHECK-NEXT: [[TMP4:%.*]] = load i8, i8* [[B_BASE]], align 1 ; CHECK-NEXT: [[CMP_ELEM0:%.*]] = icmp eq i8 [[TMP3]], [[TMP4]] diff --git a/llvm/test/Transforms/MergeICmps/X86/two-complex-bb.ll b/llvm/test/Transforms/MergeICmps/X86/two-complex-bb.ll index 88a03a5..be11360 100644 --- a/llvm/test/Transforms/MergeICmps/X86/two-complex-bb.ll +++ b/llvm/test/Transforms/MergeICmps/X86/two-complex-bb.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt < %s -mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s --check-prefix=X86 +; RUN: opt < %s -passes=mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s --check-prefix=X86 %S = type { i32, i32 } diff --git a/llvm/test/Transforms/MergeICmps/X86/volatile.ll b/llvm/test/Transforms/MergeICmps/X86/volatile.ll index cf3cc98..f6084c4 100644 --- a/llvm/test/Transforms/MergeICmps/X86/volatile.ll +++ b/llvm/test/Transforms/MergeICmps/X86/volatile.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt < %s -mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s +; RUN: opt < %s -passes=mergeicmps -verify-dom-info -mtriple=x86_64-unknown-unknown -S | FileCheck %s %S = type { i32, i32 } diff --git a/llvm/test/Transforms/MergeICmps/pair-int32-int32.ll b/llvm/test/Transforms/MergeICmps/pair-int32-int32.ll index 7544b84..38caaba 100644 --- a/llvm/test/Transforms/MergeICmps/pair-int32-int32.ll +++ b/llvm/test/Transforms/MergeICmps/pair-int32-int32.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt < %s -mergeicmps -S | FileCheck %s --check-prefix=NOEXPANSION +; RUN: opt < %s -passes=mergeicmps -S | FileCheck %s --check-prefix=NOEXPANSION %"struct.std::pair" = type { i32, i32 } -- 2.7.4