Skip to content

[mlir][math] Fix intrinsic conversions to LLVM for 0D-vector types #141020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+43 −1
Open

[mlir][math] Fix intrinsic conversions to LLVM for 0D-vector types #141020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion mlir/lib/Conversion/MathToLLVM/MathToLLVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,15 @@ struct IntOpWithFlagLowering : public ConvertOpToLLVMPattern<MathOp> {

auto loc = op.getLoc();
auto resultType = op.getResult().getType();
const auto &typeConverter = *this->getTypeConverter();
if (!LLVM::isCompatibleType(resultType)) {
resultType = typeConverter.convertType(resultType);
if (!resultType)
return failure();
}
if (operandType != resultType)
return rewriter.notifyMatchFailure(
op, "compatible result type doesn't match operand type");

if (!isa<LLVM::LLVMArrayType>(operandType)) {
rewriter.replaceOpWithNewOp<LLVMOp>(op, resultType, adaptor.getOperand(),
Expand All @@ -96,7 +105,7 @@ struct IntOpWithFlagLowering : public ConvertOpToLLVMPattern<MathOp> {
return failure();

return LLVM::detail::handleMultidimensionalVectors(
op.getOperation(), adaptor.getOperands(), *this->getTypeConverter(),
op.getOperation(), adaptor.getOperands(), typeConverter,
[&](Type llvm1DVectorTy, ValueRange operands) {
return rewriter.create<LLVMOp>(loc, llvm1DVectorTy, operands[0],
false);
Expand Down
33 changes: 33 additions & 0 deletions mlir/test/Conversion/MathToLLVM/math-to-llvm.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ func.func @ops(%arg0: f32, %arg1: f32, %arg2: i32, %arg3: i32, %arg4: f64) {

// -----

// CHECK-LABEL: func @absi(
// CHECK-SAME: i32
func.func @absi(%arg0: i32) -> i32 {
// CHECK: = "llvm.intr.abs"(%{{.*}}) <{is_int_min_poison = false}> : (i32) -> i32
%0 = math.absi %arg0 : i32
Expand All @@ -27,6 +29,17 @@ func.func @absi(%arg0: i32) -> i32 {

// -----

// CHECK-LABEL: func @absi_0d_vec(
// CHECK-SAME: i32
func.func @absi_0d_vec(%arg0 : vector<i32>) {
// CHECK: %[[CAST:.+]] = builtin.unrealized_conversion_cast %arg0 : vector<i32> to vector<1xi32>
// CHECK: "llvm.intr.abs"(%[[CAST]]) <{is_int_min_poison = false}> : (vector<1xi32>) -> vector<1xi32>
%0 = math.absi %arg0 : vector<i32>
func.return
}

// -----

// CHECK-LABEL: func @log1p(
// CHECK-SAME: f32
func.func @log1p(%arg0 : f32) {
Expand Down Expand Up @@ -201,6 +214,15 @@ func.func @ctlz(%arg0 : i32) {
func.return
}

// CHECK-LABEL: func @ctlz_0d_vec(
// CHECK-SAME: i32
func.func @ctlz_0d_vec(%arg0 : vector<i32>) {
// CHECK: %[[CAST:.+]] = builtin.unrealized_conversion_cast %arg0 : vector<i32> to vector<1xi32>
// CHECK: "llvm.intr.ctlz"(%[[CAST]]) <{is_zero_poison = false}> : (vector<1xi32>) -> vector<1xi32>
%0 = math.ctlz %arg0 : vector<i32>
func.return
}

// -----

// CHECK-LABEL: func @cttz(
Expand All @@ -213,6 +235,17 @@ func.func @cttz(%arg0 : i32) {

// -----

// CHECK-LABEL: func @cttz_0d_vec(
// CHECK-SAME: i32
func.func @cttz_0d_vec(%arg0 : vector<i32>) {
// CHECK: %[[CAST:.+]] = builtin.unrealized_conversion_cast %arg0 : vector<i32> to vector<1xi32>
// CHECK: "llvm.intr.cttz"(%[[CAST]]) <{is_zero_poison = false}> : (vector<1xi32>) -> vector<1xi32>
%0 = math.cttz %arg0 : vector<i32>
func.return
}

// -----

// CHECK-LABEL: func @cttz_vec(
// CHECK-SAME: i32
func.func @cttz_vec(%arg0 : vector<4xi32>) {
Expand Down