This is an archive of the discontinued LLVM Phabricator instance.

Differential D112729

[mlir] fix shape check in Rsqrt approximation
AbandonedPublic

Authored by cota on Oct 28 2021, 8:53 AM.

Details

Reviewers
pifon2a
ezhulenev
Summary

We do not yet handle vectors with shapes other than {8}.

Diff Detail

Event Timeline

cota created this revision.Oct 28 2021, 8:53 AM
Herald added subscribers: wenzhicui, wrengr, Chia-hungDuan and 18 others. · View Herald TranscriptOct 28 2021, 8:53 AM
cota requested review of this revision.Oct 28 2021, 8:53 AM
Herald added a project: Restricted Project. · View Herald TranscriptOct 28 2021, 8:53 AM
Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald Transcript
Harbormaster completed remote builds in B131216: Diff 383053.Oct 28 2021, 9:15 AM
ezhulenev accepted this revision.Oct 28 2021, 10:52 AM

Included this fix in: https://reviews.llvm.org/D112736

This revision is now accepted and ready to land.Oct 28 2021, 10:52 AM
cota added a comment.Oct 28 2021, 12:51 PM
In D112729#3094170, @ezhulenev wrote:

Included this fix in: https://reviews.llvm.org/D112736

Thanks Eugene! Let's land that one -- I will abandon this one.

cota abandoned this revision.Oct 28 2021, 12:51 PM

Revision Contents

PathSize
mlir/
lib/
Dialect/
Math/
Transforms/
2 lines
test/
Dialect/
Math/
18 lines

Diff 383053

mlir/lib/Dialect/Math/Transforms/PolynomialApproximation.cpp

Show First 20 Lines • Show All 937 Lines • ▼ Show 20 Lines
}; };
} // namespace } // namespace
LogicalResult LogicalResult
RsqrtApproximation::matchAndRewrite(math::RsqrtOp op, RsqrtApproximation::matchAndRewrite(math::RsqrtOp op,
PatternRewriter &rewriter) const { PatternRewriter &rewriter) const {
auto shape = vectorShape(op.operand().getType(), isF32); auto shape = vectorShape(op.operand().getType(), isF32);
// Only support already-vectorized rsqrt's. // Only support already-vectorized rsqrt's.
if (!shape.hasValue() || (*shape)[0] != 8) if (!shape.hasValue() || shape->size() != 1 || shape->back() != 8)
return rewriter.notifyMatchFailure(op, "unsupported operand type"); return rewriter.notifyMatchFailure(op, "unsupported operand type");
ImplicitLocOpBuilder builder(op->getLoc(), rewriter); ImplicitLocOpBuilder builder(op->getLoc(), rewriter);
auto bcast = [&](Value value) -> Value { auto bcast = [&](Value value) -> Value {
return broadcast(builder, value, *shape); return broadcast(builder, value, *shape);
}; };
Value cstPosInf = bcast(f32FromBits(builder, 0x7f800000u)); Value cstPosInf = bcast(f32FromBits(builder, 0x7f800000u));
▲ Show 20 Lines • Show All 49 Lines • Show Last 20 Lines

mlir/test/Dialect/Math/polynomial-approximation.mlir

Show First 20 Lines • Show All 419 Lines • ▼ Show 20 Lines
// AVX2: %[[VAL_12:.*]] = arith.mulf %[[VAL_9]], %[[VAL_11]] : vector<8xf32> // AVX2: %[[VAL_12:.*]] = arith.mulf %[[VAL_9]], %[[VAL_11]] : vector<8xf32>
// AVX2: %[[VAL_13:.*]] = select %[[VAL_8]], %[[VAL_9]], %[[VAL_12]] : vector<8xi1>, vector<8xf32> // AVX2: %[[VAL_13:.*]] = select %[[VAL_8]], %[[VAL_9]], %[[VAL_12]] : vector<8xi1>, vector<8xf32>
// AVX2: return %[[VAL_13]] : vector<8xf32> // AVX2: return %[[VAL_13]] : vector<8xf32>
// AVX2: } // AVX2: }
func @rsqrt_vector(%arg0: vector<8xf32>) -> vector<8xf32> { func @rsqrt_vector(%arg0: vector<8xf32>) -> vector<8xf32> {
%0 = math.rsqrt %arg0 : vector<8xf32> %0 = math.rsqrt %arg0 : vector<8xf32>
return %0 : vector<8xf32> return %0 : vector<8xf32>
} }
// CHECK-LABEL: func @rsqrt_vector_8x2xf32
// CHECK: math.rsqrt
// AVX2-LABEL: func @rsqrt_vector_8x2xf32
// AVX2: math.rsqrt
func @rsqrt_vector_8x2xf32(%arg0: vector<8x2xf32>) -> vector<8x2xf32> {
%0 = math.rsqrt %arg0 : vector<8x2xf32>
return %0 : vector<8x2xf32>
}
// CHECK-LABEL: func @rsqrt_vector_2x8xf32
// CHECK: math.rsqrt
// AVX2-LABEL: func @rsqrt_vector_2x8xf32
// AVX: math.rsqrt
func @rsqrt_vector_2x8xf32(%arg0: vector<2x8xf32>) -> vector<2x8xf32> {
%0 = math.rsqrt %arg0 : vector<2x8xf32>
return %0 : vector<2x8xf32>
}