[Mlir-commits] [mlir] [mlir] Fix Wparentheses warning (PR #146893)

[Longsheng Mou]

https://github.com/CoTinker created https://github.com/llvm/llvm-project/pull/146893

warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]
  265 |              isa<VectorType>(operandType) &&
      |              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~
  266 |                  "Unexpected non-vector ShapedType");
      |                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

>From 86c826f6b8b43661334afafbcac267f73d5e49bd Mon Sep 17 00:00:00 2001
From: Longsheng Mou <longshengmou at gmail.com>
Date: Thu, 3 Jul 2025 15:09:45 +0800
Subject: [PATCH] [mlir] Fix Wparentheses warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]
  265 |              isa<VectorType>(operandType) &&
      |              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~
  266 |                  "Unexpected non-vector ShapedType");
      |                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
---
 mlir/lib/Dialect/Linalg/Transforms/PadTilingInterface.cpp | 5 ++---
 mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp      | 6 +++---
 mlir/lib/Dialect/XeGPU/IR/XeGPUOps.cpp                    | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/mlir/lib/Dialect/Linalg/Transforms/PadTilingInterface.cpp b/mlir/lib/Dialect/Linalg/Transforms/PadTilingInterface.cpp
index eda3373b4d639..5eb3761f7aca1 100644
--- a/mlir/lib/Dialect/Linalg/Transforms/PadTilingInterface.cpp
+++ b/mlir/lib/Dialect/Linalg/Transforms/PadTilingInterface.cpp
@@ -261,9 +261,8 @@ linalg::rewriteAsPaddedOp(RewriterBase &rewriter, TilingInterface opToPad,
     // 2.a. Skip scalar-like operands.
     Type operandType = operand.getType();
     if (!isa<RankedTensorType>(operandType)) {
-      assert(!isa<ShapedType>(operandType) ||
-             isa<VectorType>(operandType) &&
-                 "Unexpected non-vector ShapedType");
+      assert((!isa<ShapedType>(operandType) || isa<VectorType>(operandType)) &&
+             "Unexpected non-vector ShapedType");
       newOperands.push_back(operand);
       continue;
     }
diff --git a/mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp b/mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp
index f8592e2ca2174..31b2782cb69ca 100644
--- a/mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp
+++ b/mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp
@@ -1659,9 +1659,9 @@ createWriteOrMaskedWrite(OpBuilder &builder, Location loc, Value vecToStore,
   }
 
   // If missing, initialize the write indices to 0.
-  assert(writeIndices.empty() ||
-         writeIndices.size() == static_cast<size_t>(destRank) &&
-             "Invalid number of write indices!");
+  assert((writeIndices.empty() ||
+          writeIndices.size() == static_cast<size_t>(destRank)) &&
+         "Invalid number of write indices!");
   if (writeIndices.empty()) {
     auto zero = builder.create<arith::ConstantIndexOp>(loc, 0);
     writeIndices.assign(destRank, zero);
diff --git a/mlir/lib/Dialect/XeGPU/IR/XeGPUOps.cpp b/mlir/lib/Dialect/XeGPU/IR/XeGPUOps.cpp
index 2793c7a35bc97..3bea6cb50ff7b 100644
--- a/mlir/lib/Dialect/XeGPU/IR/XeGPUOps.cpp
+++ b/mlir/lib/Dialect/XeGPU/IR/XeGPUOps.cpp
@@ -135,8 +135,8 @@ void CreateNdDescOp::build(OpBuilder &builder, OperationState &state,
          shape.size() == strides.size() && shape.size() == offsets.size());
 
   Type srcTy = source.getType();
-  assert(isa<IntegerType>(srcTy) ||
-         isa<MemRefType>(srcTy) && "Source has to be either int or memref.");
+  assert((isa<IntegerType, MemRefType>(srcTy)) &&
+         "Source has to be either int or memref.");
 
   llvm::SmallVector<Value> dynamicOffsets;
   llvm::SmallVector<Value> dynamicShape;