From 75d1a815c35b8863392e4338aa9418a9a43928b9 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Thu, 8 Dec 2022 02:27:34 +0300 Subject: [PATCH] [NFC] Port all PhaseOrdering tests to `-passes=` syntax --- .../PhaseOrdering/X86/unsigned-multiply-overflow-check.ll | 12 ++++++------ llvm/test/Transforms/PhaseOrdering/X86/vec-shift.ll | 2 +- .../PhaseOrdering/d83507-knowledge-retention-bug.ll | 1 - llvm/test/Transforms/PhaseOrdering/fast-basictest.ll | 2 +- llvm/test/Transforms/PhaseOrdering/fast-reassociate-gvn.ll | 2 +- llvm/test/Transforms/PhaseOrdering/pr39116.ll | 2 +- llvm/test/Transforms/PhaseOrdering/pr40750.ll | 2 +- llvm/test/Transforms/PhaseOrdering/reassociate-gvn-bdce.ll | 2 +- 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/llvm/test/Transforms/PhaseOrdering/X86/unsigned-multiply-overflow-check.ll b/llvm/test/Transforms/PhaseOrdering/X86/unsigned-multiply-overflow-check.ll index 7c4969d..7bcb6ce 100644 --- a/llvm/test/Transforms/PhaseOrdering/X86/unsigned-multiply-overflow-check.ll +++ b/llvm/test/Transforms/PhaseOrdering/X86/unsigned-multiply-overflow-check.ll @@ -1,10 +1,10 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S < %s | FileCheck %s --check-prefix=SIMPLIFYCFG -; RUN: opt -instcombine -S < %s | FileCheck %s --check-prefix=INSTCOMBINEONLY -; RUN: opt -instcombine -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S < %s | FileCheck %s --check-prefix=INSTCOMBINESIMPLIFYCFGONLY -; RUN: opt -instcombine -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -instcombine -S < %s | FileCheck %s --check-prefix=INSTCOMBINESIMPLIFYCFGINSTCOMBINE -; RUN: opt -instcombine -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -phi-node-folding-threshold=3 -S < %s | FileCheck %s --check-prefix=INSTCOMBINESIMPLIFYCFGONLY -; RUN: opt -instcombine -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -instcombine -phi-node-folding-threshold=3 -S < %s | FileCheck %s --check-prefix=INSTCOMBINESIMPLIFYCFGINSTCOMBINE +; RUN: opt -passes=simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S < %s | FileCheck %s --check-prefix=SIMPLIFYCFG +; RUN: opt -passes=instcombine -S < %s | FileCheck %s --check-prefix=INSTCOMBINEONLY +; RUN: opt -passes=instcombine,simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S < %s | FileCheck %s --check-prefix=INSTCOMBINESIMPLIFYCFGONLY +; RUN: opt -passes=instcombine,simplifycfg,instcombine -simplifycfg-require-and-preserve-domtree=1 -S < %s | FileCheck %s --check-prefix=INSTCOMBINESIMPLIFYCFGINSTCOMBINE +; RUN: opt -passes=instcombine,simplifycfg -simplifycfg-require-and-preserve-domtree=1 -phi-node-folding-threshold=3 -S < %s | FileCheck %s --check-prefix=INSTCOMBINESIMPLIFYCFGONLY +; RUN: opt -passes=instcombine,simplifycfg,instcombine -simplifycfg-require-and-preserve-domtree=1 -phi-node-folding-threshold=3 -S < %s | FileCheck %s --check-prefix=INSTCOMBINESIMPLIFYCFGINSTCOMBINE target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-linux-gnu" diff --git a/llvm/test/Transforms/PhaseOrdering/X86/vec-shift.ll b/llvm/test/Transforms/PhaseOrdering/X86/vec-shift.ll index 34f870d..ba7f800 100644 --- a/llvm/test/Transforms/PhaseOrdering/X86/vec-shift.ll +++ b/llvm/test/Transforms/PhaseOrdering/X86/vec-shift.ll @@ -3,7 +3,7 @@ ; RUN: opt -passes="default" -S -mattr=avx < %s | FileCheck %s --check-prefix=AVX ; This test is based on https://github.com/llvm/llvm-project/issues/50778 -; It's the unoptimized IR passed through -mem2reg to remove obvious noise. +; It's the unoptimized IR passed through -passes=mem2reg to remove obvious noise. ; This should show cooperation between instcombine, unrolling, inlining, ; and SLP to create the target-optimal vector math+logic ops. diff --git a/llvm/test/Transforms/PhaseOrdering/d83507-knowledge-retention-bug.ll b/llvm/test/Transforms/PhaseOrdering/d83507-knowledge-retention-bug.ll index 298af9e..ac9ab89 100644 --- a/llvm/test/Transforms/PhaseOrdering/d83507-knowledge-retention-bug.ll +++ b/llvm/test/Transforms/PhaseOrdering/d83507-knowledge-retention-bug.ll @@ -1,5 +1,4 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -loop-rotate -instcombine -enable-knowledge-retention -S < %s | FileCheck %s ; RUN: opt -passes='loop(loop-rotate),instcombine' -enable-knowledge-retention -S < %s | FileCheck %s %0 = type { ptr } diff --git a/llvm/test/Transforms/PhaseOrdering/fast-basictest.ll b/llvm/test/Transforms/PhaseOrdering/fast-basictest.ll index eaa1914..0127f05 100644 --- a/llvm/test/Transforms/PhaseOrdering/fast-basictest.ll +++ b/llvm/test/Transforms/PhaseOrdering/fast-basictest.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; REQUIRES: x86-registered-target -; RUN: opt < %s -reassociate -instcombine -S | FileCheck %s --check-prefixes=CHECK,REASSOC_AND_IC --allow-unused-prefixes +; RUN: opt < %s -passes=reassociate,instcombine -S | FileCheck %s --check-prefixes=CHECK,REASSOC_AND_IC --allow-unused-prefixes ; RUN: opt < %s -O2 -S | FileCheck %s --check-prefixes=CHECK,O2 --allow-unused-prefixes target triple = "x86_64--" diff --git a/llvm/test/Transforms/PhaseOrdering/fast-reassociate-gvn.ll b/llvm/test/Transforms/PhaseOrdering/fast-reassociate-gvn.ll index b8710b5a..b9e4ffe 100644 --- a/llvm/test/Transforms/PhaseOrdering/fast-reassociate-gvn.ll +++ b/llvm/test/Transforms/PhaseOrdering/fast-reassociate-gvn.ll @@ -9,7 +9,7 @@ ; - PhaseOrdering/fast-reassociate-gvn.ll ; - Reassociate/fast-basictest.ll ; -; RUN: opt < %s -reassociate -gvn -S | FileCheck %s --check-prefixes=CHECK,REASSOC_AND_GVN --allow-unused-prefixes +; RUN: opt < %s -passes=reassociate,gvn -S | FileCheck %s --check-prefixes=CHECK,REASSOC_AND_GVN --allow-unused-prefixes ; RUN: opt < %s -O2 -S | FileCheck %s --check-prefixes=CHECK,O2 --allow-unused-prefixes @fe = external global float diff --git a/llvm/test/Transforms/PhaseOrdering/pr39116.ll b/llvm/test/Transforms/PhaseOrdering/pr39116.ll index fab0a62..4dd46bc 100644 --- a/llvm/test/Transforms/PhaseOrdering/pr39116.ll +++ b/llvm/test/Transforms/PhaseOrdering/pr39116.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -instcombine -S < %s | FileCheck %s +; RUN: opt -passes=simplifycfg,instcombine -simplifycfg-require-and-preserve-domtree=1 -S < %s | FileCheck %s define zeroext i1 @switch_ob_one_two_cases(i32 %arg) { ; CHECK-LABEL: @switch_ob_one_two_cases( diff --git a/llvm/test/Transforms/PhaseOrdering/pr40750.ll b/llvm/test/Transforms/PhaseOrdering/pr40750.ll index daca49b..4a55d1c 100644 --- a/llvm/test/Transforms/PhaseOrdering/pr40750.ll +++ b/llvm/test/Transforms/PhaseOrdering/pr40750.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -instcombine -S < %s | FileCheck %s +; RUN: opt -passes=simplifycfg,instcombine -simplifycfg-require-and-preserve-domtree=1 -S < %s | FileCheck %s %struct.test = type { i8, [3 x i8] } diff --git a/llvm/test/Transforms/PhaseOrdering/reassociate-gvn-bdce.ll b/llvm/test/Transforms/PhaseOrdering/reassociate-gvn-bdce.ll index 75d95f1..8e0dae5 100644 --- a/llvm/test/Transforms/PhaseOrdering/reassociate-gvn-bdce.ll +++ b/llvm/test/Transforms/PhaseOrdering/reassociate-gvn-bdce.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt < %s -reassociate -gvn -bdce -S | FileCheck %s +; RUN: opt < %s -passes=reassociate,gvn,bdce -S | FileCheck %s ; (~(a | b) & c) | ~(a | (b | c)) -> ~(a | b) ; (~(a | b) & c) | ~(b | (a | c)) -> ~(a | b) -- 2.7.4