From 13f76f84bc8f6a0bad31f56639a12f43f938b0b9 Mon Sep 17 00:00:00 2001 From: Zhizhou Yang Date: Tue, 23 Oct 2018 21:51:56 +0000 Subject: [PATCH] Print out DebugCounter info with -print-debug-counter Summary: This patch will print out {Counter, Skip, StopAfter} info of all passes which have DebugCounter set at destruction. It can be used to monitor how many times does certain transformation happen in a pass, and also help check if -debug-counter option is set correctly. Please refer to this [[ http://lists.llvm.org/pipermail/llvm-dev/2018-July/124722.html | thread ]] for motivation. Reviewers: george.burgess.iv, davide, greened Reviewed By: greened Subscribers: kristina, llozano, mgorny, llvm-commits, mgrang Differential Revision: https://reviews.llvm.org/D50031 llvm-svn: 345085 --- llvm/include/llvm/Support/DebugCounter.h | 2 ++ llvm/lib/Support/DebugCounter.cpp | 25 +++++++++++++++++++++---- llvm/test/Other/print-debug-counter.ll | 30 ++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 llvm/test/Other/print-debug-counter.ll diff --git a/llvm/include/llvm/Support/DebugCounter.h b/llvm/include/llvm/Support/DebugCounter.h index 83bd5a0..6eadd5c 100644 --- a/llvm/include/llvm/Support/DebugCounter.h +++ b/llvm/include/llvm/Support/DebugCounter.h @@ -55,6 +55,8 @@ namespace llvm { class DebugCounter { public: + ~DebugCounter(); + /// Returns a reference to the singleton instance. static DebugCounter &instance(); diff --git a/llvm/lib/Support/DebugCounter.cpp b/llvm/lib/Support/DebugCounter.cpp index 9c8260d..6598103 100644 --- a/llvm/lib/Support/DebugCounter.cpp +++ b/llvm/lib/Support/DebugCounter.cpp @@ -49,8 +49,18 @@ static DebugCounterList DebugCounterOption( cl::desc("Comma separated list of debug counter skip and count"), cl::CommaSeparated, cl::ZeroOrMore, cl::location(DebugCounter::instance())); +static cl::opt PrintDebugCounter( + "print-debug-counter", cl::Hidden, cl::init(false), cl::Optional, + cl::desc("Print out debug counter info after all counters accumulated")); + static ManagedStatic DC; +// Print information when destroyed, iff command line option is specified. +DebugCounter::~DebugCounter() { + if (isCountingEnabled() && PrintDebugCounter) + print(dbgs()); +} + DebugCounter &DebugCounter::instance() { return *DC; } // This is called by the command line parser when it sees a value for the @@ -107,11 +117,18 @@ void DebugCounter::push_back(const std::string &Val) { } void DebugCounter::print(raw_ostream &OS) const { + SmallVector CounterNames(RegisteredCounters.begin(), + RegisteredCounters.end()); + sort(CounterNames.begin(), CounterNames.end()); + + auto &Us = instance(); OS << "Counters and values:\n"; - for (const auto &KV : Counters) - OS << left_justify(RegisteredCounters[KV.first], 32) << ": {" - << KV.second.Count << "," << KV.second.Skip << "," - << KV.second.StopAfter << "}\n"; + for (auto &CounterName : CounterNames) { + unsigned CounterID = getCounterId(CounterName); + OS << left_justify(RegisteredCounters[CounterID], 32) << ": {" + << Us.Counters[CounterID].Count << "," << Us.Counters[CounterID].Skip + << "," << Us.Counters[CounterID].StopAfter << "}\n"; + } } LLVM_DUMP_METHOD void DebugCounter::dump() const { diff --git a/llvm/test/Other/print-debug-counter.ll b/llvm/test/Other/print-debug-counter.ll new file mode 100644 index 0000000..ffd1971 --- /dev/null +++ b/llvm/test/Other/print-debug-counter.ll @@ -0,0 +1,30 @@ +; RUN: opt -S -debug-counter=early-cse-skip=1,early-cse-count=1 -early-cse \ +; RUN: -debug-counter=newgvn-vn-skip=1,newgvn-vn-count=2 -newgvn \ +; RUN: -instcombine -print-debug-counter < %s 2>&1 | FileCheck %s +;; Test debug counter prints correct info in right order. +; CHECK-LABEL: Counters and values: +; CHECK: early-cse +; CHECK-SAME: {4,1,1} +; CHECK: instcombine-visit +; CHECK-SAME: {12,0,-1} +; CHECK: newgvn-vn +; CHECK-SAME: {9,1,2} +define i32 @f1(i32 %a, i32 %b) { +bb: + %add1 = add i32 %a, %b + %add2 = add i32 %a, %b + %add3 = add i32 %a, %b + %add4 = add i32 %a, %b + %ret1 = add i32 %add1, %add2 + %ret2 = add i32 %add3, %add4 + %ret = add i32 %ret1, %ret2 + ret i32 %ret +} + +define i32 @f2(i32 %a, i32 %b) { +bb: + %add1 = add i32 %a, %b + %add2 = add i32 %a, %b + %ret = add i32 %add1, %add2 + ret i32 %ret +} -- 2.7.4