<div dir="ltr">Cool. I'll wait a few days, but if nobody offers alternative opinions, I am going to flip the switch for LLVM style (or remove the flag entirely).<div><br></div><div>Cheers,<br>Daniel</div></div><div class="gmail_extra">
<br><br><div class="gmail_quote">On Fri, Mar 21, 2014 at 3:04 PM, Tobias Grosser <span dir="ltr"><<a href="mailto:tobias@grosser.es" target="_blank">tobias@grosser.es</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: grosser<br>
Date: Fri Mar 21 09:04:25 2014<br>
New Revision: 204468<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=204468&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=204468&view=rev</a><br>
Log:<br>
clang-format: Remove empty lines<br>
<br>
Modified:<br>
polly/trunk/include/polly/TempScopInfo.h<br>
polly/trunk/lib/Analysis/ScopDetection.cpp<br>
polly/trunk/lib/Analysis/ScopGraphPrinter.cpp<br>
polly/trunk/lib/Analysis/TempScopInfo.cpp<br>
polly/trunk/lib/CodeGen/BlockGenerators.cpp<br>
polly/trunk/lib/CodeGen/LoopGenerators.cpp<br>
polly/trunk/lib/CodeGen/PTXGenerator.cpp<br>
polly/trunk/lib/Exchange/OpenScopExporter.cpp<br>
polly/trunk/lib/Exchange/OpenScopImporter.cpp<br>
polly/trunk/lib/Exchange/ScopLib.cpp<br>
polly/trunk/lib/Transform/DeadCodeElimination.cpp<br>
polly/trunk/lib/Transform/IndVarSimplify.cpp<br>
polly/trunk/lib/Transform/Pluto.cpp<br>
polly/trunk/lib/Transform/ScheduleOptimizer.cpp<br>
<br>
Modified: polly/trunk/include/polly/TempScopInfo.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/TempScopInfo.h?rev=204468&r1=204467&r2=204468&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/TempScopInfo.h?rev=204468&r1=204467&r2=204468&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/include/polly/TempScopInfo.h (original)<br>
+++ polly/trunk/include/polly/TempScopInfo.h Fri Mar 21 09:04:25 2014<br>
@@ -77,7 +77,6 @@ public:<br>
};<br>
<br>
class Comparison {<br>
-<br>
const SCEV *LHS;<br>
const SCEV *RHS;<br>
<br>
<br>
Modified: polly/trunk/lib/Analysis/ScopDetection.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopDetection.cpp?rev=204468&r1=204467&r2=204468&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopDetection.cpp?rev=204468&r1=204467&r2=204468&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/Analysis/ScopDetection.cpp (original)<br>
+++ polly/trunk/lib/Analysis/ScopDetection.cpp Fri Mar 21 09:04:25 2014<br>
@@ -198,7 +198,6 @@ public:<br>
int DiagnosticScopFound::PluginDiagnosticKind = 10;<br>
<br>
void DiagnosticScopFound::print(DiagnosticPrinter &DP) const {<br>
-<br>
DP << "Polly detected an optimizable loop region (scop) in function '" << F<br>
<< "'\n";<br>
<br>
@@ -617,7 +616,6 @@ static unsigned eraseAllChildren(std::se<br>
}<br>
<br>
void ScopDetection::findScops(Region &R) {<br>
-<br>
if (!DetectRegionsWithoutLoops && regionWithoutLoops(R, LI))<br>
return;<br>
<br>
<br>
Modified: polly/trunk/lib/Analysis/ScopGraphPrinter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopGraphPrinter.cpp?rev=204468&r1=204467&r2=204468&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopGraphPrinter.cpp?rev=204468&r1=204467&r2=204468&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/Analysis/ScopGraphPrinter.cpp (original)<br>
+++ polly/trunk/lib/Analysis/ScopGraphPrinter.cpp Fri Mar 21 09:04:25 2014<br>
@@ -26,7 +26,6 @@ using namespace llvm;<br>
namespace llvm {<br>
template <><br>
struct GraphTraits<ScopDetection *> : public GraphTraits<RegionInfo *> {<br>
-<br>
static NodeType *getEntryNode(ScopDetection *SD) {<br>
return GraphTraits<RegionInfo *>::getEntryNode(SD->getRI());<br>
}<br>
@@ -39,11 +38,9 @@ struct GraphTraits<ScopDetection *> : pu<br>
};<br>
<br>
template <> struct DOTGraphTraits<RegionNode *> : public DefaultDOTGraphTraits {<br>
-<br>
DOTGraphTraits(bool isSimple = false) : DefaultDOTGraphTraits(isSimple) {}<br>
<br>
std::string getNodeLabel(RegionNode *Node, RegionNode *Graph) {<br>
-<br>
if (!Node->isSubRegion()) {<br>
BasicBlock *BB = Node->getNodeAs<BasicBlock>();<br>
<br>
@@ -68,7 +65,6 @@ struct DOTGraphTraits<ScopDetection *> :<br>
std::string getEdgeAttributes(RegionNode *srcNode,<br>
GraphTraits<RegionInfo *>::ChildIteratorType CI,<br>
ScopDetection *SD) {<br>
-<br>
RegionNode *destNode = *CI;<br>
<br>
if (srcNode->isSubRegion() || destNode->isSubRegion())<br>
@@ -103,7 +99,6 @@ struct DOTGraphTraits<ScopDetection *> :<br>
<br>
for (std::string::iterator SI = String.begin(), SE = String.end(); SI != SE;<br>
++SI) {<br>
-<br>
if (*SI == '"')<br>
Escaped += '\\';<br>
<br>
<br>
Modified: polly/trunk/lib/Analysis/TempScopInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/TempScopInfo.cpp?rev=204468&r1=204467&r2=204468&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/TempScopInfo.cpp?rev=204468&r1=204467&r2=204468&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/Analysis/TempScopInfo.cpp (original)<br>
+++ polly/trunk/lib/Analysis/TempScopInfo.cpp Fri Mar 21 09:04:25 2014<br>
@@ -77,7 +77,6 @@ void TempScop::print(raw_ostream &OS, Sc<br>
<br>
void TempScop::printDetail(raw_ostream &OS, ScalarEvolution *SE, LoopInfo *LI,<br>
const Region *CurR, unsigned ind) const {<br>
-<br>
// FIXME: Print other details rather than memory accesses.<br>
for (const auto &CurBlock : CurR->blocks()) {<br>
AccFuncMapType::const_iterator AccSetIt = AccFuncMap.find(CurBlock);<br>
<br>
Modified: polly/trunk/lib/CodeGen/BlockGenerators.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/BlockGenerators.cpp?rev=204468&r1=204467&r2=204468&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/BlockGenerators.cpp?rev=204468&r1=204467&r2=204468&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/CodeGen/BlockGenerators.cpp (original)<br>
+++ polly/trunk/lib/CodeGen/BlockGenerators.cpp Fri Mar 21 09:04:25 2014<br>
@@ -220,7 +220,6 @@ Value *BlockGenerator::getNewValue(const<br>
<br>
void BlockGenerator::copyInstScalar(const Instruction *Inst, ValueMapT &BBMap,<br>
ValueMapT &GlobalMap, LoopToScevMapT <S) {<br>
-<br>
// We do not generate debug intrinsics as we did not investigate how to<br>
// copy them correctly. At the current state, they just crash the code<br>
// generation as the meta-data operands are not correctly copied.<br>
@@ -257,7 +256,6 @@ void BlockGenerator::copyInstScalar(cons<br>
std::vector<Value *> BlockGenerator::getMemoryAccessIndex(<br>
__isl_keep isl_map *AccessRelation, Value *BaseAddress, ValueMapT &BBMap,<br>
ValueMapT &GlobalMap, LoopToScevMapT <S, Loop *L) {<br>
-<br>
assert((isl_map_dim(AccessRelation, isl_dim_out) == 1) &&<br>
"Only single dimensional access functions supported");<br>
<br>
<br>
Modified: polly/trunk/lib/CodeGen/LoopGenerators.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/LoopGenerators.cpp?rev=204468&r1=204467&r2=204468&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/LoopGenerators.cpp?rev=204468&r1=204467&r2=204468&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/CodeGen/LoopGenerators.cpp (original)<br>
+++ polly/trunk/lib/CodeGen/LoopGenerators.cpp Fri Mar 21 09:04:25 2014<br>
@@ -50,7 +50,6 @@ Value *polly::createLoop(Value *LB, Valu<br>
PollyIRBuilder &Builder, Pass *P, BasicBlock *&ExitBB,<br>
ICmpInst::Predicate Predicate,<br>
LoopAnnotator *Annotator, bool Parallel) {<br>
-<br>
DominatorTree &DT = P->getAnalysis<DominatorTreeWrapperPass>().getDomTree();<br>
LoopInfo &LI = P->getAnalysis<LoopInfo>();<br>
Function *F = Builder.GetInsertBlock()->getParent();<br>
<br>
Modified: polly/trunk/lib/CodeGen/PTXGenerator.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/PTXGenerator.cpp?rev=204468&r1=204467&r2=204468&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/PTXGenerator.cpp?rev=204468&r1=204467&r2=204468&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/CodeGen/PTXGenerator.cpp (original)<br>
+++ polly/trunk/lib/CodeGen/PTXGenerator.cpp Fri Mar 21 09:04:25 2014<br>
@@ -37,7 +37,6 @@ PTXGenerator::PTXGenerator(PollyIRBuilde<br>
const std::string &Triple)<br>
: Builder(Builder), P(P), GPUTriple(Triple), GridWidth(1), GridHeight(1),<br>
BlockWidth(1), BlockHeight(1), OutputBytes(0) {<br>
-<br>
InitializeGPUDataTypes();<br>
}<br>
<br>
<br>
Modified: polly/trunk/lib/Exchange/OpenScopExporter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Exchange/OpenScopExporter.cpp?rev=204468&r1=204467&r2=204468&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Exchange/OpenScopExporter.cpp?rev=204468&r1=204467&r2=204468&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/Exchange/OpenScopExporter.cpp (original)<br>
+++ polly/trunk/lib/Exchange/OpenScopExporter.cpp Fri Mar 21 09:04:25 2014<br>
@@ -181,7 +181,6 @@ void OpenScop::initializeStatements() {<br>
}<br>
<br>
void OpenScop::freeStatement(openscop_statement_p stmt) {<br>
-<br>
if (stmt->read)<br>
openscop_matrix_free(stmt->read);<br>
stmt->read = NULL;<br>
@@ -279,7 +278,6 @@ int OpenScop::domainToMatrix_basic_set(i<br>
/// @param PS The set to be translated<br>
/// @return A OpenScop Matrix<br>
openscop_matrix_p OpenScop::domainToMatrix(isl_set *PS) {<br>
-<br>
// Create a canonical copy of this set.<br>
isl_set *set = isl_set_copy(PS);<br>
set = isl_set_compute_divs(set);<br>
@@ -373,7 +371,6 @@ int OpenScop::scatteringToMatrix_basic_m<br>
/// @param map The map to be translated<br>
/// @return A OpenScop Matrix<br>
openscop_matrix_p OpenScop::scatteringToMatrix(isl_map *pmap) {<br>
-<br>
// Create a canonical copy of this set.<br>
isl_map *map = isl_map_copy(pmap);<br>
map = isl_map_compute_divs(map);<br>
@@ -472,7 +469,6 @@ int OpenScop::accessToMatrix_basic_map(i<br>
///<br>
/// @return The memory access matrix, as it is required by openscop.<br>
openscop_matrix_p OpenScop::createAccessMatrix(ScopStmt *S, bool isRead) {<br>
-<br>
unsigned NbColumns = S->getNumIterators() + S->getNumParams() + 2;<br>
openscop_matrix_p m = openscop_matrix_malloc(0, NbColumns);<br>
<br>
<br>
Modified: polly/trunk/lib/Exchange/OpenScopImporter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Exchange/OpenScopImporter.cpp?rev=204468&r1=204467&r2=204468&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Exchange/OpenScopImporter.cpp?rev=204468&r1=204467&r2=204468&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/Exchange/OpenScopImporter.cpp (original)<br>
+++ polly/trunk/lib/Exchange/OpenScopImporter.cpp Fri Mar 21 09:04:25 2014<br>
@@ -118,7 +118,6 @@ isl_map *mapFromMatrix(openscop_matrix_p<br>
///<br>
/// @return An isl_map describing the scattering.<br>
isl_map *scatteringForStmt(openscop_matrix_p m, ScopStmt *PollyStmt) {<br>
-<br>
unsigned NbParam = PollyStmt->getNumParams();<br>
unsigned NbIterators = PollyStmt->getNumIterators();<br>
unsigned NbScattering = m->NbColumns - 2 - NbParam - NbIterators;<br>
<br>
Modified: polly/trunk/lib/Exchange/ScopLib.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Exchange/ScopLib.cpp?rev=204468&r1=204467&r2=204468&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Exchange/ScopLib.cpp?rev=204468&r1=204467&r2=204468&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/Exchange/ScopLib.cpp (original)<br>
+++ polly/trunk/lib/Exchange/ScopLib.cpp Fri Mar 21 09:04:25 2014<br>
@@ -127,7 +127,6 @@ void ScopLib::initializeStatements() {<br>
}<br>
<br>
void ScopLib::freeStatement(scoplib_statement_p stmt) {<br>
-<br>
if (stmt->read)<br>
scoplib_matrix_free(stmt->read);<br>
stmt->read = NULL;<br>
@@ -445,7 +444,6 @@ int ScopLib::accessToMatrix_basic_map(is<br>
///<br>
/// @return The memory access matrix, as it is required by scoplib.<br>
scoplib_matrix_p ScopLib::createAccessMatrix(ScopStmt *S, bool isRead) {<br>
-<br>
unsigned NbColumns = S->getNumIterators() + S->getNumParams() + 2;<br>
scoplib_matrix_p m = scoplib_matrix_malloc(0, NbColumns);<br>
<br>
@@ -644,7 +642,6 @@ isl_map *mapFromMatrix(scoplib_matrix_p<br>
/// @return An isl_map describing the scattering.<br>
isl_map *scatteringForStmt(scoplib_matrix_p m, ScopStmt *PollyStmt,<br>
int scatteringDims) {<br>
-<br>
unsigned NbParam = PollyStmt->getNumParams();<br>
unsigned NbIterators = PollyStmt->getNumIterators();<br>
unsigned NbScattering;<br>
<br>
Modified: polly/trunk/lib/Transform/DeadCodeElimination.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Transform/DeadCodeElimination.cpp?rev=204468&r1=204467&r2=204468&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Transform/DeadCodeElimination.cpp?rev=204468&r1=204467&r2=204468&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/Transform/DeadCodeElimination.cpp (original)<br>
+++ polly/trunk/lib/Transform/DeadCodeElimination.cpp Fri Mar 21 09:04:25 2014<br>
@@ -53,7 +53,6 @@ cl::opt<int> DCEPreciseSteps(<br>
cl::ZeroOrMore, cl::init(-1));<br>
<br>
class DeadCodeElim : public ScopPass {<br>
-<br>
public:<br>
static char ID;<br>
explicit DeadCodeElim() : ScopPass(ID) {}<br>
<br>
Modified: polly/trunk/lib/Transform/IndVarSimplify.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Transform/IndVarSimplify.cpp?rev=204468&r1=204467&r2=204468&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Transform/IndVarSimplify.cpp?rev=204468&r1=204467&r2=204468&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/Transform/IndVarSimplify.cpp (original)<br>
+++ polly/trunk/lib/Transform/IndVarSimplify.cpp Fri Mar 21 09:04:25 2014<br>
@@ -992,7 +992,6 @@ const SCEVAddRecExpr *WidenIV::GetWideRe<br>
/// WidenIVUse - Determine whether an individual user of the narrow IV can be<br>
/// widened. If so, return the wide clone of the user.<br>
Instruction *WidenIV::WidenIVUse(NarrowIVDefUse DU, SCEVExpander &Rewriter) {<br>
-<br>
// Stop traversing the def-use chain at inner-loop phis or post-loop phis.<br>
if (isa<PHINode>(DU.NarrowUse) &&<br>
LI->getLoopFor(DU.NarrowUse->getParent()) != L)<br>
@@ -1537,7 +1536,6 @@ static Value *genLoopLimit(PHINode *IndV<br>
// GEP. Avoid running SCEVExpander on a new pointer value, instead reusing<br>
// the existing GEPs whenever possible.<br>
if (IndVar->getType()->isPointerTy() && !IVCount->getType()->isPointerTy()) {<br>
-<br>
Type *OfsTy = SE->getEffectiveSCEVType(IVInit->getType());<br>
const SCEV *IVOffset = SE->getTruncateOrSignExtend(IVCount, OfsTy);<br>
<br>
<br>
Modified: polly/trunk/lib/Transform/Pluto.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Transform/Pluto.cpp?rev=204468&r1=204467&r2=204468&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Transform/Pluto.cpp?rev=204468&r1=204467&r2=204468&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/Transform/Pluto.cpp (original)<br>
+++ polly/trunk/lib/Transform/Pluto.cpp Fri Mar 21 09:04:25 2014<br>
@@ -126,7 +126,6 @@ static std::string convertInt(int number<br>
}<br>
<br>
class PlutoOptimizer : public ScopPass {<br>
-<br>
public:<br>
static char ID;<br>
explicit PlutoOptimizer() : ScopPass(ID) {}<br>
<br>
Modified: polly/trunk/lib/Transform/ScheduleOptimizer.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Transform/ScheduleOptimizer.cpp?rev=204468&r1=204467&r2=204468&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Transform/ScheduleOptimizer.cpp?rev=204468&r1=204467&r2=204468&view=diff</a><br>
==============================================================================<br>
--- polly/trunk/lib/Transform/ScheduleOptimizer.cpp (original)<br>
+++ polly/trunk/lib/Transform/ScheduleOptimizer.cpp Fri Mar 21 09:04:25 2014<br>
@@ -81,7 +81,6 @@ MaximizeBandDepth("polly-opt-maximize-ba<br>
namespace {<br>
<br>
class IslScheduleOptimizer : public ScopPass {<br>
-<br>
public:<br>
static char ID;<br>
explicit IslScheduleOptimizer() : ScopPass(ID) { LastSchedule = NULL; }<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>