From c384b20b55c730f2382013d18b41269f04757873 Mon Sep 17 00:00:00 2001 From: Arthur Eubanks Date: Fri, 7 Oct 2022 11:04:11 -0700 Subject: [PATCH] [opt] Remove temporary legacy pass name translations And update corresponding tests. --- llvm/test/Analysis/MemorySSA/pr41853.ll | 2 +- llvm/test/CodeGen/PowerPC/no-dup-of-bdnz.ll | 2 +- .../Transforms/CodeExtractor/2004-03-14-NoSwitchSupport.ll | 2 +- llvm/test/Transforms/EarlyCSE/AArch64/intrinsics.ll | 4 +--- llvm/test/Transforms/EarlyCSE/AArch64/ldstN.ll | 4 ++-- llvm/test/Transforms/EarlyCSE/AMDGPU/memrealtime.ll | 2 +- llvm/test/Transforms/EarlyCSE/PowerPC/read-reg.ll | 4 ++-- llvm/test/Transforms/EarlyCSE/X86/preserve_memoryssa.ll | 2 +- llvm/test/Transforms/EarlyCSE/and_or.ll | 4 ++-- llvm/test/Transforms/EarlyCSE/atomics.ll | 2 +- llvm/test/Transforms/EarlyCSE/basic.ll | 2 +- llvm/test/Transforms/EarlyCSE/commute.ll | 2 +- llvm/test/Transforms/EarlyCSE/conditional.ll | 2 +- llvm/test/Transforms/EarlyCSE/defaultfp-strictfp.ll | 2 +- llvm/test/Transforms/EarlyCSE/ebstrict-strictfp.ll | 2 +- llvm/test/Transforms/EarlyCSE/edge.ll | 2 +- llvm/test/Transforms/EarlyCSE/fence.ll | 2 +- llvm/test/Transforms/EarlyCSE/flags.ll | 2 +- llvm/test/Transforms/EarlyCSE/floatingpoint.ll | 2 +- llvm/test/Transforms/EarlyCSE/getmatchingvalue-crash.ll | 2 +- llvm/test/Transforms/EarlyCSE/globalsaa-memoryssa.ll | 2 +- llvm/test/Transforms/EarlyCSE/guards.ll | 4 ++-- llvm/test/Transforms/EarlyCSE/instsimplify-dom.ll | 2 +- llvm/test/Transforms/EarlyCSE/invariant-loads.ll | 4 ++-- llvm/test/Transforms/EarlyCSE/memoryssa.ll | 2 +- llvm/test/Transforms/EarlyCSE/mixed-strictfp.ll | 2 +- llvm/test/Transforms/EarlyCSE/nonmixed-strictfp.ll | 2 +- llvm/test/Transforms/EarlyCSE/phi.ll | 2 +- llvm/test/Transforms/EarlyCSE/pr33406.ll | 2 +- llvm/test/Transforms/EarlyCSE/reuse-preserved-memoryssa.ll | 2 +- llvm/test/Transforms/EarlyCSE/round-dyn-strictfp.ll | 2 +- llvm/test/Transforms/EarlyCSE/tfpropagation.ll | 2 +- llvm/test/Transforms/GVNHoist/pr37445.ll | 2 +- llvm/test/Transforms/GVNHoist/pr38807.ll | 2 +- .../Transforms/LowerMatrixIntrinsics/multiply-minimal.ll | 1 - llvm/test/Transforms/SampleProfile/pseudo-probe-cse.ll | 2 +- llvm/tools/opt/NewPMDriver.cpp | 12 ------------ 37 files changed, 40 insertions(+), 55 deletions(-) diff --git a/llvm/test/Analysis/MemorySSA/pr41853.ll b/llvm/test/Analysis/MemorySSA/pr41853.ll index 5cfe4e4..6b88e80 100644 --- a/llvm/test/Analysis/MemorySSA/pr41853.ll +++ b/llvm/test/Analysis/MemorySSA/pr41853.ll @@ -1,4 +1,4 @@ -; RUN: opt -S -memoryssa -loop-simplify -early-cse-memssa -earlycse-debug-hash -verify-memoryssa %s | FileCheck %s +; RUN: opt -S -passes='require,loop-simplify,early-cse' -earlycse-debug-hash -verify-memoryssa %s | FileCheck %s ; REQUIRES: asserts target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/CodeGen/PowerPC/no-dup-of-bdnz.ll b/llvm/test/CodeGen/PowerPC/no-dup-of-bdnz.ll index 82836f4..f96c774 100644 --- a/llvm/test/CodeGen/PowerPC/no-dup-of-bdnz.ll +++ b/llvm/test/CodeGen/PowerPC/no-dup-of-bdnz.ll @@ -1,4 +1,4 @@ -; RUN: opt -early-cse-memssa -earlycse-debug-hash -loop-rotate -licm -loop-rotate -S %s -o - | FileCheck %s +; RUN: opt -passes='early-cse,loop-mssa(loop-rotate,licm,loop-rotate)' -earlycse-debug-hash -S %s -o - | FileCheck %s ; ModuleID = 'bugpoint-reduced-simplified.bc' source_filename = "bugpoint-output-8903f29.bc" target datalayout = "e-m:e-i64:64-n32:64" diff --git a/llvm/test/Transforms/CodeExtractor/2004-03-14-NoSwitchSupport.ll b/llvm/test/Transforms/CodeExtractor/2004-03-14-NoSwitchSupport.ll index 4bb94f3..67b929d 100644 --- a/llvm/test/Transforms/CodeExtractor/2004-03-14-NoSwitchSupport.ll +++ b/llvm/test/Transforms/CodeExtractor/2004-03-14-NoSwitchSupport.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -loop-simplify -loop-extract-single -disable-output +; RUN: opt < %s -passes='function(loop-simplify),loop-extract' -disable-output define void @ab() { entry: diff --git a/llvm/test/Transforms/EarlyCSE/AArch64/intrinsics.ll b/llvm/test/Transforms/EarlyCSE/AArch64/intrinsics.ll index 1cb8dea..69a5031 100644 --- a/llvm/test/Transforms/EarlyCSE/AArch64/intrinsics.ll +++ b/llvm/test/Transforms/EarlyCSE/AArch64/intrinsics.ll @@ -1,6 +1,4 @@ -; RUN: opt < %s -S -mtriple=aarch64-none-linux-gnu -mattr=+neon -early-cse -earlycse-debug-hash | FileCheck %s -; RUN: opt < %s -S -mtriple=aarch64-none-linux-gnu -mattr=+neon -basic-aa -early-cse-memssa | FileCheck %s -; RUN: opt < %s -S -mtriple=aarch64-none-linux-gnu -mattr=+neon -passes=early-cse | FileCheck %s +; RUN: opt < %s -S -mtriple=aarch64-none-linux-gnu -mattr=+neon -passes=early-cse -earlycse-debug-hash | FileCheck %s ; RUN: opt < %s -S -mtriple=aarch64-none-linux-gnu -mattr=+neon -aa-pipeline=basic-aa -passes='early-cse' | FileCheck %s define <4 x i32> @test_cse(ptr %a, [2 x <4 x i32>] %s.coerce, i32 %n) { diff --git a/llvm/test/Transforms/EarlyCSE/AArch64/ldstN.ll b/llvm/test/Transforms/EarlyCSE/AArch64/ldstN.ll index 71ed291..dd794a9 100644 --- a/llvm/test/Transforms/EarlyCSE/AArch64/ldstN.ll +++ b/llvm/test/Transforms/EarlyCSE/AArch64/ldstN.ll @@ -1,5 +1,5 @@ -; RUN: opt -S -early-cse -earlycse-debug-hash < %s | FileCheck %s -; RUN: opt -S -basic-aa -early-cse-memssa < %s | FileCheck %s +; RUN: opt -S -passes='early-cse' -earlycse-debug-hash < %s | FileCheck %s +; RUN: opt -S -passes='early-cse' < %s | FileCheck %s target datalayout = "e-m:e-i64:64-i128:128-n32:64-S128" target triple = "aarch64--linux-gnu" diff --git a/llvm/test/Transforms/EarlyCSE/AMDGPU/memrealtime.ll b/llvm/test/Transforms/EarlyCSE/AMDGPU/memrealtime.ll index 8e618b5..69995ae 100644 --- a/llvm/test/Transforms/EarlyCSE/AMDGPU/memrealtime.ll +++ b/llvm/test/Transforms/EarlyCSE/AMDGPU/memrealtime.ll @@ -1,4 +1,4 @@ -; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -early-cse-memssa -earlycse-debug-hash < %s | FileCheck %s +; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -passes='early-cse' -earlycse-debug-hash < %s | FileCheck %s target datalayout = "e-p:64:64-p1:64:64-p2:32:32-p3:32:32-p4:64:64-p5:32:32-p6:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-S32-A5" ; CHECK-LABEL: @memrealtime( diff --git a/llvm/test/Transforms/EarlyCSE/PowerPC/read-reg.ll b/llvm/test/Transforms/EarlyCSE/PowerPC/read-reg.ll index e57dd51..757fd98 100644 --- a/llvm/test/Transforms/EarlyCSE/PowerPC/read-reg.ll +++ b/llvm/test/Transforms/EarlyCSE/PowerPC/read-reg.ll @@ -1,5 +1,5 @@ -; RUN: opt -S -early-cse -earlycse-debug-hash < %s | FileCheck %s -; RUN: opt -S -basic-aa -early-cse-memssa < %s | FileCheck %s +; RUN: opt -S -passes=early-cse -earlycse-debug-hash < %s | FileCheck %s +; RUN: opt -S -passes='early-cse' < %s | FileCheck %s target datalayout = "E-m:e-i64:64-n32:64" target triple = "powerpc64-unknown-linux-gnu" diff --git a/llvm/test/Transforms/EarlyCSE/X86/preserve_memoryssa.ll b/llvm/test/Transforms/EarlyCSE/X86/preserve_memoryssa.ll index df88d03..dcaa0b5 100644 --- a/llvm/test/Transforms/EarlyCSE/X86/preserve_memoryssa.ll +++ b/llvm/test/Transforms/EarlyCSE/X86/preserve_memoryssa.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -early-cse-memssa -earlycse-debug-hash -verify-memoryssa -disable-output +; RUN: opt < %s -passes='early-cse' -earlycse-debug-hash -verify-memoryssa -disable-output ; REQUIRES: asserts target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" diff --git a/llvm/test/Transforms/EarlyCSE/and_or.ll b/llvm/test/Transforms/EarlyCSE/and_or.ll index 2c04e7e..4f84178 100644 --- a/llvm/test/Transforms/EarlyCSE/and_or.ll +++ b/llvm/test/Transforms/EarlyCSE/and_or.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -early-cse -earlycse-debug-hash -S < %s | FileCheck %s -; RUN: opt -basic-aa -early-cse-memssa -S < %s | FileCheck %s +; RUN: opt -passes=early-cse -earlycse-debug-hash -S < %s | FileCheck %s +; RUN: opt -passes='early-cse' -S < %s | FileCheck %s define i32 @test_01(i32 %a, i32 %b) { ; CHECK-LABEL: @test_01( diff --git a/llvm/test/Transforms/EarlyCSE/atomics.ll b/llvm/test/Transforms/EarlyCSE/atomics.ll index 34293de..73bcab6 100644 --- a/llvm/test/Transforms/EarlyCSE/atomics.ll +++ b/llvm/test/Transforms/EarlyCSE/atomics.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s -; RUN: opt < %s -S -basic-aa -early-cse-memssa | FileCheck %s +; RUN: opt < %s -S -passes='early-cse' | FileCheck %s define i32 @test12(i1 %B, ptr %P1, ptr %P2) { ; CHECK-LABEL: @test12( diff --git a/llvm/test/Transforms/EarlyCSE/basic.ll b/llvm/test/Transforms/EarlyCSE/basic.ll index 759a0f4..136bc10 100644 --- a/llvm/test/Transforms/EarlyCSE/basic.ll +++ b/llvm/test/Transforms/EarlyCSE/basic.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s -; RUN: opt < %s -S -basic-aa -early-cse-memssa | FileCheck %s +; RUN: opt < %s -S -passes='early-cse' | FileCheck %s ; RUN: opt < %s -S -passes=early-cse | FileCheck %s declare void @llvm.assume(i1) nounwind diff --git a/llvm/test/Transforms/EarlyCSE/commute.ll b/llvm/test/Transforms/EarlyCSE/commute.ll index f442bf8..1b0512c 100644 --- a/llvm/test/Transforms/EarlyCSE/commute.ll +++ b/llvm/test/Transforms/EarlyCSE/commute.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s -; RUN: opt < %s -S -basic-aa -early-cse-memssa | FileCheck %s +; RUN: opt < %s -S -passes='early-cse' | FileCheck %s define void @test1(float %A, float %B, ptr %PA, ptr %PB) { ; CHECK-LABEL: @test1( diff --git a/llvm/test/Transforms/EarlyCSE/conditional.ll b/llvm/test/Transforms/EarlyCSE/conditional.ll index aeb024e..70bd8c2 100644 --- a/llvm/test/Transforms/EarlyCSE/conditional.ll +++ b/llvm/test/Transforms/EarlyCSE/conditional.ll @@ -1,5 +1,5 @@ ; RUN: opt -early-cse -earlycse-debug-hash -S < %s | FileCheck %s -; RUN: opt -basic-aa -early-cse-memssa -S < %s | FileCheck %s +; RUN: opt -passes='early-cse' -S < %s | FileCheck %s ; Can we CSE a known condition to a constant? define i1 @test(ptr %p) { diff --git a/llvm/test/Transforms/EarlyCSE/defaultfp-strictfp.ll b/llvm/test/Transforms/EarlyCSE/defaultfp-strictfp.ll index 978f18f..16853e9 100644 --- a/llvm/test/Transforms/EarlyCSE/defaultfp-strictfp.ll +++ b/llvm/test/Transforms/EarlyCSE/defaultfp-strictfp.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s -; RUN: opt < %s -S -basic-aa -early-cse-memssa | FileCheck %s +; RUN: opt < %s -S -passes='early-cse' | FileCheck %s ; Test use of constrained floating point intrinsics in the default ; floating point environment. diff --git a/llvm/test/Transforms/EarlyCSE/ebstrict-strictfp.ll b/llvm/test/Transforms/EarlyCSE/ebstrict-strictfp.ll index ff3aafc..1430f5e 100644 --- a/llvm/test/Transforms/EarlyCSE/ebstrict-strictfp.ll +++ b/llvm/test/Transforms/EarlyCSE/ebstrict-strictfp.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s -; RUN: opt < %s -S -basic-aa -early-cse-memssa | FileCheck %s +; RUN: opt < %s -S -passes='early-cse' | FileCheck %s ; Test use of constrained floating point intrinsics with consistent ; floating point environments. All tests are with strict exception diff --git a/llvm/test/Transforms/EarlyCSE/edge.ll b/llvm/test/Transforms/EarlyCSE/edge.ll index a790d90..f9a932a 100644 --- a/llvm/test/Transforms/EarlyCSE/edge.ll +++ b/llvm/test/Transforms/EarlyCSE/edge.ll @@ -1,5 +1,5 @@ ; RUN: opt -early-cse -earlycse-debug-hash -S < %s | FileCheck %s -; RUN: opt -basic-aa -early-cse-memssa -S < %s | FileCheck %s +; RUN: opt -passes='early-cse' -S < %s | FileCheck %s ; Same as GVN/edge.ll, but updated to reflect EarlyCSE's less powerful ; implementation. EarlyCSE currently doesn't exploit equality comparisons ; against constants. diff --git a/llvm/test/Transforms/EarlyCSE/fence.ll b/llvm/test/Transforms/EarlyCSE/fence.ll index 5ac8cc6c..3c5bd68 100644 --- a/llvm/test/Transforms/EarlyCSE/fence.ll +++ b/llvm/test/Transforms/EarlyCSE/fence.ll @@ -1,5 +1,5 @@ ; RUN: opt -S -early-cse -earlycse-debug-hash < %s | FileCheck %s -; RUN: opt < %s -S -basic-aa -early-cse-memssa | FileCheck %s +; RUN: opt < %s -S -passes='early-cse' | FileCheck %s ; NOTE: This file is testing the current implementation. Some of ; the transforms used as negative tests below would be legal, but ; only if reached through a chain of logic which EarlyCSE is incapable diff --git a/llvm/test/Transforms/EarlyCSE/flags.ll b/llvm/test/Transforms/EarlyCSE/flags.ll index 1e5cd28..8b408c1 100644 --- a/llvm/test/Transforms/EarlyCSE/flags.ll +++ b/llvm/test/Transforms/EarlyCSE/flags.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt -early-cse -earlycse-debug-hash -S < %s | FileCheck %s -; RUN: opt -basic-aa -early-cse-memssa -S < %s | FileCheck %s +; RUN: opt -passes='early-cse' -S < %s | FileCheck %s declare void @use(i1) diff --git a/llvm/test/Transforms/EarlyCSE/floatingpoint.ll b/llvm/test/Transforms/EarlyCSE/floatingpoint.ll index c4a0bf9..d7453b4 100644 --- a/llvm/test/Transforms/EarlyCSE/floatingpoint.ll +++ b/llvm/test/Transforms/EarlyCSE/floatingpoint.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s -; RUN: opt < %s -S -basic-aa -early-cse-memssa | FileCheck %s +; RUN: opt < %s -S -passes='early-cse' | FileCheck %s ; Ensure we don't simplify away additions vectors of +0.0's (same as scalars). define <4 x float> @fV( <4 x float> %a) { diff --git a/llvm/test/Transforms/EarlyCSE/getmatchingvalue-crash.ll b/llvm/test/Transforms/EarlyCSE/getmatchingvalue-crash.ll index 40a4c62..19042c4 100644 --- a/llvm/test/Transforms/EarlyCSE/getmatchingvalue-crash.ll +++ b/llvm/test/Transforms/EarlyCSE/getmatchingvalue-crash.ll @@ -1,4 +1,4 @@ -; RUN: opt -basic-aa -aa -memoryssa -early-cse-memssa -verify -S < %s | FileCheck %s +; RUN: opt -passes='early-cse' -S < %s | FileCheck %s ; Check that this doesn't crash. The crash only happens with expensive checks, ; but there doesn't seem to be a REQUIRES for that. diff --git a/llvm/test/Transforms/EarlyCSE/globalsaa-memoryssa.ll b/llvm/test/Transforms/EarlyCSE/globalsaa-memoryssa.ll index 6e423eb..65357cc 100644 --- a/llvm/test/Transforms/EarlyCSE/globalsaa-memoryssa.ll +++ b/llvm/test/Transforms/EarlyCSE/globalsaa-memoryssa.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt < %s -S -globals-aa -early-cse-memssa -earlycse-debug-hash | FileCheck %s +; RUN: opt < %s -S -passes='require,early-cse' -earlycse-debug-hash | FileCheck %s define i16 @f1() readonly { ret i16 0 diff --git a/llvm/test/Transforms/EarlyCSE/guards.ll b/llvm/test/Transforms/EarlyCSE/guards.ll index 1526071..9abdb74 100644 --- a/llvm/test/Transforms/EarlyCSE/guards.ll +++ b/llvm/test/Transforms/EarlyCSE/guards.ll @@ -1,7 +1,7 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt -S -early-cse -earlycse-debug-hash < %s | FileCheck %s --check-prefixes=CHECK,NO_ASSUME -; RUN: opt < %s -S -basic-aa -early-cse-memssa | FileCheck %s --check-prefixes=CHECK,NO_ASSUME -; RUN: opt < %s -S -basic-aa -early-cse-memssa --enable-knowledge-retention | FileCheck %s --check-prefixes=CHECK,USE_ASSUME +; RUN: opt < %s -S -passes='early-cse' | FileCheck %s --check-prefixes=CHECK,NO_ASSUME +; RUN: opt < %s -S -passes='early-cse' --enable-knowledge-retention | FileCheck %s --check-prefixes=CHECK,USE_ASSUME declare void @llvm.experimental.guard(i1,...) diff --git a/llvm/test/Transforms/EarlyCSE/instsimplify-dom.ll b/llvm/test/Transforms/EarlyCSE/instsimplify-dom.ll index 2b281aa..eaaecf4 100644 --- a/llvm/test/Transforms/EarlyCSE/instsimplify-dom.ll +++ b/llvm/test/Transforms/EarlyCSE/instsimplify-dom.ll @@ -1,5 +1,5 @@ ; RUN: opt -early-cse -earlycse-debug-hash -S < %s | FileCheck %s -; RUN: opt -basic-aa -early-cse-memssa -S < %s | FileCheck %s +; RUN: opt -passes='early-cse' -S < %s | FileCheck %s ; PR12231 declare i32 @f() diff --git a/llvm/test/Transforms/EarlyCSE/invariant-loads.ll b/llvm/test/Transforms/EarlyCSE/invariant-loads.ll index 0eca245..09a2446 100644 --- a/llvm/test/Transforms/EarlyCSE/invariant-loads.ll +++ b/llvm/test/Transforms/EarlyCSE/invariant-loads.ll @@ -1,7 +1,7 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt -S -early-cse -earlycse-debug-hash < %s | FileCheck %s --check-prefixes=CHECK,NO_ASSUME -; RUN: opt -S -basic-aa -early-cse-memssa < %s | FileCheck %s --check-prefixes=CHECK,NO_ASSUME -; RUN: opt -S -basic-aa -early-cse-memssa --enable-knowledge-retention < %s | FileCheck %s --check-prefixes=CHECK,USE_ASSUME +; RUN: opt -S -passes='early-cse' < %s | FileCheck %s --check-prefixes=CHECK,NO_ASSUME +; RUN: opt -S -passes='early-cse' --enable-knowledge-retention < %s | FileCheck %s --check-prefixes=CHECK,USE_ASSUME declare void @clobber_and_use(i32) diff --git a/llvm/test/Transforms/EarlyCSE/memoryssa.ll b/llvm/test/Transforms/EarlyCSE/memoryssa.ll index b9c0ece..2d7266f 100644 --- a/llvm/test/Transforms/EarlyCSE/memoryssa.ll +++ b/llvm/test/Transforms/EarlyCSE/memoryssa.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s --check-prefix=CHECK-NOMEMSSA -; RUN: opt < %s -S -basic-aa -early-cse-memssa | FileCheck %s +; RUN: opt < %s -S -passes='early-cse' | FileCheck %s ; RUN: opt < %s -S -passes='early-cse' | FileCheck %s --check-prefix=CHECK-NOMEMSSA ; RUN: opt < %s -S -aa-pipeline=basic-aa -passes='early-cse' | FileCheck %s diff --git a/llvm/test/Transforms/EarlyCSE/mixed-strictfp.ll b/llvm/test/Transforms/EarlyCSE/mixed-strictfp.ll index 22b9dad..2196427 100644 --- a/llvm/test/Transforms/EarlyCSE/mixed-strictfp.ll +++ b/llvm/test/Transforms/EarlyCSE/mixed-strictfp.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s -; RUN: opt < %s -S -basic-aa -early-cse-memssa | FileCheck %s +; RUN: opt < %s -S -passes='early-cse' | FileCheck %s ; Test use of constrained floating point intrinsics mixing the default ; floating point environment with alternate modes. None of the tests diff --git a/llvm/test/Transforms/EarlyCSE/nonmixed-strictfp.ll b/llvm/test/Transforms/EarlyCSE/nonmixed-strictfp.ll index 3a89d9ea..1a3dfc0 100644 --- a/llvm/test/Transforms/EarlyCSE/nonmixed-strictfp.ll +++ b/llvm/test/Transforms/EarlyCSE/nonmixed-strictfp.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s -; RUN: opt < %s -S -basic-aa -early-cse-memssa | FileCheck %s +; RUN: opt < %s -S -passes='early-cse' | FileCheck %s ; Test use of constrained floating point intrinsics with consistent ; floating point environments. The default floating point environment diff --git a/llvm/test/Transforms/EarlyCSE/phi.ll b/llvm/test/Transforms/EarlyCSE/phi.ll index 3ad865d..e2cb517 100644 --- a/llvm/test/Transforms/EarlyCSE/phi.ll +++ b/llvm/test/Transforms/EarlyCSE/phi.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt -early-cse -earlycse-debug-hash -S < %s | FileCheck %s -; RUN: opt -basic-aa -early-cse-memssa -S < %s | FileCheck %s +; RUN: opt -passes='early-cse' -S < %s | FileCheck %s ; Most basic case, fully identical PHI nodes define void @test0(i32 %v0, i32 %v1, i1 %c, ptr %d0, ptr %d1) { diff --git a/llvm/test/Transforms/EarlyCSE/pr33406.ll b/llvm/test/Transforms/EarlyCSE/pr33406.ll index 0974f01..f937fe8 100644 --- a/llvm/test/Transforms/EarlyCSE/pr33406.ll +++ b/llvm/test/Transforms/EarlyCSE/pr33406.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -early-cse-memssa -earlycse-debug-hash -S %s | FileCheck %s +; RUN: opt -passes='early-cse' -earlycse-debug-hash -S %s | FileCheck %s @b = external global i32 diff --git a/llvm/test/Transforms/EarlyCSE/reuse-preserved-memoryssa.ll b/llvm/test/Transforms/EarlyCSE/reuse-preserved-memoryssa.ll index 744389c..8580580 100644 --- a/llvm/test/Transforms/EarlyCSE/reuse-preserved-memoryssa.ll +++ b/llvm/test/Transforms/EarlyCSE/reuse-preserved-memoryssa.ll @@ -1,4 +1,4 @@ -; RUN: opt -memoryssa -gvn -early-cse-memssa %s -S | FileCheck %s +; RUN: opt -passes='require,gvn,early-cse' %s -S | FileCheck %s ; CHECK: define void @foo( diff --git a/llvm/test/Transforms/EarlyCSE/round-dyn-strictfp.ll b/llvm/test/Transforms/EarlyCSE/round-dyn-strictfp.ll index a7b7427..0c78f22 100644 --- a/llvm/test/Transforms/EarlyCSE/round-dyn-strictfp.ll +++ b/llvm/test/Transforms/EarlyCSE/round-dyn-strictfp.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s -; RUN: opt < %s -S -basic-aa -early-cse-memssa | FileCheck %s +; RUN: opt < %s -S -passes='early-cse' | FileCheck %s ; Test use of constrained floating point intrinsics with dynamic ; rounding mode. Dynamic rounding _must_ disable CSE since EarlyCSE diff --git a/llvm/test/Transforms/EarlyCSE/tfpropagation.ll b/llvm/test/Transforms/EarlyCSE/tfpropagation.ll index f27a919..b26b8c9 100644 --- a/llvm/test/Transforms/EarlyCSE/tfpropagation.ll +++ b/llvm/test/Transforms/EarlyCSE/tfpropagation.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s -; RUN: opt < %s -S -basic-aa -early-cse-memssa | FileCheck %s +; RUN: opt < %s -S -passes='early-cse' | FileCheck %s define i64 @branching_int(i32 %a) { ; CHECK-LABEL: @branching_int( diff --git a/llvm/test/Transforms/GVNHoist/pr37445.ll b/llvm/test/Transforms/GVNHoist/pr37445.ll index 23e61fe..20b2661 100644 --- a/llvm/test/Transforms/GVNHoist/pr37445.ll +++ b/llvm/test/Transforms/GVNHoist/pr37445.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -early-cse-memssa -earlycse-debug-hash -gvn-hoist -S | FileCheck %s +; RUN: opt < %s -passes='early-cse,gvn-hoist' -earlycse-debug-hash -S | FileCheck %s ; Make sure opt won't crash and that this pair of ; instructions (load, icmp) are not hoisted. diff --git a/llvm/test/Transforms/GVNHoist/pr38807.ll b/llvm/test/Transforms/GVNHoist/pr38807.ll index 0fcfd21..5f9b929 100644 --- a/llvm/test/Transforms/GVNHoist/pr38807.ll +++ b/llvm/test/Transforms/GVNHoist/pr38807.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -early-cse-memssa -earlycse-debug-hash -gvn-hoist -S | FileCheck %s +; RUN: opt < %s -passes='early-cse,gvn-hoist' -earlycse-debug-hash -S | FileCheck %s ; Make sure opt doesn't crash. On top of that, the instructions ; of the side blocks should be hoisted to the entry block. diff --git a/llvm/test/Transforms/LowerMatrixIntrinsics/multiply-minimal.ll b/llvm/test/Transforms/LowerMatrixIntrinsics/multiply-minimal.ll index 7c1b2e4..9b4e0b7 100644 --- a/llvm/test/Transforms/LowerMatrixIntrinsics/multiply-minimal.ll +++ b/llvm/test/Transforms/LowerMatrixIntrinsics/multiply-minimal.ll @@ -1,5 +1,4 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -lower-matrix-intrinsics-minimal -fuse-matrix-tile-size=2 -matrix-allow-contract -force-fuse-matrix -instcombine -verify-dom-info %s -S | FileCheck %s ; RUN: opt -passes='lower-matrix-intrinsics,instcombine,verify' -fuse-matrix-tile-size=2 -matrix-allow-contract -force-fuse-matrix %s -S | FileCheck %s ; Test for the minimal version of the matrix lowering pass, which does not diff --git a/llvm/test/Transforms/SampleProfile/pseudo-probe-cse.ll b/llvm/test/Transforms/SampleProfile/pseudo-probe-cse.ll index 7296a871..29dd707 100644 --- a/llvm/test/Transforms/SampleProfile/pseudo-probe-cse.ll +++ b/llvm/test/Transforms/SampleProfile/pseudo-probe-cse.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -S -early-cse-memssa | FileCheck %s +; RUN: opt < %s -S -passes='early-cse' | FileCheck %s define i16 @f1() readonly { ret i16 0 diff --git a/llvm/tools/opt/NewPMDriver.cpp b/llvm/tools/opt/NewPMDriver.cpp index e3699f0..d6f72f8 100644 --- a/llvm/tools/opt/NewPMDriver.cpp +++ b/llvm/tools/opt/NewPMDriver.cpp @@ -462,18 +462,6 @@ bool llvm::runPassPipeline(StringRef Arg0, Module &M, TargetMachine *TM, std::string ModifiedPassName(PassName.begin(), PassName.end()); if (PB.isAnalysisPassName(PassName)) ModifiedPassName = "require<" + ModifiedPassName + ">"; - // FIXME: These translations are supposed to be removed when lit tests that - // use these names have been updated to use the -passes syntax (and when the - // support for using the old syntax to specify passes is considered as - // deprecated for the new PM). - if (ModifiedPassName == "early-cse-memssa") - ModifiedPassName = "early-cse"; - else if (ModifiedPassName == "post-inline-ee-instrument") - ModifiedPassName = "ee-instrument"; - else if (ModifiedPassName == "loop-extract-single") - ModifiedPassName = "loop-extract"; - else if (ModifiedPassName == "lower-matrix-intrinsics-minimal") - ModifiedPassName = "lower-matrix-intrinsics"; if (auto Err = PB.parsePassPipeline(MPM, ModifiedPassName)) { errs() << Arg0 << ": " << toString(std::move(Err)) << "\n"; return false; -- 2.7.4