[mlir] Fix Wparentheses warning #146893
Open
[mlir] Fix Wparentheses warning #146893
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]
265 | isa<VectorType>(operandType) &&
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~
266 | "Unexpected non-vector ShapedType");
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
CoTinker
requested review from
banach-space,
dcaballe,
hanhanW,
nicolasvasilache,
Groverkss and
rengolin
as code owners
|
@llvm/pr-subscribers-mlir-gpu @llvm/pr-subscribers-mlir-linalg Author: Longsheng Mou (CoTinker) Changeswarning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses] Full diff: https://github.com/llvm/llvm-project/pull/146893.diff 3 Files Affected:
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;
|
|
@llvm/pr-subscribers-mlir Author: Longsheng Mou (CoTinker) Changeswarning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses] Full diff: https://github.com/llvm/llvm-project/pull/146893.diff 3 Files Affected:
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;
|
joker-eph
approved these changes
Jul 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]
265 | isa(operandType) &&
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~
266 | "Unexpected non-vector ShapedType");
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~