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

bjope · bjope · commit e9320b1a95a6 · 2021-10-20T15:16:18.000+02:00
With legacy PM being deprecated it should be enough to verify the
scalarizer pass using the new-PM syntax when invoking opt.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-; RUN: opt %s -scalarizer -scalarize-load-store -dce -S \| FileCheck %s`
`2`	`1`	`; RUN: opt %s -passes='function(scalarizer,dce)' -scalarize-load-store -S \| FileCheck %s`
`3`	`2`	`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"`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-; RUN: opt -scalarizer -S < %s \| FileCheck %s`
`2`	`1`	`; RUN: opt -passes='function(scalarizer)' -S < %s \| FileCheck %s`
`3`	`2`	`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"`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-; RUN: opt %s -scalarizer -S -o - \| FileCheck %s`
`2`	`1`	`; RUN: opt %s -passes='function(scalarizer)' -S -o - \| FileCheck %s`
`3`	`2`
`4`	`3`	`; Don't crash`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-; RUN: opt -S -march=x86 -scalarizer %s \| FileCheck %s`
`2`	`1`	`; RUN: opt -S -march=x86 -passes='function(scalarizer)' %s \| FileCheck %s`
`3`	`2`
`4`	`3`	`; Reproducer for pr27938`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-; RUN: opt < %s -scalarizer -S -o - \| FileCheck %s`
`2`	`1`	`; RUN: opt < %s -passes='function(scalarizer)' -S \| FileCheck %s`
`3`	`2`
`4`	`3`	`; The scalarizer used to change the name of the global variable`