[llvm] e9320b1 - [NewPM][test] Only use -passes syntax in Scalarizer lit tests

Bjorn Pettersson via llvm-commits llvm-commits at lists.llvm.org
Wed Oct 20 06:17:07 PDT 2021


Author: Bjorn Pettersson
Date: 2021-10-20T15:16:18+02:00
New Revision: e9320b1a95a69652bba9b3ba66900b1c0e8f6b0a

URL: https://github.com/llvm/llvm-project/commit/e9320b1a95a69652bba9b3ba66900b1c0e8f6b0a
DIFF: https://github.com/llvm/llvm-project/commit/e9320b1a95a69652bba9b3ba66900b1c0e8f6b0a.diff

LOG: [NewPM][test] Only use -passes syntax in Scalarizer lit tests

With legacy PM being deprecated it should be enough to verify the
scalarizer pass using the new-PM syntax when invoking opt.

Added: 
    

Modified: 
    llvm/test/Transforms/Scalarizer/basic-inseltpoison.ll
    llvm/test/Transforms/Scalarizer/basic.ll
    llvm/test/Transforms/Scalarizer/cache-bug.ll
    llvm/test/Transforms/Scalarizer/constant-extractelement.ll
    llvm/test/Transforms/Scalarizer/constant-insertelement.ll
    llvm/test/Transforms/Scalarizer/crash-bug.ll
    llvm/test/Transforms/Scalarizer/dbginfo.ll
    llvm/test/Transforms/Scalarizer/dbgloc-bug-inseltpoison.ll
    llvm/test/Transforms/Scalarizer/dbgloc-bug.ll
    llvm/test/Transforms/Scalarizer/global-bug-2.ll
    llvm/test/Transforms/Scalarizer/global-bug.ll
    llvm/test/Transforms/Scalarizer/intrinsics.ll
    llvm/test/Transforms/Scalarizer/order-bug-inseltpoison.ll
    llvm/test/Transforms/Scalarizer/order-bug.ll
    llvm/test/Transforms/Scalarizer/phi-bug-inseltpoison.ll
    llvm/test/Transforms/Scalarizer/phi-bug.ll
    llvm/test/Transforms/Scalarizer/phi-unreachable-pred.ll
    llvm/test/Transforms/Scalarizer/scatter-order.ll
    llvm/test/Transforms/Scalarizer/store-bug.ll
    llvm/test/Transforms/Scalarizer/variable-extractelement.ll
    llvm/test/Transforms/Scalarizer/variable-insertelement.ll
    llvm/test/Transforms/Scalarizer/vector-gep.ll

Removed: 
    


################################################################################
diff  --git a/llvm/test/Transforms/Scalarizer/basic-inseltpoison.ll b/llvm/test/Transforms/Scalarizer/basic-inseltpoison.ll
index 2b501cfd0a7e..5eb04df3fe77 100644
--- a/llvm/test/Transforms/Scalarizer/basic-inseltpoison.ll
+++ b/llvm/test/Transforms/Scalarizer/basic-inseltpoison.ll
@@ -1,4 +1,3 @@
-; RUN: opt %s -scalarizer -scalarize-load-store -dce -S | FileCheck %s
 ; RUN: opt %s -passes='function(scalarizer,dce)' -scalarize-load-store -S | FileCheck %s
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/Scalarizer/basic.ll b/llvm/test/Transforms/Scalarizer/basic.ll
index 419aa0cfd00a..23eef9ec927d 100644
--- a/llvm/test/Transforms/Scalarizer/basic.ll
+++ b/llvm/test/Transforms/Scalarizer/basic.ll
@@ -1,4 +1,3 @@
-; RUN: opt %s -scalarizer -scalarize-load-store -dce -S | FileCheck %s
 ; RUN: opt %s -passes='function(scalarizer,dce)' -scalarize-load-store -S | FileCheck %s
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/Scalarizer/cache-bug.ll b/llvm/test/Transforms/Scalarizer/cache-bug.ll
index cfb4140e41c5..e5f90ec9d1f6 100644
--- a/llvm/test/Transforms/Scalarizer/cache-bug.ll
+++ b/llvm/test/Transforms/Scalarizer/cache-bug.ll
@@ -1,4 +1,3 @@
-; RUN: opt -scalarizer -S < %s | FileCheck %s
 ; RUN: opt -passes='function(scalarizer)' -S < %s | FileCheck %s
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/Scalarizer/constant-extractelement.ll b/llvm/test/Transforms/Scalarizer/constant-extractelement.ll
index f5bb2edac4e6..2bd324c894bf 100644
--- a/llvm/test/Transforms/Scalarizer/constant-extractelement.ll
+++ b/llvm/test/Transforms/Scalarizer/constant-extractelement.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt %s -scalarizer -scalarize-load-store -dce -S | FileCheck --check-prefixes=ALL %s
+; RUN: opt %s -passes='function(scalarizer,dce)' -scalarize-load-store -S | FileCheck --check-prefixes=ALL %s
 
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/Scalarizer/constant-insertelement.ll b/llvm/test/Transforms/Scalarizer/constant-insertelement.ll
index 7bb659aff352..4e2ade287f6a 100644
--- a/llvm/test/Transforms/Scalarizer/constant-insertelement.ll
+++ b/llvm/test/Transforms/Scalarizer/constant-insertelement.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt %s -scalarizer -scalarize-load-store -dce -S | FileCheck --check-prefixes=ALL %s
+; RUN: opt %s -passes='function(scalarizer,dce)' -scalarize-load-store -S | FileCheck --check-prefixes=ALL %s
 
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/Scalarizer/crash-bug.ll b/llvm/test/Transforms/Scalarizer/crash-bug.ll
index 97756362d424..6fe7de402d88 100644
--- a/llvm/test/Transforms/Scalarizer/crash-bug.ll
+++ b/llvm/test/Transforms/Scalarizer/crash-bug.ll
@@ -1,4 +1,3 @@
-; RUN: opt %s -scalarizer -S -o - | FileCheck %s
 ; RUN: opt %s -passes='function(scalarizer)' -S -o - | FileCheck %s
 
 ; Don't crash

