From 254a2fbcd04700fce4ed71389fb8ee722bb52c5f Mon Sep 17 00:00:00 2001 From: Andrew Lenharth Date: Fri, 13 Oct 2006 17:38:22 +0000 Subject: [PATCH] Move some warnings to debug mode. llvm-svn: 30933 --- .../DataStructure/BottomUpClosure.cpp | 19 +++++++++---------- .../DataStructure/CompleteBottomUp.cpp | 11 +++++------ lib/Analysis/DataStructure/Local.cpp | 10 +++++++--- lib/Analysis/DataStructure/TopDownClosure.cpp | 4 ++-- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/lib/Analysis/DataStructure/BottomUpClosure.cpp b/lib/Analysis/DataStructure/BottomUpClosure.cpp index d2708b0fb1c..1a69e172a67 100644 --- a/lib/Analysis/DataStructure/BottomUpClosure.cpp +++ b/lib/Analysis/DataStructure/BottomUpClosure.cpp @@ -171,11 +171,9 @@ bool BUDataStructures::runOnModule(Module &M) { // Calculate the graphs for any functions that are unreachable from main... for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) if (!I->isExternal() && !DSInfo.count(I)) { -#ifndef NDEBUG if (MainFunc) - std::cerr << "*** BU: Function unreachable from main: " - << I->getName() << "\n"; -#endif + DEBUG(std::cerr << "*** BU: Function unreachable from main: " + << I->getName() << "\n"); calculateGraphs(I, Stack, NextID, ValMap); // Calculate all graphs. } @@ -206,7 +204,7 @@ bool BUDataStructures::runOnModule(Module &M) { BuildGlobalECs(*GlobalsGraph, ECGlobals); if (!ECGlobals.empty()) { NamedRegionTimer X("Bottom-UP EC Cleanup"); - std::cerr << "Eliminating " << ECGlobals.size() << " EC Globals!\n"; + DEBUG(std::cerr << "Eliminating " << ECGlobals.size() << " EC Globals!\n"); for (hash_map::iterator I = DSInfo.begin(), E = DSInfo.end(); I != E; ++I) EliminateUsesOfECGlobals(*I->second, ECGlobals); @@ -237,11 +235,12 @@ bool BUDataStructures::runOnModule(Module &M) { ee = MainGraph.afc_end(); ii != ee; ++ii) { std::vector Funcs; GetAllCallees(*ii, Funcs); - std::cerr << "Lost site\n"; + DEBUG(std::cerr << "Lost site\n"); + DEBUG(ii->getCallSite().getInstruction()->dump()); for (std::vector::iterator iif = Funcs.begin(), eef = Funcs.end(); iif != eef; ++iif) { AddGlobalToNode(this, *ii, *iif); - std::cerr << "Adding\n"; + DEBUG(std::cerr << "Adding\n"); ActualCallees.insert(std::make_pair(ii->getCallSite().getInstruction(), *iif)); } } @@ -421,8 +420,8 @@ unsigned BUDataStructures::calculateGraphs(Function *F, } Stack.pop_back(); - std::cerr << "Calculating graph for SCC #: " << MyID << " of size: " - << SCCSize << "\n"; + DEBUG(std::cerr << "Calculating graph for SCC #: " << MyID << " of size: " + << SCCSize << "\n"); // Compute the Max SCC Size. if (MaxSCC < SCCSize) @@ -441,7 +440,7 @@ unsigned BUDataStructures::calculateGraphs(Function *F, DEBUG(std::cerr << "MISSING REDO\n"); } - std::cerr << "DONE with SCC #: " << MyID << "\n"; + DEBUG(std::cerr << "DONE with SCC #: " << MyID << "\n"); // We never have to revisit "SCC" processed functions... return MyID; diff --git a/lib/Analysis/DataStructure/CompleteBottomUp.cpp b/lib/Analysis/DataStructure/CompleteBottomUp.cpp index ea21a4f0305..90c14b408ff 100644 --- a/lib/Analysis/DataStructure/CompleteBottomUp.cpp +++ b/lib/Analysis/DataStructure/CompleteBottomUp.cpp @@ -52,16 +52,15 @@ bool CompleteBUDataStructures::runOnModule(Module &M) { if (!MainFunc->isExternal()) calculateSCCGraphs(getOrCreateGraph(*MainFunc), Stack, NextID, ValMap); } else { - std::cerr << "CBU-DSA: No 'main' function found!\n"; + DEBUG(std::cerr << "CBU-DSA: No 'main' function found!\n"); } for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) if (!I->isExternal() && !DSInfo.count(I)) { -#ifndef NDEBUG - if (MainFunc) - std::cerr << "*** CBU: Function unreachable from main: " - << I->getName() << "\n"; -#endif + if (MainFunc) { + DEBUG(std::cerr << "*** CBU: Function unreachable from main: " + << I->getName() << "\n"); + } calculateSCCGraphs(getOrCreateGraph(*I), Stack, NextID, ValMap); } diff --git a/lib/Analysis/DataStructure/Local.cpp b/lib/Analysis/DataStructure/Local.cpp index c70970ac31d..dbfbea3981d 100644 --- a/lib/Analysis/DataStructure/Local.cpp +++ b/lib/Analysis/DataStructure/Local.cpp @@ -544,6 +544,9 @@ void GraphBuilder::visitCallSite(CallSite CS) { mergeWith(getValueDest(**(CS.arg_begin()))); return; case Intrinsic::vaend: + case Intrinsic::dbg_func_start: + case Intrinsic::dbg_region_end: + case Intrinsic::dbg_stoppoint: return; // noop case Intrinsic::memcpy_i32: case Intrinsic::memcpy_i64: @@ -1028,9 +1031,10 @@ void GraphBuilder::visitCallSite(CallSite CS) { Warn = true; break; } - if (Warn) - std::cerr << "WARNING: Call to unknown external function '" - << F->getName() << "' will cause pessimistic results!\n"; + if (Warn) { + DEBUG(std::cerr << "WARNING: Call to unknown external function '" + << F->getName() << "' will cause pessimistic results!\n"); + } } } diff --git a/lib/Analysis/DataStructure/TopDownClosure.cpp b/lib/Analysis/DataStructure/TopDownClosure.cpp index 9fdaac3c348..55a37dbcd16 100644 --- a/lib/Analysis/DataStructure/TopDownClosure.cpp +++ b/lib/Analysis/DataStructure/TopDownClosure.cpp @@ -371,8 +371,8 @@ void TDDataStructures::InlineCallersIntoGraph(DSGraph &DSG) { // If we already have this graph, recycle it. if (IndCallRecI != IndCallMap.end() && IndCallRecI->first == Callees) { - std::cerr << " [TD] *** Reuse of indcall graph for " << Callees.size() - << " callees!\n"; + DEBUG(std::cerr << " [TD] *** Reuse of indcall graph for " << Callees.size() + << " callees!\n"); IndCallGraph = IndCallRecI->second; } else { // Otherwise, create a new DSGraph to represent this.