[CIR][Transforms] Simplify redundant bitcasts

Author: seven-mile

clang/lib/CIR/Dialect/IR/CIRDialect.cpp

@@ -501,16 +501,18 @@ LogicalResult CastOp::verify() {
 }
 
 OpFoldResult CastOp::fold(FoldAdaptor adaptor) {
-  if (getKind() != mlir::cir::CastKind::integral)
-    return {};
   if (getSrc().getType() != getResult().getType())
     return {};
-  // TODO: for sign differences, it's possible in certain conditions to
-  // create a new attributes that's capable or representing the source.
-  SmallVector<mlir::OpFoldResult, 1> foldResults;
-  auto foldOrder = getSrc().getDefiningOp()->fold(foldResults);
-  if (foldOrder.succeeded() && foldResults[0].is<mlir::Attribute>())
-    return foldResults[0].get<mlir::Attribute>();
+  if (getKind() == mlir::cir::CastKind::integral) {
+    // TODO: for sign differences, it's possible in certain conditions to
+    // create a new attributes that's capable or representing the source.
+    SmallVector<mlir::OpFoldResult, 1> foldResults;
+    auto foldOrder = getSrc().getDefiningOp()->fold(foldResults);
+    if (foldOrder.succeeded() && foldResults[0].is<mlir::Attribute>())
+      return foldResults[0].get<mlir::Attribute>();
+  } else if (getKind() == mlir::cir::CastKind::bitcast) {
+    return getSrc();
+  }
   return {};
 }
 

clang/lib/CIR/Dialect/Transforms/MergeCleanups.cpp

