From 703378f15646e01193f2aaa0bbf876d27de4b78d Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Tue, 13 Jan 2015 22:45:13 +0000 Subject: [PATCH] [PM] Remove the defunt CGSCC-specific debug flag. Even before I sunk the debug flag into the opt tool this had been made obsolete by factoring the pass and analysis managers into a single set of templates that all used the core flag. No functionality changed here. llvm-svn: 225842 --- llvm/lib/Analysis/CGSCCPassManager.cpp | 4 ---- llvm/test/Other/new-pass-manager.ll | 30 +++++++++++++++--------------- llvm/test/Other/pass-pipeline-parsing.ll | 4 ++-- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/llvm/lib/Analysis/CGSCCPassManager.cpp b/llvm/lib/Analysis/CGSCCPassManager.cpp index 659e37b..4a03002 100644 --- a/llvm/lib/Analysis/CGSCCPassManager.cpp +++ b/llvm/lib/Analysis/CGSCCPassManager.cpp @@ -13,10 +13,6 @@ using namespace llvm; -static cl::opt - DebugPM("debug-cgscc-pass-manager", cl::Hidden, - cl::desc("Print CGSCC pass management debugging information")); - char CGSCCAnalysisManagerModuleProxy::PassID; CGSCCAnalysisManagerModuleProxy::Result diff --git a/llvm/test/Other/new-pass-manager.ll b/llvm/test/Other/new-pass-manager.ll index 05792d5..6454ffc 100644 --- a/llvm/test/Other/new-pass-manager.ll +++ b/llvm/test/Other/new-pass-manager.ll @@ -5,17 +5,17 @@ ; files, but for now this is just going to step the new process through its ; paces. -; RUN: opt -disable-output -disable-verify -debug-pass-manager -debug-cgscc-pass-manager \ +; RUN: opt -disable-output -disable-verify -debug-pass-manager \ ; RUN: -passes=no-op-module %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-MODULE-PASS ; CHECK-MODULE-PASS: Starting pass manager ; CHECK-MODULE-PASS-NEXT: Running pass: NoOpModulePass ; CHECK-MODULE-PASS-NEXT: Finished pass manager -; RUN: opt -disable-output -disable-verify -debug-pass-manager -debug-cgscc-pass-manager \ +; RUN: opt -disable-output -disable-verify -debug-pass-manager \ ; RUN: -passes=no-op-cgscc %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-CGSCC-PASS -; RUN: opt -disable-output -disable-verify -debug-pass-manager -debug-cgscc-pass-manager \ +; RUN: opt -disable-output -disable-verify -debug-pass-manager \ ; RUN: -passes='cgscc(no-op-cgscc)' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-CGSCC-PASS ; CHECK-CGSCC-PASS: Starting pass manager @@ -27,10 +27,10 @@ ; CHECK-CGSCC-PASS-NEXT: Finished pass manager ; CHECK-CGSCC-PASS-NEXT: Finished pass manager -; RUN: opt -disable-output -disable-verify -debug-pass-manager -debug-cgscc-pass-manager \ +; RUN: opt -disable-output -disable-verify -debug-pass-manager \ ; RUN: -passes=no-op-function %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-FUNCTION-PASS -; RUN: opt -disable-output -disable-verify -debug-pass-manager -debug-cgscc-pass-manager \ +; RUN: opt -disable-output -disable-verify -debug-pass-manager \ ; RUN: -passes='function(no-op-function)' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-FUNCTION-PASS ; CHECK-FUNCTION-PASS: Starting pass manager @@ -122,7 +122,7 @@ ; CHECK-NO-VERIFY-NOT: VerifierPass ; CHECK-NO-VERIFY: Finished pass manager -; RUN: opt -disable-output -debug-pass-manager -debug-cgscc-pass-manager \ +; RUN: opt -disable-output -debug-pass-manager \ ; RUN: -passes='require,cgscc(require,function(require))' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-ANALYSES ; CHECK-ANALYSES: Starting pass manager @@ -137,13 +137,13 @@ ; Make sure no-op passes that preserve all analyses don't even try to do any ; analysis invalidation. -; RUN: opt -disable-output -debug-pass-manager -debug-cgscc-pass-manager \ +; RUN: opt -disable-output -debug-pass-manager \ ; RUN: -passes='require,cgscc(require,function(require))' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-NO-OP-INVALIDATION ; CHECK-NO-OP-INVALIDATION: Starting pass manager ; CHECK-NO-OP-INVALIDATION-NOT: Invalidating all non-preserved analyses -; RUN: opt -disable-output -debug-pass-manager -debug-cgscc-pass-manager \ +; RUN: opt -disable-output -debug-pass-manager \ ; RUN: -passes='require,require,require' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS ; CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS: Starting pass manager @@ -151,7 +151,7 @@ ; CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS: Running analysis: NoOpModuleAnalysis ; CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS-NOT: Running analysis: NoOpModuleAnalysis -; RUN: opt -disable-output -debug-pass-manager -debug-cgscc-pass-manager \ +; RUN: opt -disable-output -debug-pass-manager \ ; RUN: -passes='require,invalidate,require' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS ; CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS: Starting pass manager @@ -160,7 +160,7 @@ ; CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS: Invalidating analysis: NoOpModuleAnalysis ; CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS: Running analysis: NoOpModuleAnalysis -; RUN: opt -disable-output -debug-pass-manager -debug-cgscc-pass-manager \ +; RUN: opt -disable-output -debug-pass-manager \ ; RUN: -passes='cgscc(require,require,require)' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS ; CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS: Starting pass manager @@ -168,7 +168,7 @@ ; CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS: Running analysis: NoOpCGSCCAnalysis ; CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS-NOT: Running analysis: NoOpCGSCCAnalysis -; RUN: opt -disable-output -debug-pass-manager -debug-cgscc-pass-manager \ +; RUN: opt -disable-output -debug-pass-manager \ ; RUN: -passes='cgscc(require,invalidate,require)' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS ; CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS: Starting pass manager @@ -177,7 +177,7 @@ ; CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS: Invalidating analysis: NoOpCGSCCAnalysis ; CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS: Running analysis: NoOpCGSCCAnalysis -; RUN: opt -disable-output -debug-pass-manager -debug-cgscc-pass-manager \ +; RUN: opt -disable-output -debug-pass-manager \ ; RUN: -passes='function(require,require,require)' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS ; CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS: Starting pass manager @@ -185,7 +185,7 @@ ; CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS: Running analysis: NoOpFunctionAnalysis ; CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS-NOT: Running analysis: NoOpFunctionAnalysis -; RUN: opt -disable-output -debug-pass-manager -debug-cgscc-pass-manager \ +; RUN: opt -disable-output -debug-pass-manager \ ; RUN: -passes='function(require,invalidate,require)' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS ; CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS: Starting pass manager @@ -194,7 +194,7 @@ ; CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS: Invalidating analysis: NoOpFunctionAnalysis ; CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS: Running analysis: NoOpFunctionAnalysis -; RUN: opt -disable-output -disable-verify -debug-pass-manager -debug-cgscc-pass-manager \ +; RUN: opt -disable-output -disable-verify -debug-pass-manager \ ; RUN: -passes='require,module(require,function(require,invalidate,require),require),require' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-INVALIDATE-ALL ; CHECK-INVALIDATE-ALL: Starting pass manager @@ -225,7 +225,7 @@ ; CHECK-INVALIDATE-ALL-NOT: Running analysis: NoOpModuleAnalysis ; CHECK-INVALIDATE-ALL: Finished pass manager -; RUN: opt -disable-output -disable-verify -debug-pass-manager -debug-cgscc-pass-manager \ +; RUN: opt -disable-output -disable-verify -debug-pass-manager \ ; RUN: -passes='require,module(require,cgscc(require,function(require,invalidate,require),require),require),require' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-INVALIDATE-ALL-CG ; CHECK-INVALIDATE-ALL-CG: Starting pass manager diff --git a/llvm/test/Other/pass-pipeline-parsing.ll b/llvm/test/Other/pass-pipeline-parsing.ll index 0b49eb7..da0e760 100644 --- a/llvm/test/Other/pass-pipeline-parsing.ll +++ b/llvm/test/Other/pass-pipeline-parsing.ll @@ -101,7 +101,7 @@ ; RUN: | FileCheck %s --check-prefix=CHECK-UNBALANCED10 ; CHECK-UNBALANCED10: unable to parse pass pipeline description -; RUN: opt -disable-output -debug-pass-manager -debug-cgscc-pass-manager \ +; RUN: opt -disable-output -debug-pass-manager \ ; RUN: -passes=no-op-cgscc,no-op-cgscc %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-TWO-NOOP-CG ; CHECK-TWO-NOOP-CG: Starting pass manager @@ -112,7 +112,7 @@ ; CHECK-TWO-NOOP-CG: Finished pass manager ; CHECK-TWO-NOOP-CG: Finished pass manager -; RUN: opt -disable-output -debug-pass-manager -debug-cgscc-pass-manager \ +; RUN: opt -disable-output -debug-pass-manager \ ; RUN: -passes='module(function(no-op-function),cgscc(no-op-cgscc,function(no-op-function),no-op-cgscc),function(no-op-function))' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-NESTED-MP-CG-FP ; CHECK-NESTED-MP-CG-FP: Starting pass manager -- 2.7.4