diff  --git a/llvm/test/Transforms/Scalarizer/dbginfo.ll b/llvm/test/Transforms/Scalarizer/dbginfo.ll
index a5ae12bd80e4..9c0c7ec3112f 100644
--- a/llvm/test/Transforms/Scalarizer/dbginfo.ll
+++ b/llvm/test/Transforms/Scalarizer/dbginfo.ll
@@ -1,4 +1,3 @@
-; RUN: opt %s -scalarizer -scalarize-load-store -S | FileCheck %s
 ; RUN: opt %s -passes='function(scalarizer)' -scalarize-load-store -S | FileCheck %s
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/Scalarizer/dbgloc-bug-inseltpoison.ll b/llvm/test/Transforms/Scalarizer/dbgloc-bug-inseltpoison.ll
index 454f2b39a8de..e5ba35ca2c4e 100644
--- a/llvm/test/Transforms/Scalarizer/dbgloc-bug-inseltpoison.ll
+++ b/llvm/test/Transforms/Scalarizer/dbgloc-bug-inseltpoison.ll
@@ -1,4 +1,3 @@
-; RUN: opt -S -march=x86 -scalarizer %s | FileCheck %s
 ; RUN: opt -S -march=x86 -passes='function(scalarizer)' %s | FileCheck %s
 
 ; Reproducer for pr27938

diff  --git a/llvm/test/Transforms/Scalarizer/dbgloc-bug.ll b/llvm/test/Transforms/Scalarizer/dbgloc-bug.ll
index 7c627ee78a34..639fd3d7c095 100644
--- a/llvm/test/Transforms/Scalarizer/dbgloc-bug.ll
+++ b/llvm/test/Transforms/Scalarizer/dbgloc-bug.ll
@@ -1,4 +1,3 @@
-; RUN: opt -S -march=x86 -scalarizer %s | FileCheck %s
 ; RUN: opt -S -march=x86 -passes='function(scalarizer)' %s | FileCheck %s
 
 ; Reproducer for pr27938

diff  --git a/llvm/test/Transforms/Scalarizer/global-bug-2.ll b/llvm/test/Transforms/Scalarizer/global-bug-2.ll
index 60f61ab08184..31eeb9de3fde 100644
--- a/llvm/test/Transforms/Scalarizer/global-bug-2.ll
+++ b/llvm/test/Transforms/Scalarizer/global-bug-2.ll
@@ -1,4 +1,3 @@
-; RUN: opt < %s -scalarizer -S -o - | FileCheck %s
 ; RUN: opt < %s -passes='function(scalarizer)' -S | FileCheck %s
 
 ; The scalarizer used to change the name of the global variable

