Reconcile with upstream merged changes

Author: cferry-AMD

mlir/include/mlir/Conversion/Passes.td

@@ -139,9 +139,6 @@ def ArithToAMDGPUConversionPass : Pass<"convert-arith-to-amdgpu"> {
 
 def ConvertArithToEmitC : Pass<"convert-arith-to-emitc"> {
   let summary = "Convert Arith dialect to EmitC dialect";
-  let description = [{
-    This pass converts `arith` dialect operations to `emitc`.
-  }];
   let dependentDialects = ["emitc::EmitCDialect"];
 }
 

mlir/lib/Conversion/ArithToEmitC/ArithToEmitC.cpp

@@ -367,7 +367,8 @@ class SelectOpConversion : public OpConversionPattern<arith::SelectOp> {
 template <typename CastOp>
 class FtoICastOpConversion : public OpConversionPattern<CastOp> {
 public:
-  using OpConversionPattern<CastOp>::OpConversionPattern;
+  FtoICastOpConversion(const TypeConverter &typeConverter, MLIRContext *context)
+      : OpConversionPattern<CastOp>(typeConverter, context) {}
 
   LogicalResult
   matchAndRewrite(CastOp castOp, typename CastOp::Adaptor adaptor,
@@ -382,7 +383,9 @@ class FtoICastOpConversion : public OpConversionPattern<CastOp> {
     if (!dstType)
       return rewriter.notifyMatchFailure(castOp, "type conversion failed");
 
-    if (!emitc::isSupportedIntegerType(dstType))
+    // Float-to-i1 casts are not supported: any value with 0 < value < 1 must be
+    // truncated to 0, whereas a boolean conversion would return true.
+    if (!emitc::isSupportedIntegerType(dstType) || dstType.isInteger(1))
       return rewriter.notifyMatchFailure(castOp,
                                          "unsupported cast destination type");
 
@@ -411,7 +414,8 @@ class FtoICastOpConversion : public OpConversionPattern<CastOp> {
 template <typename CastOp>
 class ItoFCastOpConversion : public OpConversionPattern<CastOp> {
 public:
-  using OpConversionPattern<CastOp>::OpConversionPattern;
+  ItoFCastOpConversion(const TypeConverter &typeConverter, MLIRContext *context)
+      : OpConversionPattern<CastOp>(typeConverter, context) {}
 
   LogicalResult
   matchAndRewrite(CastOp castOp, typename CastOp::Adaptor adaptor,

mlir/test/Conversion/ArithToEmitC/arith-to-emitc-unsupported.mlir

@@ -62,3 +62,20 @@ func.func @arith_cast_to_f16(%arg0: i32) -> f16 {
   %t = arith.sitofp %arg0 : i32 to f16
   return %t: f16
 }
+
+// -----
+
+func.func @arith_cast_fptosi_i1(%arg0: f32) -> i1 {
+  // expected-error @+1 {{failed to legalize operation 'arith.fptosi'}}
+  %t = arith.fptosi %arg0 : f32 to i1
+  return %t: i1
+}
+
+// -----
+
+func.func @arith_cast_fptoui_i1(%arg0: f32) -> i1 {
+  // expected-error @+1 {{failed to legalize operation 'arith.fptoui'}}
+  %t = arith.fptoui %arg0 : f32 to i1
+  return %t: i1
+}
+