Skip to content

[CIR] Upstream Cast kinds for ComplexType #149717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 23, 2025
Merged

[CIR] Upstream Cast kinds for ComplexType #149717

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8a3e3e8
[CIR] Upstream Cast kinds for ComplexType
AmrDeveloper Jul 20, 2025
13cc762
Address code review comments
AmrDeveloper Jul 21, 2025
7c43c07
Address code review comments
AmrDeveloper Jul 21, 2025
1c6ce40
Fix Complex to Complex cast
AmrDeveloper Jul 21, 2025
7611b81
Update test to use regex
AmrDeveloper Jul 21, 2025
eb5d912
Address code review comment
AmrDeveloper Jul 21, 2025
7bb89b6
Address code review comments
AmrDeveloper Jul 22, 2025
bf5393d
Address code review comments
AmrDeveloper Jul 22, 2025
ab1687c
Update llvm_unreachable message
AmrDeveloper Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 39 additions & 38 deletions clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ struct LoweringPreparePass : public LoweringPrepareBase<LoweringPreparePass> {

} // namespace

static mlir::Value lowerScalarToComplexCast(MLIRContext &ctx, CastOp op) {
static mlir::Value lowerScalarToComplexCast(mlir::MLIRContext &ctx,
cir::CastOp op) {
CIRBaseBuilderTy builder(ctx);
builder.setInsertionPoint(op);

Expand All @@ -40,7 +41,9 @@ static mlir::Value lowerScalarToComplexCast(MLIRContext &ctx, CastOp op) {
return builder.createComplexCreate(op.getLoc(), src, imag);
}

static mlir::Value lowerComplexToScalarCast(MLIRContext &ctx, CastOp op) {
static mlir::Value lowerComplexToScalarCast(mlir::MLIRContext &ctx,
cir::CastOp op,
cir::CastKind elemToBoolKind) {
CIRBaseBuilderTy builder(ctx);
Copy link
Contributor

@xlauko xlauko Jul 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
CIRBaseBuilderTy builder(ctx);
cir::CIRBaseBuilderTy builder(ctx);

builder.setInsertionPoint(op);

Expand All @@ -52,24 +55,17 @@ static mlir::Value lowerComplexToScalarCast(MLIRContext &ctx, CastOp op) {
mlir::Value srcReal = builder.createComplexReal(op.getLoc(), src);
mlir::Value srcImag = builder.createComplexImag(op.getLoc(), src);

cir::CastKind elemToBoolKind;
if (op.getKind() == cir::CastKind::float_complex_to_bool)
elemToBoolKind = cir::CastKind::float_to_bool;
else if (op.getKind() == cir::CastKind::int_complex_to_bool)
elemToBoolKind = cir::CastKind::int_to_bool;
else
llvm_unreachable("invalid complex to bool cast kind");

cir::BoolType boolTy = builder.getBoolTy();
mlir::Value srcRealToBool =
builder.createCast(op.getLoc(), elemToBoolKind, srcReal, boolTy);
mlir::Value srcImagToBool =
builder.createCast(op.getLoc(), elemToBoolKind, srcImag, boolTy);

return builder.createLogicalOr(op.getLoc(), srcRealToBool, srcImagToBool);
}

static mlir::Value lowerComplexToComplexCast(MLIRContext &ctx, CastOp op) {
static mlir::Value lowerComplexToComplexCast(mlir::MLIRContext &ctx,
cir::CastOp op,
cir::CastKind scalarCastKind) {
CIRBaseBuilderTy builder(ctx);
Copy link
Contributor

@xlauko xlauko Jul 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
CIRBaseBuilderTy builder(ctx);
cir::CIRBaseBuilderTy builder(ctx);

builder.setInsertionPoint(op);

Expand All @@ -80,24 +76,6 @@ static mlir::Value lowerComplexToComplexCast(MLIRContext &ctx, CastOp op) {
mlir::Value srcReal = builder.createComplexReal(op.getLoc(), src);
mlir::Value srcImag = builder.createComplexReal(op.getLoc(), src);
Copy link
Contributor

@xlauko xlauko Jul 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be createComplexImag?

Copy link
Member Author

@AmrDeveloper AmrDeveloper Jul 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, I will write a test case (Complex to Complex cast) that shows the problem now, to update it here and incubator


cir::CastKind scalarCastKind;
switch (op.getKind()) {
case cir::CastKind::float_complex:
scalarCastKind = cir::CastKind::floating;
break;
case cir::CastKind::float_complex_to_int_complex:
scalarCastKind = cir::CastKind::float_to_int;
break;
case cir::CastKind::int_complex:
scalarCastKind = cir::CastKind::integral;
break;
case cir::CastKind::int_complex_to_float_complex:
scalarCastKind = cir::CastKind::int_to_float;
break;
default:
llvm_unreachable("invalid complex to complex cast kind");
}

mlir::Value dstReal = builder.createCast(op.getLoc(), scalarCastKind, srcReal,
dstComplexElemTy);
mlir::Value dstImag = builder.createCast(op.getLoc(), scalarCastKind, srcImag,
Expand All @@ -114,19 +92,42 @@ void LoweringPreparePass::lowerCastOp(cir::CastOp op) {
break;

case cir::CastKind::float_complex_to_real:
case cir::CastKind::int_complex_to_real:
case cir::CastKind::float_complex_to_bool:
case cir::CastKind::int_complex_to_real: {
loweredValue = lowerComplexToScalarCast(getContext(), op, op.getKind());
Copy link
Contributor

@xlauko xlauko Jul 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks fishy, why is it op.getKind() here?

Copy link
Member Author

@AmrDeveloper AmrDeveloper Jul 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because of those kinds, we don't care about the kind, just call complex real op

break;
}

case cir::CastKind::float_complex_to_bool: {
loweredValue = lowerComplexToScalarCast(getContext(), op,
cir::CastKind::float_to_bool);
break;
}
case cir::CastKind::int_complex_to_bool: {
loweredValue = lowerComplexToScalarCast(getContext(), op);
loweredValue =
lowerComplexToScalarCast(getContext(), op, cir::CastKind::int_to_bool);
break;
}

case cir::CastKind::float_complex:
case cir::CastKind::float_complex_to_int_complex:
case cir::CastKind::int_complex:
case cir::CastKind::int_complex_to_float_complex:
loweredValue = lowerComplexToComplexCast(getContext(), op);
case cir::CastKind::float_complex: {
loweredValue =
lowerComplexToComplexCast(getContext(), op, cir::CastKind::floating);
break;
}
case cir::CastKind::float_complex_to_int_complex: {
loweredValue = lowerComplexToComplexCast(getContext(), op,
cir::CastKind::float_to_int);
break;
}
case cir::CastKind::int_complex: {
loweredValue =
lowerComplexToComplexCast(getContext(), op, cir::CastKind::integral);
break;
}
case cir::CastKind::int_complex_to_float_complex: {
loweredValue = lowerComplexToComplexCast(getContext(), op,
cir::CastKind::int_to_float);
break;
}
Copy link
Contributor

@xlauko xlauko Jul 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use immediately invoked lambda here and getContext beforehand, it will be way nicer :)

Something like this:

void LoweringPreparePass::lowerCastOp(cir::CastOp op) {
  mlir::MLIRContext *ctx = getContext();
  Value loweredValue = [&]() -> Value {
    switch (op.getKind()) {
    case cir::CastKind::float_to_complex:
    case cir::CastKind::int_to_complex:
      return lowerScalarToComplexCast(ctx, op);
    case cir::CastKind::float_complex_to_real:
    case cir::CastKind::int_complex_to_real:
      return lowerComplexToScalarCast(ctx, op, op.getKind());
    case cir::CastKind::float_complex_to_bool:
      return lowerComplexToScalarCast(ctx, op, cir::CastKind::float_to_bool);
    case cir::CastKind::int_complex_to_bool:
      return lowerComplexToScalarCast(ctx, op, cir::CastKind::int_to_bool);
    case cir::CastKind::float_complex:
      return lowerComplexToComplexCast(ctx, op, cir::CastKind::floating);
    case cir::CastKind::float_complex_to_int_complex:
      return lowerComplexToComplexCast(ctx, op, cir::CastKind::float_to_int);
    case cir::CastKind::int_complex:
      return lowerComplexToComplexCast(ctx, op, cir::CastKind::integral);
    case cir::CastKind::int_complex_to_float_complex:
      return lowerComplexToComplexCast(ctx, op, cir::CastKind::int_to_float);
    default:
      return nullptr;
    }
  }();

  if (loweredValue) {
    op.replaceAllUsesWith(loweredValue);
    op.erase();
  }
}

Copy link
Member Author

@AmrDeveloper AmrDeveloper Jul 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice, i will do that


default:
return;
Expand Down