[mlir] Convert std.and/std.or ops to spv.LogicalAnd/spv.LogicalOr
The conversion from std.and/std.or to spv.LogicalAnd/spv.LogicalOr is
only valid for boolean (i1) types. Modify BinaryOpPattern in
StandardToSPIRV.td to allow limiting the type of the operands for
which the pattern is applied.
Differential Revision: https://reviews.llvm.org/D71881
diff --git a/mlir/test/Conversion/StandardToSPIRV/std-to-spirv.mlir b/mlir/test/Conversion/StandardToSPIRV/std-to-spirv.mlir
index 8876c51..68b1278 100644
--- a/mlir/test/Conversion/StandardToSPIRV/std-to-spirv.mlir
+++ b/mlir/test/Conversion/StandardToSPIRV/std-to-spirv.mlir
@@ -135,6 +135,46 @@
}
//===----------------------------------------------------------------------===//
+// std logical binary operations
+//===----------------------------------------------------------------------===//
+
+// CHECK-LABEL: @logical_scalar
+func @logical_scalar(%arg0 : i1, %arg1 : i1) {
+ // CHECK: spv.LogicalAnd
+ %0 = and %arg0, %arg1 : i1
+ // CHECK: spv.LogicalOr
+ %1 = or %arg0, %arg1 : i1
+ return
+}
+
+// CHECK-LABEL: @logical_vector
+func @logical_vector(%arg0 : vector<4xi1>, %arg1 : vector<4xi1>) {
+ // CHECK: spv.LogicalAnd
+ %0 = and %arg0, %arg1 : vector<4xi1>
+ // CHECK: spv.LogicalOr
+ %1 = or %arg0, %arg1 : vector<4xi1>
+ return
+}
+
+// CHECK-LABEL: @logical_scalar_fail
+func @logical_scalar_fail(%arg0 : i32, %arg1 : i32) {
+ // CHECK-NOT: spv.LogicalAnd
+ %0 = and %arg0, %arg1 : i32
+ // CHECK-NOT: spv.LogicalOr
+ %1 = or %arg0, %arg1 : i32
+ return
+}
+
+// CHECK-LABEL: @logical_vector_fail
+func @logical_vector_fail(%arg0 : vector<4xi32>, %arg1 : vector<4xi32>) {
+ // CHECK-NOT: spv.LogicalAnd
+ %0 = and %arg0, %arg1 : vector<4xi32>
+ // CHECK-NOT: spv.LogicalOr
+ %1 = or %arg0, %arg1 : vector<4xi32>
+ return
+}
+
+//===----------------------------------------------------------------------===//
// std.select
//===----------------------------------------------------------------------===//
