diff --git a/llvm/docs/Passes.rst b/llvm/docs/Passes.rst --- a/llvm/docs/Passes.rst +++ b/llvm/docs/Passes.rst @@ -284,18 +284,6 @@ This pass, only available in ``opt``, prints the call graph to standard error in a human-readable form. -``-print-callgraph-sccs``: Print SCCs of the Call Graph -------------------------------------------------------- - -This pass, only available in ``opt``, prints the SCCs of the call graph to -standard error in a human-readable form. - -``-print-cfg-sccs``: Print SCCs of each function CFG ----------------------------------------------------- - -This pass, only available in ``opt``, printsthe SCCs of each function CFG to -standard error in a human-readable fom. - ``-print-dom-info``: Dominator Info Printer ------------------------------------------- diff --git a/llvm/test/Other/print-cfg-sccs.ll b/llvm/test/Other/print-cfg-sccs.ll deleted file mode 100644 --- a/llvm/test/Other/print-cfg-sccs.ll +++ /dev/null @@ -1,27 +0,0 @@ -; RUN: opt -enable-new-pm=0 -print-cfg-sccs -disable-output < %s 2>&1 | FileCheck %s - -; CHECK: SCCs for Function test in PostOrder: -; CHECK-NEXT: SCC #1 : %exit, -; CHECK-NEXT: SCC #2 : %0, -; CHECK-NEXT: SCC #3 : %3, -; CHECK-NEXT: SCC #4 : %2, %1, -; CHECK-NEXT: SCC #5 : %entry, -define void @test(i1 %cond) { -entry: - br i1 %cond, label %0, label %1 - -0: - br label %exit - -1: - br label %2 - -2: - br i1 %cond, label %1, label %3 - -3: - br label %exit - -exit: - ret void -} diff --git a/llvm/tools/opt/CMakeLists.txt b/llvm/tools/opt/CMakeLists.txt --- a/llvm/tools/opt/CMakeLists.txt +++ b/llvm/tools/opt/CMakeLists.txt @@ -32,7 +32,6 @@ GraphPrinters.cpp NewPMDriver.cpp PassPrinters.cpp - PrintSCC.cpp opt.cpp DEPENDS diff --git a/llvm/tools/opt/PrintSCC.cpp b/llvm/tools/opt/PrintSCC.cpp deleted file mode 100644 --- a/llvm/tools/opt/PrintSCC.cpp +++ /dev/null @@ -1,111 +0,0 @@ -//===- PrintSCC.cpp - Enumerate SCCs in some key graphs -------------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// -// -// This file provides passes to print out SCCs in a CFG or a CallGraph. -// Normally, you would not use these passes; instead, you would use the -// scc_iterator directly to enumerate SCCs and process them in some way. These -// passes serve three purposes: -// -// (1) As a reference for how to use the scc_iterator. -// (2) To print out the SCCs for a CFG or a CallGraph: -// analyze -print-cfg-sccs to print the SCCs in each CFG of a module. -// analyze -print-cfg-sccs -stats to print the #SCCs and the maximum SCC size. -// analyze -print-cfg-sccs -debug > /dev/null to watch the algorithm in action. -// -// and similarly: -// analyze -print-callgraph-sccs [-stats] [-debug] to print SCCs in the CallGraph -// -// (3) To test the scc_iterator. -// -//===----------------------------------------------------------------------===// - -#include "llvm/ADT/SCCIterator.h" -#include "llvm/Analysis/CallGraph.h" -#include "llvm/IR/CFG.h" -#include "llvm/IR/Module.h" -#include "llvm/Pass.h" -#include "llvm/Support/raw_ostream.h" -using namespace llvm; - -namespace { - struct CFGSCC : public FunctionPass { - static char ID; // Pass identification, replacement for typeid - CFGSCC() : FunctionPass(ID) {} - bool runOnFunction(Function& func) override; - - void print(raw_ostream &O, const Module* = nullptr) const override { } - - void getAnalysisUsage(AnalysisUsage &AU) const override { - AU.setPreservesAll(); - } - }; - - struct CallGraphSCC : public ModulePass { - static char ID; // Pass identification, replacement for typeid - CallGraphSCC() : ModulePass(ID) {} - - // run - Print out SCCs in the call graph for the specified module. - bool runOnModule(Module &M) override; - - void print(raw_ostream &O, const Module* = nullptr) const override { } - - // getAnalysisUsage - This pass requires the CallGraph. - void getAnalysisUsage(AnalysisUsage &AU) const override { - AU.setPreservesAll(); - AU.addRequired(); - } - }; -} - -char CFGSCC::ID = 0; -static RegisterPass -Y("print-cfg-sccs", "Print SCCs of each function CFG"); - -char CallGraphSCC::ID = 0; -static RegisterPass -Z("print-callgraph-sccs", "Print SCCs of the Call Graph"); - -bool CFGSCC::runOnFunction(Function &F) { - unsigned sccNum = 0; - errs() << "SCCs for Function " << F.getName() << " in PostOrder:"; - for (scc_iterator SCCI = scc_begin(&F); !SCCI.isAtEnd(); ++SCCI) { - const std::vector &nextSCC = *SCCI; - errs() << "\nSCC #" << ++sccNum << " : "; - for (BasicBlock *BB : nextSCC) { - BB->printAsOperand(errs(), false); - errs() << ", "; - } - if (nextSCC.size() == 1 && SCCI.hasCycle()) - errs() << " (Has self-loop)."; - } - errs() << "\n"; - - return true; -} - - -// run - Print out SCCs in the call graph for the specified module. -bool CallGraphSCC::runOnModule(Module &M) { - CallGraph &CG = getAnalysis().getCallGraph(); - unsigned sccNum = 0; - errs() << "SCCs for the program in PostOrder:"; - for (scc_iterator SCCI = scc_begin(&CG); !SCCI.isAtEnd(); - ++SCCI) { - const std::vector &nextSCC = *SCCI; - errs() << "\nSCC #" << ++sccNum << " : "; - for (std::vector::const_iterator I = nextSCC.begin(), - E = nextSCC.end(); I != E; ++I) - errs() << ((*I)->getFunction() ? (*I)->getFunction()->getName() - : "external node") << ", "; - if (nextSCC.size() == 1 && SCCI.hasCycle()) - errs() << " (Has self-loop)."; - } - errs() << "\n"; - - return true; -} diff --git a/llvm/utils/gn/secondary/llvm/tools/opt/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/opt/BUILD.gn --- a/llvm/utils/gn/secondary/llvm/tools/opt/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/tools/opt/BUILD.gn @@ -25,7 +25,6 @@ "GraphPrinters.cpp", "NewPMDriver.cpp", "PassPrinters.cpp", - "PrintSCC.cpp", "opt.cpp", ]