diff  --git a/llvm/test/Transforms/Scalarizer/global-bug.ll b/llvm/test/Transforms/Scalarizer/global-bug.ll
index 37a01844a359..91d1bd23af98 100644
--- a/llvm/test/Transforms/Scalarizer/global-bug.ll
+++ b/llvm/test/Transforms/Scalarizer/global-bug.ll
@@ -1,4 +1,3 @@
-; RUN: opt < %s -scalarizer -S -o - | FileCheck %s
 ; RUN: opt < %s -passes='function(scalarizer)' -S | FileCheck %s
 
 @a = dso_local global i16 0, align 1

diff  --git a/llvm/test/Transforms/Scalarizer/intrinsics.ll b/llvm/test/Transforms/Scalarizer/intrinsics.ll
index ece3f5a11b9a..896000db7d46 100644
--- a/llvm/test/Transforms/Scalarizer/intrinsics.ll
+++ b/llvm/test/Transforms/Scalarizer/intrinsics.ll
@@ -1,4 +1,3 @@
-; RUN: opt -S -scalarizer %s | FileCheck %s
 ; RUN: opt -S -passes='function(scalarizer)' %s | FileCheck %s
 
 ; Unary fp

diff  --git a/llvm/test/Transforms/Scalarizer/order-bug-inseltpoison.ll b/llvm/test/Transforms/Scalarizer/order-bug-inseltpoison.ll
index 2ebd035ec492..2345d66b8929 100644
--- a/llvm/test/Transforms/Scalarizer/order-bug-inseltpoison.ll
+++ b/llvm/test/Transforms/Scalarizer/order-bug-inseltpoison.ll
@@ -1,4 +1,3 @@
-; RUN: opt %s -scalarizer -S -o - | FileCheck %s
 ; RUN: opt %s -passes='function(scalarizer)' -S -o - | FileCheck %s
 
 ; This input caused the scalarizer to replace & erase gathered results when 

diff  --git a/llvm/test/Transforms/Scalarizer/order-bug.ll b/llvm/test/Transforms/Scalarizer/order-bug.ll
index 1bc069d55b8e..baa939303605 100644
--- a/llvm/test/Transforms/Scalarizer/order-bug.ll
+++ b/llvm/test/Transforms/Scalarizer/order-bug.ll
@@ -1,7 +1,6 @@
-; RUN: opt %s -scalarizer -S -o - | FileCheck %s
 ; RUN: opt %s -passes='function(scalarizer)' -S -o - | FileCheck %s
 
