Revert "[mlir] ArithToLLVM: fix memref bitcast lowering" #126895
Merged
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
This reverts commit 79010e2.
|
@llvm/pr-subscribers-mlir Author: Ivan Butygin (Hardcode84) ChangesReverts llvm/llvm-project#125148 bot failures Full diff: https://github.com/llvm/llvm-project/pull/126895.diff 3 Files Affected:
diff --git a/mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp b/mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp
index 5c1afe8034c73..754ed89814293 100644
--- a/mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp
+++ b/mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp
@@ -54,25 +54,6 @@ struct ConstrainedVectorConvertToLLVMPattern
}
};
-/// No-op bitcast. Propagate type input arg if converted source and dest types
-/// are the same.
-struct IdentityBitcastLowering final
- : public OpConversionPattern<arith::BitcastOp> {
- using OpConversionPattern::OpConversionPattern;
-
- LogicalResult
- matchAndRewrite(arith::BitcastOp op, OpAdaptor adaptor,
- ConversionPatternRewriter &rewriter) const final {
- Value src = adaptor.getIn();
- Type resultType = getTypeConverter()->convertType(op.getType());
- if (src.getType() != resultType)
- return rewriter.notifyMatchFailure(op, "Types are different");
-
- rewriter.replaceOp(op, src);
- return success();
- }
-};
-
//===----------------------------------------------------------------------===//
// Straightforward Op Lowerings
//===----------------------------------------------------------------------===//
@@ -543,9 +524,6 @@ void mlir::arith::registerConvertArithToLLVMInterface(
void mlir::arith::populateArithToLLVMConversionPatterns(
const LLVMTypeConverter &converter, RewritePatternSet &patterns) {
-
- patterns.add<IdentityBitcastLowering>(converter, patterns.getContext());
-
// clang-format off
patterns.add<
AddFOpLowering,
diff --git a/mlir/lib/Conversion/LLVMCommon/VectorPattern.cpp b/mlir/lib/Conversion/LLVMCommon/VectorPattern.cpp
index fe4781138fa29..bf3f31729c3da 100644
--- a/mlir/lib/Conversion/LLVMCommon/VectorPattern.cpp
+++ b/mlir/lib/Conversion/LLVMCommon/VectorPattern.cpp
@@ -103,14 +103,6 @@ LogicalResult LLVM::detail::handleMultidimensionalVectors(
return success();
}
-static bool isVectorCompatibleType(Type type) {
- // Limit `vectorOneToOneRewrite` to scalar and vector types (and to
- // `LLVM::LLVMArrayType` which have a special handling).
- return isa<LLVM::LLVMArrayType, LLVM::LLVMPointerType, VectorType,
- IntegerType, FloatType>(type) &&
- LLVM::isCompatibleType(type);
-}
-
LogicalResult LLVM::detail::vectorOneToOneRewrite(
Operation *op, StringRef targetOp, ValueRange operands,
ArrayRef<NamedAttribute> targetAttrs,
@@ -119,7 +111,7 @@ LogicalResult LLVM::detail::vectorOneToOneRewrite(
assert(!operands.empty());
// Cannot convert ops if their operands are not of LLVM type.
- if (!llvm::all_of(operands.getTypes(), isVectorCompatibleType))
+ if (!llvm::all_of(operands.getTypes(), isCompatibleType))
return failure();
auto llvmNDVectorTy = operands[0].getType();
diff --git a/mlir/test/Conversion/ArithToLLVM/arith-to-llvm.mlir b/mlir/test/Conversion/ArithToLLVM/arith-to-llvm.mlir
index 9a6c4bca88f3b..1dabacfd8a47c 100644
--- a/mlir/test/Conversion/ArithToLLVM/arith-to-llvm.mlir
+++ b/mlir/test/Conversion/ArithToLLVM/arith-to-llvm.mlir
@@ -727,15 +727,3 @@ func.func @ops_supporting_overflow(%arg0: i64, %arg1: i64) {
%3 = arith.shli %arg0, %arg1 overflow<nsw, nuw> : i64
return
}
-
-// -----
-
-// CHECK-LABEL: func @memref_bitcast
-// CHECK-SAME: (%[[ARG:.*]]: memref<?xi16>)
-// CHECK: %[[V1:.*]] = builtin.unrealized_conversion_cast %[[ARG]] : memref<?xi16> to !llvm.struct<(ptr, ptr, i64, array<1 x i64>, array<1 x i64>)>
-// CHECK: %[[V2:.*]] = builtin.unrealized_conversion_cast %[[V1]] : !llvm.struct<(ptr, ptr, i64, array<1 x i64>, array<1 x i64>)> to memref<?xbf16>
-// CHECK: return %[[V2]]
-func.func @memref_bitcast(%1: memref<?xi16>) -> memref<?xbf16> {
- %2 = arith.bitcast %1 : memref<?xi16> to memref<?xbf16>
- func.return %2 : memref<?xbf16>
-}
|
|
@llvm/pr-subscribers-mlir-llvm Author: Ivan Butygin (Hardcode84) ChangesReverts llvm/llvm-project#125148 bot failures Full diff: https://github.com/llvm/llvm-project/pull/126895.diff 3 Files Affected:
diff --git a/mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp b/mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp
index 5c1afe8034c73..754ed89814293 100644
--- a/mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp
+++ b/mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp
@@ -54,25 +54,6 @@ struct ConstrainedVectorConvertToLLVMPattern
}
};
-/// No-op bitcast. Propagate type input arg if converted source and dest types
-/// are the same.
-struct IdentityBitcastLowering final
- : public OpConversionPattern<arith::BitcastOp> {
- using OpConversionPattern::OpConversionPattern;
-
- LogicalResult
- matchAndRewrite(arith::BitcastOp op, OpAdaptor adaptor,
- ConversionPatternRewriter &rewriter) const final {
- Value src = adaptor.getIn();
- Type resultType = getTypeConverter()->convertType(op.getType());
- if (src.getType() != resultType)
- return rewriter.notifyMatchFailure(op, "Types are different");
-
- rewriter.replaceOp(op, src);
- return success();
- }
-};
-
//===----------------------------------------------------------------------===//
// Straightforward Op Lowerings
//===----------------------------------------------------------------------===//
@@ -543,9 +524,6 @@ void mlir::arith::registerConvertArithToLLVMInterface(
void mlir::arith::populateArithToLLVMConversionPatterns(
const LLVMTypeConverter &converter, RewritePatternSet &patterns) {
-
- patterns.add<IdentityBitcastLowering>(converter, patterns.getContext());
-
// clang-format off
patterns.add<
AddFOpLowering,
diff --git a/mlir/lib/Conversion/LLVMCommon/VectorPattern.cpp b/mlir/lib/Conversion/LLVMCommon/VectorPattern.cpp
index fe4781138fa29..bf3f31729c3da 100644
--- a/mlir/lib/Conversion/LLVMCommon/VectorPattern.cpp
+++ b/mlir/lib/Conversion/LLVMCommon/VectorPattern.cpp
@@ -103,14 +103,6 @@ LogicalResult LLVM::detail::handleMultidimensionalVectors(
return success();
}
-static bool isVectorCompatibleType(Type type) {
- // Limit `vectorOneToOneRewrite` to scalar and vector types (and to
- // `LLVM::LLVMArrayType` which have a special handling).
- return isa<LLVM::LLVMArrayType, LLVM::LLVMPointerType, VectorType,
- IntegerType, FloatType>(type) &&
- LLVM::isCompatibleType(type);
-}
-
LogicalResult LLVM::detail::vectorOneToOneRewrite(
Operation *op, StringRef targetOp, ValueRange operands,
ArrayRef<NamedAttribute> targetAttrs,
@@ -119,7 +111,7 @@ LogicalResult LLVM::detail::vectorOneToOneRewrite(
assert(!operands.empty());
// Cannot convert ops if their operands are not of LLVM type.
- if (!llvm::all_of(operands.getTypes(), isVectorCompatibleType))
+ if (!llvm::all_of(operands.getTypes(), isCompatibleType))
return failure();
auto llvmNDVectorTy = operands[0].getType();
diff --git a/mlir/test/Conversion/ArithToLLVM/arith-to-llvm.mlir b/mlir/test/Conversion/ArithToLLVM/arith-to-llvm.mlir
index 9a6c4bca88f3b..1dabacfd8a47c 100644
--- a/mlir/test/Conversion/ArithToLLVM/arith-to-llvm.mlir
+++ b/mlir/test/Conversion/ArithToLLVM/arith-to-llvm.mlir
@@ -727,15 +727,3 @@ func.func @ops_supporting_overflow(%arg0: i64, %arg1: i64) {
%3 = arith.shli %arg0, %arg1 overflow<nsw, nuw> : i64
return
}
-
-// -----
-
-// CHECK-LABEL: func @memref_bitcast
-// CHECK-SAME: (%[[ARG:.*]]: memref<?xi16>)
-// CHECK: %[[V1:.*]] = builtin.unrealized_conversion_cast %[[ARG]] : memref<?xi16> to !llvm.struct<(ptr, ptr, i64, array<1 x i64>, array<1 x i64>)>
-// CHECK: %[[V2:.*]] = builtin.unrealized_conversion_cast %[[V1]] : !llvm.struct<(ptr, ptr, i64, array<1 x i64>, array<1 x i64>)> to memref<?xbf16>
-// CHECK: return %[[V2]]
-func.func @memref_bitcast(%1: memref<?xi16>) -> memref<?xbf16> {
- %2 = arith.bitcast %1 : memref<?xi16> to memref<?xbf16>
- func.return %2 : memref<?xbf16>
-}
|
flovent
pushed a commit
to flovent/llvm-project
that referenced
this pull request
Feb 13, 2025
Reverts llvm#125148 bot failures
joaosaffran
pushed a commit
to joaosaffran/llvm-project
that referenced
this pull request
Feb 14, 2025
Reverts llvm#125148 bot failures
sivan-shani
pushed a commit
to sivan-shani/llvm-project
that referenced
this pull request
Feb 24, 2025
Reverts llvm#125148 bot failures
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.
Reverts #125148
bot failures