Clang-tidy (NFC)

run-clang-tidy -fix tools/mlir-clang/Lib/* -checks=-*,llvm*
run-clang-tidy -fix lib/polygeist/* -checks=-*, llvm*
run-clang-tidy -fix tools/mlir-clang/mlir-clang.cc -checks=-*,llvm*

Checks:

  llvm-header-guard
  llvm-include-order
  llvm-namespace-comment
  llvm-prefer-isa-or-dyn-cast-in-conditionals
  llvm-prefer-register-over-unsigned
  llvm-qualified-auto
  llvm-twine-local

Author: chelini

lib/polygeist/Ops.cpp

@@ -1514,7 +1514,7 @@ struct MoveIntoIfs : public OpRewritePattern<scf::IfOp> {
     if (nextIf == &parent->front())
       return failure();
 
-    auto prevOp = nextIf->getPrevNode();
+    auto *prevOp = nextIf->getPrevNode();
 
     // Only move if op doesn't write or free memory (only read)
     if (!wouldOpBeTriviallyDead(prevOp))
@@ -1633,8 +1633,8 @@ struct MoveOutOfIfs : public OpRewritePattern<scf::IfOp> {
       }
 
     rewriter.setInsertionPoint(nextIf);
-    for (auto o : toMove) {
-      auto rep = rewriter.clone(*o);
+    for (auto *o : toMove) {
+      auto *rep = rewriter.clone(*o);
       rewriter.replaceOp(o, rep->getResults());
     }
 

lib/polygeist/Passes/AffineCFG.cpp

@@ -115,7 +115,7 @@ static bool isAffineForArg(Value val) {
   if (!val.isa<BlockArgument>())
     return false;
   Operation *parentOp = val.cast<BlockArgument>().getOwner()->getParentOp();
-  return (parentOp && isa<AffineForOp, AffineParallelOp>(parentOp));
+  return (isa_and_nonnull<AffineForOp, AffineParallelOp>(parentOp));
 }
 
 static bool legalCondition(Value en, bool dim = false) {
@@ -316,13 +316,13 @@ AffineApplyNormalizer::AffineApplyNormalizer(AffineMap map,
     } else {
       if (!isValidSymbolInt(t, /*recur*/ false)) {
         if (auto idx = t.getDefiningOp()) {
-          auto scope = getAffineScope(idx)->getParentOp();
+          auto *scope = getAffineScope(idx)->getParentOp();
           DominanceInfo DI(scope);
 
           std::function<bool(Value)> fix = [&](Value v) -> bool /*legal*/ {
             if (isValidSymbolInt(v, /*recur*/ false))
               return true;
-            auto op = v.getDefiningOp();
+            auto *op = v.getDefiningOp();
             if (!op)
               llvm::errs() << v << "\n";
             assert(op);
@@ -334,7 +334,7 @@ AffineApplyNormalizer::AffineApplyNormalizer(AffineMap map,
             Operation *front = nullptr;
             for (auto o : op->getOperands()) {
               Operation *next;
-              if (auto op = o.getDefiningOp()) {
+              if (auto *op = o.getDefiningOp()) {
                 if (!fix(o)) {
                   return false;
                 }
@@ -527,7 +527,7 @@ void fully2ComposeAffineMapAndOperands(OpBuilder &builder, AffineMap *map,
   for (auto &op : *operands) {
     if (!op.getType().isIndex()) {
       Operation *toInsert;
-      if (auto o = op.getDefiningOp())
+      if (auto *o = op.getDefiningOp())
         toInsert = o->getNextNode();
       else {
         auto BA = op.cast<BlockArgument>();
@@ -596,7 +596,7 @@ void fully2ComposeIntegerSetAndOperands(OpBuilder &builder, IntegerSet *set,
   for (auto &op : *operands) {
     if (!op.getType().isIndex()) {
       Operation *toInsert;
-      if (auto o = op.getDefiningOp())
+      if (auto *o = op.getDefiningOp())
         toInsert = o->getNextNode();
       else {
         auto BA = op.cast<BlockArgument>();
@@ -895,10 +895,10 @@ bool isValidIndex(Value val) {
     return true;
 
   if (auto ba = val.dyn_cast<BlockArgument>()) {
-    auto owner = ba.getOwner();
+    auto *owner = ba.getOwner();
     assert(owner);
 
-    auto parentOp = owner->getParentOp();
+    auto *parentOp = owner->getParentOp();
     if (!parentOp) {
       owner->dump();
       llvm::errs() << " ba: " << ba << "\n";

lib/polygeist/Passes/AffineReduction.cpp

@@ -64,7 +64,7 @@ struct AffineForReductionIter : public OpRewritePattern<AffineForOp> {
 
   bool checkDominance(Operation *a, ArrayRef<Operation *> bs) const {
     bool res = true;
-    for (auto b : bs)
+    for (auto *b : bs)
       if (!checkDominance(b, a)) {
         res = false;
         break;
@@ -106,7 +106,7 @@ struct AffineForReductionIter : public OpRewritePattern<AffineForOp> {
         SmallVector<AffineStoreOp> candidateStores;
         SmallVector<Operation *> otherStores;
         SmallVector<Operation *> otherLoads;
-        for (auto user : memref.getUsers()) {
+        for (auto *user : memref.getUsers()) {
           if (auto store = dyn_cast<AffineStoreOp>(user)) {
             if (areInSameAffineFor(load, store, forOp) &&
                 areCompatible<AffineStoreOp>(load, store)) {
@@ -162,7 +162,7 @@ struct AffineForReductionIter : public OpRewritePattern<AffineForOp> {
     llvm::append_range(newIterArgs, forOp.getRegionIterArgs());
     rewriter.setInsertionPoint(forOp);
     for (auto pair : candidateOpsInFor) {
-      auto movedLoad = rewriter.clone(*std::get<0>(pair));
+      auto *movedLoad = rewriter.clone(*std::get<0>(pair));
       newIterArgs.push_back(movedLoad->getResult(0));
     }
 
@@ -226,7 +226,7 @@ struct AffineForReductionIter : public OpRewritePattern<AffineForOp> {
       auto store = cast<AffineStoreOp>(std::get<1>(pair));
 
       auto loads = loadsInFor[i];
-      for (auto load : loads) {
+      for (auto *load : loads) {
         if (PDT.postDominates(store, load)) {
           load->getResult(0).replaceAllUsesWith(
               newForOp.getBody()->getArguments()[i + origNumRegionArgs + 1]);

lib/polygeist/Passes/CanonicalizeFor.cpp

@@ -506,7 +506,7 @@ struct WhileToForHelper {
       return false;
 
     // Cannot transform for if step is not loop-invariant
-    if (auto op = step.getDefiningOp()) {
+    if (auto *op = step.getDefiningOp()) {
       if (loop->isAncestor(op)) {
         return false;
       }
@@ -580,9 +580,9 @@ struct WhileToForHelper {
       lb = rewriter.create<AddIOp>(loop.getLoc(), lb, one);
     }
     if (ub_cloneMove) {
-      auto op = ub.getDefiningOp();
+      auto *op = ub.getDefiningOp();
       assert(op);
-      auto newOp = rewriter.clone(*op);
+      auto *newOp = rewriter.clone(*op);
       rewriter.replaceOp(op, newOp->getResults());
       ub = newOp->getResult(0);
     }
@@ -1384,7 +1384,7 @@ struct RemoveWhileSelect : public OpRewritePattern<WhileOp> {
 
     nop.getBefore().takeBody(loop.getBefore());
 
-    auto after = rewriter.createBlock(&nop.getAfter());
+    auto *after = rewriter.createBlock(&nop.getAfter());
     for (auto y : newYields)
       after->addArgument(y.getType(), loop.getLoc());
 
@@ -1544,7 +1544,7 @@ struct WhileLICM : public OpRewritePattern<WhileOp> {
     // Helper to check whether an operation is loop invariant wrt. SSA
     // properties.
     auto isDefinedOutsideOfBody = [&](Value value) {
-      auto definingOp = value.getDefiningOp();
+      auto *definingOp = value.getDefiningOp();
       if (!definingOp) {
         if (auto ba = value.dyn_cast<BlockArgument>())
           definingOp = ba.getOwner()->getParentOp();
@@ -1722,7 +1722,7 @@ struct ReturnSq : public OpRewritePattern<ReturnOp> {
       changed = true;
       toErase.push_back(&*iter);
     }
-    for (auto op : toErase) {
+    for (auto *op : toErase) {
       rewriter.eraseOp(op);
     }
     return success(changed);

lib/polygeist/Passes/LoopRestructure.cpp

@@ -273,7 +273,7 @@ bool attemptToFoldIntoPredecessor(Block *target) {
 bool LoopRestructure::removeIfFromRegion(DominanceInfo &domInfo, Region &region,
                                          Block *pseudoExit) {
   SmallVector<Block *, 4> Preds;
-  for (auto block : pseudoExit->getPredecessors()) {
+  for (auto *block : pseudoExit->getPredecessors()) {
     Preds.push_back(block);
   }
   SmallVector<Type, 4> emptyTys;
@@ -284,7 +284,7 @@ bool LoopRestructure::removeIfFromRegion(DominanceInfo &domInfo, Region &region,
   if (Preds.size() == 2) {
     for (size_t i = 0; i < Preds.size(); ++i) {
       SmallVector<Block *, 4> Succs;
-      for (auto block : Preds[i]->getSuccessors()) {
+      for (auto *block : Preds[i]->getSuccessors()) {
         Succs.push_back(block);
       }
       if (Succs.size() == 2) {
@@ -334,7 +334,7 @@ bool LoopRestructure::removeIfFromRegion(DominanceInfo &domInfo, Region &region,
               tbuilder.create<scf::YieldOp>(tbuilder.getUnknownLoc(), emptyTys,
                                             condBr.getFalseOperands());
             }
-            auto oldTerm = Succs[1 - j]->getTerminator();
+            auto *oldTerm = Succs[1 - j]->getTerminator();
             OpBuilder tbuilder(Succs[1 - j], Succs[1 - j]->end());
             tbuilder.create<scf::YieldOp>(tbuilder.getUnknownLoc(), emptyTys,
                                           oldTerm->getOperands());
@@ -359,7 +359,7 @@ void LoopRestructure::runOnRegion(DominanceInfo &domInfo, Region &region) {
     const llvm::DominatorTreeBase<Block, false> *DT =
         &domInfo.getDomTree(&region);
     mlir::LoopInfo LI(*(const llvm::DominatorTreeBase<Wrapper, false> *)DT);
-    for (auto L : LI.getTopLevelLoops()) {
+    for (auto *L : LI.getTopLevelLoops()) {
       Block *header = (Block *)L->getHeader();
       Block *target = (Block *)L->getUniqueExitBlock();
       if (!target) {
@@ -394,7 +394,7 @@ void LoopRestructure::runOnRegion(DominanceInfo &domInfo, Region &region) {
         valsCallingLoop.push_back(a);
 
       SmallVector<std::pair<Value, size_t>> preservedVals;
-      for (auto B : L->getBlocks()) {
+      for (auto *B : L->getBlocks()) {
         for (auto &O : *(Block *)B) {
           for (auto V : O.getResults()) {
             if (llvm::any_of(V.getUsers(), [&](Operation *user) {
@@ -438,7 +438,7 @@ void LoopRestructure::runOnRegion(DominanceInfo &domInfo, Region &region) {
 
       SmallVector<Block *, 4> Preds;
 
-      for (auto block : header->getPredecessors()) {
+      for (auto *block : header->getPredecessors()) {
         if (!L->contains((Wrapper *)block))
           Preds.push_back(block);
       }
@@ -611,7 +611,7 @@ void LoopRestructure::runOnRegion(DominanceInfo &domInfo, Region &region) {
         yieldargs.push_back(a);
       }
 
-      for (auto block : Preds) {
+      for (auto *block : Preds) {
         Operation *terminator = block->getTerminator();
         for (unsigned i = 0; i < terminator->getNumSuccessors(); ++i) {
           Block *successor = terminator->getSuccessor(i);