@@ -34,7 +34,7 @@ namespace {
 /// To:
 ///   ^bb0:
 ///     cir.return
-struct RemoveRedudantBranches : public OpRewritePattern<BrOp> {
+struct RemoveRedundantBranches : public OpRewritePattern<BrOp> {
   using OpRewritePattern<BrOp>::OpRewritePattern;
 
   LogicalResult matchAndRewrite(BrOp op,
@@ -101,7 +101,7 @@ struct MergeCleanupsPass : public MergeCleanupsBase<MergeCleanupsPass> {
 void populateMergeCleanupPatterns(RewritePatternSet &patterns) {
   // clang-format off
   patterns.add<
-    RemoveRedudantBranches,
+    RemoveRedundantBranches,
     RemoveEmptyScope,
     RemoveEmptySwitch
   >(patterns.getContext());
@@ -116,7 +116,9 @@ void MergeCleanupsPass::runOnOperation() {
   // Collect operations to apply patterns.
   SmallVector<Operation *, 16> ops;
   getOperation()->walk([&](Operation *op) {
-    if (isa<BrOp, BrCondOp, ScopeOp, SwitchOp>(op))
+    // CastOp here is to perform an manual `fold` in
+    // applyOpPatternsAndFold
+    if (isa<BrOp, BrCondOp, ScopeOp, SwitchOp, CastOp>(op))
       ops.push_back(op);
   });
 

clang/test/CIR/CodeGen/no-proto-fun-ptr.c

@@ -9,8 +9,7 @@ void check_noproto_ptr() {
 // CHECK:  cir.func no_proto @check_noproto_ptr()
 // CHECK:    [[ALLOC:%.*]] = cir.alloca !cir.ptr<!cir.func<!void ()>>, !cir.ptr<!cir.ptr<!cir.func<!void ()>>>, ["fun", init] {alignment = 8 : i64}
 // CHECK:    [[GGO:%.*]] = cir.get_global @empty : !cir.ptr<!cir.func<!void ()>>
-// CHECK:    [[CAST:%.*]] = cir.cast(bitcast, [[GGO]] : !cir.ptr<!cir.func<!void ()>>), !cir.ptr<!cir.func<!void ()>>
-// CHECK:    cir.store [[CAST]], [[ALLOC]] : !cir.ptr<!cir.func<!void ()>>, !cir.ptr<!cir.ptr<!cir.func<!void ()>>>
+// CHECK:    cir.store [[GGO]], [[ALLOC]] : !cir.ptr<!cir.func<!void ()>>, !cir.ptr<!cir.ptr<!cir.func<!void ()>>>
 // CHECK:    cir.return
 
 void empty(void) {}

clang/test/CIR/CodeGen/no-prototype.c

@@ -36,8 +36,7 @@ int noProto2();
 int test2(int x) {
   return noProto2(x);
   // CHECK:  [[GGO:%.*]] = cir.get_global @noProto2 : !cir.ptr<!cir.func<!s32i (!s32i)>>
-  // CHECK:  [[CAST:%.*]] = cir.cast(bitcast, %3 : !cir.ptr<!cir.func<!s32i (!s32i)>>), !cir.ptr<!cir.func<!s32i (!s32i)>>
-  // CHECK:  {{.*}} = cir.call [[CAST]](%{{[0-9]+}}) : (!cir.ptr<!cir.func<!s32i (!s32i)>>, !s32i) -> !s32i
+  // CHECK:  {{.*}} = cir.call [[GGO]](%{{[0-9]+}}) : (!cir.ptr<!cir.func<!s32i (!s32i)>>, !s32i) -> !s32i
 }
 int noProto2(int x) { return x; }
 // CHECK: cir.func no_proto @noProto2(%arg0: !s32i {{.+}}) -> !s32i

clang/test/CIR/CodeGen/unary.c

@@ -3,24 +3,24 @@
 
 void valueNegation(int i, short s, long l, float f, double d) {
 // CHECK: cir.func @valueNegation(
-  !i;
+  i = !i;
   // CHECK: %[[#INT:]] = cir.load %{{[0-9]+}} : !cir.ptr<!s32i>, !s32i
   // CHECK: %[[#INT_TO_BOOL:]] = cir.cast(int_to_bool, %[[#INT]] : !s32i), !cir.bool
   // CHECK: = cir.unary(not, %[[#INT_TO_BOOL]]) : !cir.bool, !cir.bool
-  !s;
+  s = !s;
   // CHECK: %[[#SHORT:]] = cir.load %{{[0-9]+}} : !cir.ptr<!s16i>, !s16i
   // CHECK: %[[#SHORT_TO_BOOL:]] = cir.cast(int_to_bool, %[[#SHORT]] : !s16i), !cir.bool
   // CHECK: = cir.unary(not, %[[#SHORT_TO_BOOL]]) : !cir.bool, !cir.bool
-  !l;
+  l = !l;
   // CHECK: %[[#LONG:]] = cir.load %{{[0-9]+}} : !cir.ptr<!s64i>, !s64i
   // CHECK: %[[#LONG_TO_BOOL:]] = cir.cast(int_to_bool, %[[#LONG]] : !s64i), !cir.bool
   // CHECK: = cir.unary(not, %[[#LONG_TO_BOOL]]) : !cir.bool, !cir.bool
-  !f;
+  f = !f;
   // CHECK: %[[#FLOAT:]] = cir.load %{{[0-9]+}} : !cir.ptr<!cir.float>, !cir.float
   // CHECK: %[[#FLOAT_TO_BOOL:]] = cir.cast(float_to_bool, %[[#FLOAT]] : !cir.float), !cir.bool
   // CHECK: %[[#FLOAT_NOT:]] = cir.unary(not, %[[#FLOAT_TO_BOOL]]) : !cir.bool, !cir.bool
   // CHECK: = cir.cast(bool_to_int, %[[#FLOAT_NOT]] : !cir.bool), !s32i
-  !d;
+  d = !d;
   // CHECK: %[[#DOUBLE:]] = cir.load %{{[0-9]+}} : !cir.ptr<!cir.double>, !cir.double
   // CHECK: %[[#DOUBLE_TO_BOOL:]] = cir.cast(float_to_bool, %[[#DOUBLE]] : !cir.double), !cir.bool
   // CHECK: %[[#DOUBLE_NOT:]] = cir.unary(not, %[[#DOUBLE_TO_BOOL]]) : !cir.bool, !cir.bool