This is an archive of the discontinued LLVM Phabricator instance.

Differential D91403

[mlir][StandardToSPIRV] Extend support for lowering cmpi to SPIRV.
ClosedPublic

Authored by hanchung on Nov 12 2020, 10:57 PM.

Details

Reviewers
mravishankar
antiagainst
Commits
rG47fd19f22eb5: [mlir][StandardToSPIRV] Extend support for lowering cmpi to SPIRV.
Summary

The logic of vector on boolean was missed. This patch adds the logic and test on
it.

Diff Detail

Event Timeline

hanchung created this revision.Nov 12 2020, 10:57 PM
Herald added a reviewer: mravishankar. · View Herald TranscriptNov 12 2020, 10:57 PM
Herald added a reviewer: antiagainst. · View Herald Transcript
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: rdzhabarov, tatianashp, ThomasRaoux and 15 others. · View Herald Transcript
hanchung requested review of this revision.Nov 12 2020, 10:57 PM
Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald TranscriptNov 12 2020, 10:57 PM
Harbormaster completed remote builds in B78720: Diff 305034.Nov 12 2020, 11:19 PM
mravishankar accepted this revision.Nov 13 2020, 1:05 PM
This revision is now accepted and ready to land.Nov 13 2020, 1:05 PM
Closed by commit rG47fd19f22eb5: [mlir][StandardToSPIRV] Extend support for lowering cmpi to SPIRV. (authored by hanchung). · Explain WhyNov 16 2020, 6:51 AM
This revision was automatically updated to reflect the committed changes.
hanchung added a commit: rG47fd19f22eb5: [mlir][StandardToSPIRV] Extend support for lowering cmpi to SPIRV..
Herald added a subscriber: teijeong. · View Herald TranscriptNov 16 2020, 6:51 AM

Revision Contents

PathSize
mlir/
lib/
Conversion/
StandardToSPIRV/
6 lines
test/
Conversion/
StandardToSPIRV/
9 lines

Diff 305497

mlir/lib/Conversion/StandardToSPIRV/ConvertStandardToSPIRV.cpp

Show First 20 Lines • Show All 761 Lines • ▼ Show 20 Lines
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
LogicalResult LogicalResult
BoolCmpIOpPattern::matchAndRewrite(CmpIOp cmpIOp, ArrayRef<Value> operands, BoolCmpIOpPattern::matchAndRewrite(CmpIOp cmpIOp, ArrayRef<Value> operands,
ConversionPatternRewriter &rewriter) const { ConversionPatternRewriter &rewriter) const {
CmpIOpAdaptor cmpIOpOperands(operands); CmpIOpAdaptor cmpIOpOperands(operands);
Type operandType = cmpIOp.lhs().getType(); Type operandType = cmpIOp.lhs().getType();
if (!operandType.isa<IntegerType>() || if (!isBoolScalarOrVector(operandType))
operandType.cast<IntegerType>().getWidth() != 1)
return failure(); return failure();
switch (cmpIOp.getPredicate()) { switch (cmpIOp.getPredicate()) {
#define DISPATCH(cmpPredicate, spirvOp) \ #define DISPATCH(cmpPredicate, spirvOp) \
case cmpPredicate: \ case cmpPredicate: \
rewriter.replaceOpWithNewOp<spirvOp>(cmpIOp, cmpIOp.getResult().getType(), \ rewriter.replaceOpWithNewOp<spirvOp>(cmpIOp, cmpIOp.getResult().getType(), \
cmpIOpOperands.lhs(), \ cmpIOpOperands.lhs(), \
cmpIOpOperands.rhs()); \ cmpIOpOperands.rhs()); \
Show All 9 Lines
} }
LogicalResult LogicalResult
CmpIOpPattern::matchAndRewrite(CmpIOp cmpIOp, ArrayRef<Value> operands, CmpIOpPattern::matchAndRewrite(CmpIOp cmpIOp, ArrayRef<Value> operands,
ConversionPatternRewriter &rewriter) const { ConversionPatternRewriter &rewriter) const {
CmpIOpAdaptor cmpIOpOperands(operands); CmpIOpAdaptor cmpIOpOperands(operands);
Type operandType = cmpIOp.lhs().getType(); Type operandType = cmpIOp.lhs().getType();
if (operandType.isa<IntegerType>() && if (isBoolScalarOrVector(operandType))
operandType.cast<IntegerType>().getWidth() == 1)
return failure(); return failure();
switch (cmpIOp.getPredicate()) { switch (cmpIOp.getPredicate()) {
#define DISPATCH(cmpPredicate, spirvOp) \ #define DISPATCH(cmpPredicate, spirvOp) \
case cmpPredicate: \ case cmpPredicate: \
if (isUnsignedOp<spirvOp>() && \ if (isUnsignedOp<spirvOp>() && \
operandType != this->typeConverter.convertType(operandType)) { \ operandType != this->typeConverter.convertType(operandType)) { \
return cmpIOp.emitError( \ return cmpIOp.emitError( \
▲ Show 20 Lines • Show All 325 Lines • Show Last 20 Lines

mlir/test/Conversion/StandardToSPIRV/std-ops-to-spirv.mlir

Show First 20 Lines • Show All 321 Lines • ▼ Show 20 Lines
func @boolcmpi(%arg0 : i1, %arg1 : i1) { func @boolcmpi(%arg0 : i1, %arg1 : i1) {
// CHECK: spv.LogicalEqual // CHECK: spv.LogicalEqual
%0 = cmpi "eq", %arg0, %arg1 : i1 %0 = cmpi "eq", %arg0, %arg1 : i1
// CHECK: spv.LogicalNotEqual // CHECK: spv.LogicalNotEqual
%1 = cmpi "ne", %arg0, %arg1 : i1 %1 = cmpi "ne", %arg0, %arg1 : i1
return return
} }
// CHECK-LABEL: @vecboolcmpi
func @vecboolcmpi(%arg0 : vector<4xi1>, %arg1 : vector<4xi1>) {
// CHECK: spv.LogicalEqual
%0 = cmpi "eq", %arg0, %arg1 : vector<4xi1>
// CHECK: spv.LogicalNotEqual
%1 = cmpi "ne", %arg0, %arg1 : vector<4xi1>
return
}
} // end module } // end module
// ----- // -----
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// std.constant // std.constant
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
▲ Show 20 Lines • Show All 610 Lines • Show Last 20 Lines