From 9cd976d041de6006d208f3f20fd7d353a383a18b Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Thu, 10 Aug 2017 17:48:11 +0000 Subject: [PATCH] [DebugCounter] Move the semicolon out of the DEBUG_COUNTER macro and require it to be placed at the end of each use. This make it consistent with STATISTIC which it will often appears near. While there move one DEBUG_COUNTER instance out of an anonymous namespace. It's already declaring a static variable so the namespace is unnecessary. llvm-svn: 310637 --- llvm/docs/ProgrammersManual.rst | 2 +- llvm/include/llvm/Support/DebugCounter.h | 2 +- llvm/lib/Transforms/Scalar/NewGVN.cpp | 4 ++-- llvm/lib/Transforms/Utils/PredicateInfo.cpp | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/llvm/docs/ProgrammersManual.rst b/llvm/docs/ProgrammersManual.rst index 3c78ee14b5a4..7541f2eba8d2 100644 --- a/llvm/docs/ProgrammersManual.rst +++ b/llvm/docs/ProgrammersManual.rst @@ -1224,7 +1224,7 @@ Define your DebugCounter like this: .. code-block:: c++ DEBUG_COUNTER(DeleteAnInstruction, "passname-delete-instruction", - "Controls which instructions get delete") + "Controls which instructions get delete"); The ``DEBUG_COUNTER`` macro defines a static variable, whose name is specified by the first argument. The name of the counter diff --git a/llvm/include/llvm/Support/DebugCounter.h b/llvm/include/llvm/Support/DebugCounter.h index a533feae7fa3..52e1bd71a2f2 100644 --- a/llvm/include/llvm/Support/DebugCounter.h +++ b/llvm/include/llvm/Support/DebugCounter.h @@ -159,7 +159,7 @@ private: #define DEBUG_COUNTER(VARNAME, COUNTERNAME, DESC) \ static const unsigned VARNAME = \ - DebugCounter::registerCounter(COUNTERNAME, DESC); + DebugCounter::registerCounter(COUNTERNAME, DESC) } // namespace llvm #endif diff --git a/llvm/lib/Transforms/Scalar/NewGVN.cpp b/llvm/lib/Transforms/Scalar/NewGVN.cpp index ceb53502f982..1afbde991f8f 100644 --- a/llvm/lib/Transforms/Scalar/NewGVN.cpp +++ b/llvm/lib/Transforms/Scalar/NewGVN.cpp @@ -118,9 +118,9 @@ STATISTIC(NumGVNPHIOfOpsCreated, "Number of PHI of ops created"); STATISTIC(NumGVNPHIOfOpsEliminations, "Number of things eliminated using PHI of ops"); DEBUG_COUNTER(VNCounter, "newgvn-vn", - "Controls which instructions are value numbered") + "Controls which instructions are value numbered"); DEBUG_COUNTER(PHIOfOpsCounter, "newgvn-phi", - "Controls which instructions we create phi of ops for") + "Controls which instructions we create phi of ops for"); // Currently store defining access refinement is too slow due to basicaa being // egregiously slow. This flag lets us keep it working while we work on this // issue. diff --git a/llvm/lib/Transforms/Utils/PredicateInfo.cpp b/llvm/lib/Transforms/Utils/PredicateInfo.cpp index d4cdaede6b86..16b80923bf55 100644 --- a/llvm/lib/Transforms/Utils/PredicateInfo.cpp +++ b/llvm/lib/Transforms/Utils/PredicateInfo.cpp @@ -49,9 +49,10 @@ INITIALIZE_PASS_END(PredicateInfoPrinterLegacyPass, "print-predicateinfo", static cl::opt VerifyPredicateInfo( "verify-predicateinfo", cl::init(false), cl::Hidden, cl::desc("Verify PredicateInfo in legacy printer pass.")); -namespace { DEBUG_COUNTER(RenameCounter, "predicateinfo-rename", - "Controls which variables are renamed with predicateinfo") + "Controls which variables are renamed with predicateinfo"); + +namespace { // Given a predicate info that is a type of branching terminator, get the // branching block. const BasicBlock *getBranchBlock(const PredicateBase *PB) {