This is an archive of the discontinued LLVM Phabricator instance.

Differential D79143

[mlir][StandardToSPIRV] Add support for lowering integer casting.
ClosedPublic

Authored by hanchung on Apr 29 2020, 4:30 PM.

Details

Reviewers
mravishankar
antiagainst
denis13
Commits
rGbe0ad5b034b2: [mlir][StandardToSPIRV] Add support for lowering integer casting.
Summary

Maps ZeroExtendIOp and TruncateIOp to spirv::UConvertOp and spirv::SConvertOp.

Depends On D78974

Diff Detail

Event Timeline

hanchung created this revision.Apr 29 2020, 4:30 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 29 2020, 4:30 PM
Herald added subscribers: llvm-commits, Kayjukh, frgossen and 12 others. · View Herald Transcript
hanchung updated this revision to Diff 261098.Apr 29 2020, 4:52 PM

Add tests.

Harbormaster failed remote builds in B55232: Diff 261098!Apr 29 2020, 5:50 PM
Harbormaster failed remote builds in B55225: Diff 261089!
antiagainst requested changes to this revision.Apr 30 2020, 11:55 AM
antiagainst added inline comments.
mlir/lib/Conversion/StandardToSPIRV/ConvertStandardToSPIRV.cpp
773

Shouldn't we use UConvert here?

This revision now requires changes to proceed.Apr 30 2020, 11:55 AM
hanchung updated this revision to Diff 261376.Apr 30 2020, 3:14 PM
hanchung marked 2 inline comments as done.

Address comments.

mlir/lib/Conversion/StandardToSPIRV/ConvertStandardToSPIRV.cpp
773

good catch...thanks!

hanchung edited the summary of this revision. (Show Details)Apr 30 2020, 3:29 PM
antiagainst accepted this revision.Apr 30 2020, 3:31 PM
This revision is now accepted and ready to land.Apr 30 2020, 3:31 PM
Harbormaster completed remote builds in B55382: Diff 261376.Apr 30 2020, 4:07 PM
Closed by commit rGbe0ad5b034b2: [mlir][StandardToSPIRV] Add support for lowering integer casting. (authored by hanchung). · Explain WhyApr 30 2020, 7:33 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
mlir/
lib/
Conversion/
StandardToSPIRV/
2 lines
test/
Conversion/
StandardToSPIRV/
28 lines

Diff 261422

mlir/lib/Conversion/StandardToSPIRV/ConvertStandardToSPIRV.cpp

Show First 20 Lines • Show All 764 Lines • ▼ Show 20 Lines patterns.insert<
UnaryAndBinaryOpPattern<UnsignedRemIOp, spirv::UModOp>, UnaryAndBinaryOpPattern<UnsignedRemIOp, spirv::UModOp>,
UnaryAndBinaryOpPattern<UnsignedShiftRightOp, spirv::ShiftRightLogicalOp>, UnaryAndBinaryOpPattern<UnsignedShiftRightOp, spirv::ShiftRightLogicalOp>,
BitwiseOpPattern<AndOp, spirv::LogicalAndOp, spirv::BitwiseAndOp>, BitwiseOpPattern<AndOp, spirv::LogicalAndOp, spirv::BitwiseAndOp>,
BitwiseOpPattern<OrOp, spirv::LogicalOrOp, spirv::BitwiseOrOp>, BitwiseOpPattern<OrOp, spirv::LogicalOrOp, spirv::BitwiseOrOp>,
BoolCmpIOpPattern, ConstantCompositeOpPattern, ConstantScalarOpPattern, BoolCmpIOpPattern, ConstantCompositeOpPattern, ConstantScalarOpPattern,
CmpFOpPattern, CmpIOpPattern, IntLoadOpPattern, LoadOpPattern, CmpFOpPattern, CmpIOpPattern, IntLoadOpPattern, LoadOpPattern,
ReturnOpPattern, SelectOpPattern, StoreOpPattern, ReturnOpPattern, SelectOpPattern, StoreOpPattern,
TypeCastingOpPattern<SIToFPOp, spirv::ConvertSToFOp>, TypeCastingOpPattern<SIToFPOp, spirv::ConvertSToFOp>,
TypeCastingOpPattern<ZeroExtendIOp, spirv::UConvertOp>,
antiagainstUnsubmitted
Done
ReplyInline Actions

Shouldn't we use UConvert here?

antiagainst: Shouldn't we use UConvert here?
hanchungAuthorUnsubmitted
Done
ReplyInline Actions

good catch...thanks!

hanchung: good catch...thanks!
TypeCastingOpPattern<TruncateIOp, spirv::SConvertOp>,
TypeCastingOpPattern<FPExtOp, spirv::FConvertOp>, TypeCastingOpPattern<FPExtOp, spirv::FConvertOp>,
TypeCastingOpPattern<FPTruncOp, spirv::FConvertOp>, XOrOpPattern>( TypeCastingOpPattern<FPTruncOp, spirv::FConvertOp>, XOrOpPattern>(
context, typeConverter); context, typeConverter);
} }
} // namespace mlir } // namespace mlir

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

Show First 20 Lines • Show All 495 Lines • ▼ Show 20 Lines
// CHECK-LABEL: @sitofp2 // CHECK-LABEL: @sitofp2
func @sitofp2(%arg0 : i64) -> f64 { func @sitofp2(%arg0 : i64) -> f64 {
// CHECK: spv.ConvertSToF %{{.*}} : i64 to f64 // CHECK: spv.ConvertSToF %{{.*}} : i64 to f64
%0 = std.sitofp %arg0 : i64 to f64 %0 = std.sitofp %arg0 : i64 to f64
return %0 : f64 return %0 : f64
} }
// CHECK-LABEL: @zexti1
func @zexti1(%arg0: i16) -> i64 {
// CHECK: spv.UConvert %{{.*}} : i16 to i64
%0 = std.zexti %arg0 : i16 to i64
return %0 : i64
}
// CHECK-LABEL: @zexti2
func @zexti2(%arg0 : i32) -> i64 {
// CHECK: spv.UConvert %{{.*}} : i32 to i64
%0 = std.zexti %arg0 : i32 to i64
return %0 : i64
}
// CHECK-LABEL: @trunci1
func @trunci1(%arg0 : i64) -> i16 {
// CHECK: spv.SConvert %{{.*}} : i64 to i16
%0 = std.trunci %arg0 : i64 to i16
return %0 : i16
}
// CHECK-LABEL: @trunci2
func @trunci2(%arg0: i32) -> i16 {
// CHECK: spv.SConvert %{{.*}} : i32 to i16
%0 = std.trunci %arg0 : i32 to i16
return %0 : i16
}
} // end module } // end module
// ----- // -----
// Checks that cast types will be adjusted when no special capabilities for // Checks that cast types will be adjusted when no special capabilities for
// non-32-bit scalar types. // non-32-bit scalar types.
module attributes { module attributes {
spv.target_env = #spv.target_env< spv.target_env = #spv.target_env<
▲ Show 20 Lines • Show All 222 Lines • Show Last 20 Lines