-; This input caused the scalarizer to replace & erase gathered results when 
+; This input caused the scalarizer to replace & erase gathered results when
 ; future gathered results depended on them being alive
 
 define dllexport spir_func <4 x i32> @main(float %a) {

diff  --git a/llvm/test/Transforms/Scalarizer/phi-bug-inseltpoison.ll b/llvm/test/Transforms/Scalarizer/phi-bug-inseltpoison.ll
index cf5488e65480..4289fd4f5a4c 100644
--- a/llvm/test/Transforms/Scalarizer/phi-bug-inseltpoison.ll
+++ b/llvm/test/Transforms/Scalarizer/phi-bug-inseltpoison.ll
@@ -1,4 +1,3 @@
-; RUN: opt %s -scalarizer -verify -S -o - | FileCheck %s
 ; RUN: opt %s -passes='function(scalarizer,verify)' -S -o - | FileCheck %s
 
 define void @f3() local_unnamed_addr {

diff  --git a/llvm/test/Transforms/Scalarizer/phi-bug.ll b/llvm/test/Transforms/Scalarizer/phi-bug.ll
index 3fd08130c536..c94200e273bf 100644
--- a/llvm/test/Transforms/Scalarizer/phi-bug.ll
+++ b/llvm/test/Transforms/Scalarizer/phi-bug.ll
@@ -1,4 +1,3 @@
-; RUN: opt %s -scalarizer -verify -S -o - | FileCheck %s
 ; RUN: opt %s -passes='function(scalarizer,verify)' -S -o - | FileCheck %s
 
 define void @f3() local_unnamed_addr {

diff  --git a/llvm/test/Transforms/Scalarizer/phi-unreachable-pred.ll b/llvm/test/Transforms/Scalarizer/phi-unreachable-pred.ll
index 9cfffe3b977f..b0df8001d1c5 100644
--- a/llvm/test/Transforms/Scalarizer/phi-unreachable-pred.ll
+++ b/llvm/test/Transforms/Scalarizer/phi-unreachable-pred.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -scalarizer -S -o - | FileCheck %s
+; RUN: opt < %s -passes='function(scalarizer)' -S -o - | FileCheck %s
 
 define i16 @f1() {
 ; CHECK-LABEL: @f1(

diff  --git a/llvm/test/Transforms/Scalarizer/scatter-order.ll b/llvm/test/Transforms/Scalarizer/scatter-order.ll
index 23967f41978f..36c62c5c8645 100644
--- a/llvm/test/Transforms/Scalarizer/scatter-order.ll
+++ b/llvm/test/Transforms/Scalarizer/scatter-order.ll
@@ -1,5 +1,4 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt %s -scalarizer -scalarize-load-store -S | FileCheck %s
 ; RUN: opt %s -passes='function(scalarizer)' -scalarize-load-store -S | FileCheck %s
 
 ; This verifies that the order of extract element instructions is

diff  --git a/llvm/test/Transforms/Scalarizer/store-bug.ll b/llvm/test/Transforms/Scalarizer/store-bug.ll
index 8f4d30db1a87..0793cb402fc5 100644
--- a/llvm/test/Transforms/Scalarizer/store-bug.ll
+++ b/llvm/test/Transforms/Scalarizer/store-bug.ll
@@ -1,4 +1,3 @@
-; RUN: opt -scalarizer -scalarize-load-store -S < %s | FileCheck %s
 ; RUN: opt -passes='function(scalarizer)' -scalarize-load-store -S < %s | FileCheck %s
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/Scalarizer/variable-extractelement.ll b/llvm/test/Transforms/Scalarizer/variable-extractelement.ll
index 5e922d530f84..9374f869a23d 100644
--- a/llvm/test/Transforms/Scalarizer/variable-extractelement.ll
+++ b/llvm/test/Transforms/Scalarizer/variable-extractelement.ll
@@ -1,7 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt %s -scalarizer -dce -S | FileCheck --check-prefix=DEFAULT %s
-; RUN: opt %s -scalarizer -scalarize-variable-insert-extract=false -dce -S | FileCheck --check-prefix=OFF %s
-; RUN: opt %s -scalarizer -scalarize-variable-insert-extract=true -dce -S | FileCheck --check-prefix=DEFAULT %s
+; RUN: opt %s -passes='function(scalarizer,dce)' -S | FileCheck --check-prefix=DEFAULT %s
+; RUN: opt %s -passes='function(scalarizer,dce)' -scalarize-variable-insert-extract=false -S | FileCheck --check-prefix=OFF %s
+; RUN: opt %s -passes='function(scalarizer,dce)' -scalarize-variable-insert-extract=true -S | FileCheck --check-prefix=DEFAULT %s
 
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/Scalarizer/variable-insertelement.ll b/llvm/test/Transforms/Scalarizer/variable-insertelement.ll
index 6c8b49ecf148..c757d2c7f9c7 100644
--- a/llvm/test/Transforms/Scalarizer/variable-insertelement.ll
+++ b/llvm/test/Transforms/Scalarizer/variable-insertelement.ll
@@ -1,7 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt %s -scalarizer -dce -S | FileCheck --check-prefix=DEFAULT %s
-; RUN: opt %s -scalarizer -scalarize-variable-insert-extract=false -dce -S | FileCheck --check-prefix=OFF %s
-; RUN: opt %s -scalarizer -scalarize-variable-insert-extract=true -dce -S | FileCheck --check-prefix=DEFAULT %s
+; RUN: opt %s -passes='function(scalarizer,dce)' -S | FileCheck --check-prefix=DEFAULT %s
+; RUN: opt %s -passes='function(scalarizer,dce)' -scalarize-variable-insert-extract=false -S | FileCheck --check-prefix=OFF %s
+; RUN: opt %s -passes='function(scalarizer,dce)' -scalarize-variable-insert-extract=true -S | FileCheck --check-prefix=DEFAULT %s
 
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 

diff  --git a/llvm/test/Transforms/Scalarizer/vector-gep.ll b/llvm/test/Transforms/Scalarizer/vector-gep.ll
index 7a0d387c84bd..f62bc0d128fd 100644
--- a/llvm/test/Transforms/Scalarizer/vector-gep.ll
+++ b/llvm/test/Transforms/Scalarizer/vector-gep.ll
@@ -1,4 +1,3 @@
-; RUN: opt -S -scalarizer %s | FileCheck %s
 ; RUN: opt -S -passes='function(scalarizer)' %s | FileCheck %s
 
 ; Check that the scalarizer can handle vector GEPs with scalar indices


        


More information about the llvm-commits mailing list