From 98574aa1d24a310ddbabdc668cafee4d499b51e7 Mon Sep 17 00:00:00 2001 From: Arthur Eubanks Date: Mon, 11 Apr 2022 13:39:17 -0700 Subject: [PATCH] [test] Remove references to -fno-legacy-pass-manager in tests This has been the default for a while and we're in the process of removing the legacy PM optimization pipeline. --- .../test/CodeGen/aarch64-bf16-dotprod-intrinsics.c | 2 +- .../test/CodeGen/aarch64-bf16-getset-intrinsics.c | 2 +- clang/test/CodeGen/aarch64-bf16-lane-intrinsics.c | 4 ++-- clang/test/CodeGen/arm-bf16-convert-intrinsics.c | 6 +++--- clang/test/CodeGen/arm-bf16-dotprod-intrinsics.c | 4 ++-- clang/test/CodeGen/arm-bf16-getset-intrinsics.c | 4 ++-- clang/test/CodeGen/pseudo-probe-emit.c | 4 ++-- .../test/CodeGenCXX/fdebug-info-for-profiling.cpp | 8 +++---- clang/test/Misc/time-passes.c | 25 ++++------------------ 9 files changed, 21 insertions(+), 38 deletions(-) diff --git a/clang/test/CodeGen/aarch64-bf16-dotprod-intrinsics.c b/clang/test/CodeGen/aarch64-bf16-dotprod-intrinsics.c index 49351d5..b4faa3b 100644 --- a/clang/test/CodeGen/aarch64-bf16-dotprod-intrinsics.c +++ b/clang/test/CodeGen/aarch64-bf16-dotprod-intrinsics.c @@ -1,6 +1,6 @@ // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py // RUN: %clang_cc1 -no-opaque-pointers -triple aarch64-arm-none-eabi -target-feature +neon -target-feature +bf16 \ -// RUN: -disable-O0-optnone -emit-llvm -fno-legacy-pass-manager %s -o - | opt -S -mem2reg | FileCheck %s +// RUN: -disable-O0-optnone -emit-llvm %s -o - | opt -S -mem2reg | FileCheck %s // REQUIRES: aarch64-registered-target || arm-registered-target diff --git a/clang/test/CodeGen/aarch64-bf16-getset-intrinsics.c b/clang/test/CodeGen/aarch64-bf16-getset-intrinsics.c index eac4f7e..5a69200 100644 --- a/clang/test/CodeGen/aarch64-bf16-getset-intrinsics.c +++ b/clang/test/CodeGen/aarch64-bf16-getset-intrinsics.c @@ -1,6 +1,6 @@ // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py // RUN: %clang_cc1 -triple aarch64-arm-none-eabi -target-feature +neon -target-feature +bf16 \ -// RUN: -disable-O0-optnone -emit-llvm -fno-legacy-pass-manager %s -o - | opt -S -mem2reg | FileCheck %s +// RUN: -disable-O0-optnone -emit-llvm %s -o - | opt -S -mem2reg | FileCheck %s // REQUIRES: aarch64-registered-target || arm-registered-target diff --git a/clang/test/CodeGen/aarch64-bf16-lane-intrinsics.c b/clang/test/CodeGen/aarch64-bf16-lane-intrinsics.c index fa71ffd..f64fbdb 100644 --- a/clang/test/CodeGen/aarch64-bf16-lane-intrinsics.c +++ b/clang/test/CodeGen/aarch64-bf16-lane-intrinsics.c @@ -1,8 +1,8 @@ // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py // RUN: %clang_cc1 -triple aarch64-arm-none-eabi -target-feature +neon -target-feature +bf16 \ -// RUN: -disable-O0-optnone -emit-llvm -fno-legacy-pass-manager %s -o - | opt -S -mem2reg | FileCheck --check-prefix=CHECK-LE %s +// RUN: -disable-O0-optnone -emit-llvm %s -o - | opt -S -mem2reg | FileCheck --check-prefix=CHECK-LE %s // RUN: %clang_cc1 -triple aarch64_be-arm-none-eabi -target-feature +neon -target-feature +bf16 \ -// RUN: -disable-O0-optnone -emit-llvm %s -fno-legacy-pass-manager -o - | opt -S -mem2reg | FileCheck --check-prefix=CHECK-BE %s +// RUN: -disable-O0-optnone -emit-llvm %s -o - | opt -S -mem2reg | FileCheck --check-prefix=CHECK-BE %s // REQUIRES: aarch64-registered-target || arm-registered-target diff --git a/clang/test/CodeGen/arm-bf16-convert-intrinsics.c b/clang/test/CodeGen/arm-bf16-convert-intrinsics.c index 81c949c..d40504e 100644 --- a/clang/test/CodeGen/arm-bf16-convert-intrinsics.c +++ b/clang/test/CodeGen/arm-bf16-convert-intrinsics.c @@ -1,19 +1,19 @@ // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py // RUN: %clang_cc1 -no-opaque-pointers \ // RUN: -triple aarch64-arm-none-eabi -target-feature +neon -target-feature +bf16 \ -// RUN: -disable-O0-optnone -emit-llvm -fno-legacy-pass-manager -o - %s \ +// RUN: -disable-O0-optnone -emit-llvm -o - %s \ // RUN: | opt -S -mem2reg \ // RUN: | FileCheck --check-prefixes=CHECK,CHECK-A64 %s // RUN: %clang_cc1 -no-opaque-pointers \ // RUN: -triple armv8.6a-arm-none-eabi -target-feature +neon \ // RUN: -target-feature +bf16 -mfloat-abi hard \ -// RUN: -disable-O0-optnone -emit-llvm -fno-legacy-pass-manager -o - %s \ +// RUN: -disable-O0-optnone -emit-llvm -o - %s \ // RUN: | opt -S -mem2reg \ // RUN: | FileCheck --check-prefixes=CHECK,CHECK-A32-HARDFP %s // RUN: %clang_cc1 -no-opaque-pointers \ // RUN: -triple armv8.6a-arm-none-eabi -target-feature +neon \ // RUN: -target-feature +bf16 -mfloat-abi softfp \ -// RUN: -disable-O0-optnone -emit-llvm -fno-legacy-pass-manager -o - %s \ +// RUN: -disable-O0-optnone -emit-llvm -o - %s \ // RUN: | opt -S -mem2reg \ // RUN: | FileCheck --check-prefixes=CHECK,CHECK-A32-SOFTFP %s diff --git a/clang/test/CodeGen/arm-bf16-dotprod-intrinsics.c b/clang/test/CodeGen/arm-bf16-dotprod-intrinsics.c index 3648f3c..fbecb0d 100644 --- a/clang/test/CodeGen/arm-bf16-dotprod-intrinsics.c +++ b/clang/test/CodeGen/arm-bf16-dotprod-intrinsics.c @@ -1,11 +1,11 @@ // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py // RUN: %clang_cc1 -no-opaque-pointers -triple armv8-arm-none-eabi \ // RUN: -target-feature +neon -target-feature +bf16 -mfloat-abi soft \ -// RUN: -disable-O0-optnone -S -emit-llvm -fno-legacy-pass-manager -o - %s \ +// RUN: -disable-O0-optnone -S -emit-llvm -o - %s \ // RUN: | opt -S -mem2reg | FileCheck %s // RUN: %clang_cc1 -no-opaque-pointers -triple armv8-arm-none-eabi \ // RUN: -target-feature +neon -target-feature +bf16 -mfloat-abi hard \ -// RUN: -disable-O0-optnone -S -emit-llvm -fno-legacy-pass-manager -o - %s \ +// RUN: -disable-O0-optnone -S -emit-llvm -o - %s \ // RUN: | opt -S -mem2reg | FileCheck %s // REQUIRES: aarch64-registered-target || arm-registered-target diff --git a/clang/test/CodeGen/arm-bf16-getset-intrinsics.c b/clang/test/CodeGen/arm-bf16-getset-intrinsics.c index 01b9c70..cf0cefc 100644 --- a/clang/test/CodeGen/arm-bf16-getset-intrinsics.c +++ b/clang/test/CodeGen/arm-bf16-getset-intrinsics.c @@ -1,8 +1,8 @@ // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py // RUN: %clang_cc1 -triple armv8.6a-arm-none-eabi -target-feature +neon -target-feature +bf16 -mfloat-abi hard \ -// RUN: -disable-O0-optnone -emit-llvm -fno-legacy-pass-manager %s -o - | opt -S -mem2reg | FileCheck %s +// RUN: -disable-O0-optnone -emit-llvm %s -o - | opt -S -mem2reg | FileCheck %s // RUN: %clang_cc1 -triple armv8.6a-arm-none-eabi -target-feature +neon -target-feature +bf16 -mfloat-abi soft \ -// RUN: -disable-O0-optnone -emit-llvm -fno-legacy-pass-manager %s -o - | opt -S -mem2reg | FileCheck %s +// RUN: -disable-O0-optnone -emit-llvm %s -o - | opt -S -mem2reg | FileCheck %s // REQUIRES: aarch64-registered-target || arm-registered-target diff --git a/clang/test/CodeGen/pseudo-probe-emit.c b/clang/test/CodeGen/pseudo-probe-emit.c index df2c8c7..c7a3f7e 100644 --- a/clang/test/CodeGen/pseudo-probe-emit.c +++ b/clang/test/CodeGen/pseudo-probe-emit.c @@ -1,5 +1,5 @@ -// RUN: %clang_cc1 -O0 -fno-legacy-pass-manager -fpseudo-probe-for-profiling -debug-info-kind=limited -emit-llvm -o - %s | FileCheck %s -// RUN: %clang_cc1 -O2 -fno-legacy-pass-manager -fpseudo-probe-for-profiling -debug-info-kind=limited -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -O0 -fpseudo-probe-for-profiling -debug-info-kind=limited -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -O2 -fpseudo-probe-for-profiling -debug-info-kind=limited -emit-llvm -o - %s | FileCheck %s // Check the generation of pseudoprobe intrinsic call diff --git a/clang/test/CodeGenCXX/fdebug-info-for-profiling.cpp b/clang/test/CodeGenCXX/fdebug-info-for-profiling.cpp index 421195d..e468a80 100644 --- a/clang/test/CodeGenCXX/fdebug-info-for-profiling.cpp +++ b/clang/test/CodeGenCXX/fdebug-info-for-profiling.cpp @@ -8,13 +8,13 @@ // CHECK: = distinct !DISubprogram(name: "foo", linkageName: "_Z3foov", scope: /// Add a DWARF discriminators pass for PGO. -// RUN: %clang_cc1 -emit-llvm -fno-legacy-pass-manager -fdebug-pass-manager -O1 -fprofile-instrument-path=a.profdata %s -o - 2>&1 | FileCheck %s --check-prefix=NODISCR -// RUN: %clang_cc1 -emit-llvm -fno-legacy-pass-manager -fdebug-pass-manager -O1 -fprofile-instrument-path=a.profdata -fdebug-info-for-profiling %s -o - 2>&1 | FileCheck %s --check-prefix=DISCR +// RUN: %clang_cc1 -emit-llvm -fdebug-pass-manager -O1 -fprofile-instrument-path=a.profdata %s -o - 2>&1 | FileCheck %s --check-prefix=NODISCR +// RUN: %clang_cc1 -emit-llvm -fdebug-pass-manager -O1 -fprofile-instrument-path=a.profdata -fdebug-info-for-profiling %s -o - 2>&1 | FileCheck %s --check-prefix=DISCR // RUN: echo > %t.proftext // RUN: llvm-profdata merge %t.proftext -o %t.profdata -// RUN: %clang_cc1 -emit-llvm -fno-legacy-pass-manager -fdebug-pass-manager -O1 -fprofile-instrument-use-path=%t.profdata -fdebug-info-for-profiling %s -o - 2>&1 | FileCheck %s --check-prefix=DISCR -// RUN: %clang_cc1 -emit-llvm -fno-legacy-pass-manager -fdebug-pass-manager -O1 -fdebug-info-for-profiling -fpseudo-probe-for-profiling %s -o - 2>&1 | FileCheck %s --check-prefix=PROBE +// RUN: %clang_cc1 -emit-llvm -fdebug-pass-manager -O1 -fprofile-instrument-use-path=%t.profdata -fdebug-info-for-profiling %s -o - 2>&1 | FileCheck %s --check-prefix=DISCR +// RUN: %clang_cc1 -emit-llvm -fdebug-pass-manager -O1 -fdebug-info-for-profiling -fpseudo-probe-for-profiling %s -o - 2>&1 | FileCheck %s --check-prefix=PROBE // NODISCR-NOT: Running pass: AddDiscriminatorsPass // DISCR: Running pass: AddDiscriminatorsPass on {{.*}} diff --git a/clang/test/Misc/time-passes.c b/clang/test/Misc/time-passes.c index c476bcc..395da21 100644 --- a/clang/test/Misc/time-passes.c +++ b/clang/test/Misc/time-passes.c @@ -1,31 +1,17 @@ -// Check that legacy pass manager could only use -ftime-report -// RUN: %clang_cc1 -flegacy-pass-manager -emit-obj -O1 \ -// RUN: -ftime-report %s -o /dev/null 2>&1 | \ -// RUN: FileCheck %s --check-prefixes=TIME,LPM -// RUN: not %clang_cc1 -flegacy-pass-manager -emit-obj -O1 \ -// RUN: -ftime-report=per-pass %s -o /dev/null 2>&1 | \ -// RUN: FileCheck %s --check-prefixes=ERROR -// RUN: not %clang_cc1 -flegacy-pass-manager -emit-obj -O1 \ -// RUN: -ftime-report=per-pass-run %s -o /dev/null 2>&1 | \ -// RUN: FileCheck %s --check-prefixes=ERROR - -// Check -ftime-report/-ftime-report= output for the new pass manager -// RUN: %clang_cc1 -emit-obj -O1 -fno-legacy-pass-manager \ +// Check -ftime-report/-ftime-report= output +// RUN: %clang_cc1 -emit-obj -O1 \ // RUN: -ftime-report %s -o /dev/null 2>&1 | \ // RUN: FileCheck %s --check-prefixes=TIME,NPM -// RUN: %clang_cc1 -emit-obj -O1 -fno-legacy-pass-manager \ +// RUN: %clang_cc1 -emit-obj -O1 \ // RUN: -ftime-report=per-pass %s -o /dev/null 2>&1 | \ // RUN: FileCheck %s --check-prefixes=TIME,NPM -// RUN: %clang_cc1 -emit-obj -O1 -fno-legacy-pass-manager \ +// RUN: %clang_cc1 -emit-obj -O1 \ // RUN: -ftime-report=per-pass-run %s -o /dev/null 2>&1 | \ // RUN: FileCheck %s --check-prefixes=TIME,NPM-PER-INVOKE // TIME: Pass execution timing report // TIME: Total Execution Time: // TIME: Name -// LPM-DAG: Dominator Tree Construction # -// LPM-DAG: Dominator Tree Construction # -// LPM-DAG: Dominator Tree Construction # // NPM-PER-INVOKE-DAG: InstCombinePass # // NPM-PER-INVOKE-DAG: InstCombinePass # // NPM-PER-INVOKE-DAG: InstCombinePass # @@ -33,9 +19,6 @@ // NPM: InstCombinePass{{$}} // NPM-NOT: InstCombinePass # // TIME: Total{{$}} -// LPM-NOT: Pass execution timing report // NPM: Pass execution timing report -// ERROR: error: invalid argument '-ftime-report={{.*}}' only allowed with '-fno-legacy-pass-manager' - int foo(int x, int y) { return x + y; } -- 2.7.4