Skip to content

Commit 8fae32c

Browse files
LancernLancern
committed
[CIR][Transforms] Add folders for complex operations
This patch adds folderss for `cir.complex.create`, `cir.complex.real`, and `cir.complex.imag`. This patch adds a new attribute `#cir.complex` that represents a constant complex value. Besides, the CIR dialect does not have a constant materializer yet; this patch adds it.
1 parent 12794b3 commit 8fae32c

File tree

10 files changed

+373
-106
lines changed

10 files changed

+373
-106
lines changed

‎clang/include/clang/CIR/Dialect/IR/CIRAttrs.td

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,40 @@ def FPAttr : CIR_Attr<"FP", "fp", [TypedAttrInterface]> {
274274
}];
275275
}
276276

277+
//===----------------------------------------------------------------------===//
278+
// ComplexAttr
279+
//===----------------------------------------------------------------------===//
280+
281+
def ComplexAttr : CIR_Attr<"Complex", "complex", [TypedAttrInterface]> {
282+
let summary = "An attribute that contains a constant complex value";
283+
let description = [{
284+
The `#cir.complex` attribute contains a constant value of complex number
285+
type. The `real` parameter gives the real part of the complex number and the
286+
`imag` parameter gives the imaginary part of the complex number.
287+
288+
The `real` and `imag` parameter must be either an IntAttr or an FPAttr that
289+
contains values of the same CIR type.
290+
}];
291+
292+
let parameters = (ins
293+
AttributeSelfTypeParameter<"", "mlir::cir::ComplexType">:$type,
294+
"mlir::TypedAttr":$real, "mlir::TypedAttr":$imag);
295+
296+
let builders = [
297+
AttrBuilderWithInferredContext<(ins "mlir::cir::ComplexType":$type,
298+
"mlir::TypedAttr":$real,
299+
"mlir::TypedAttr":$imag), [{
300+
return $_get(type.getContext(), type, real, imag);
301+
}]>,
302+
];
303+
304+
let genVerifyDecl = 1;
305+
306+
let assemblyFormat = [{
307+
`<` qualified($real) `,` qualified($imag) `>`
308+
}];
309+
}
310+
277311
//===----------------------------------------------------------------------===//
278312
// ConstPointerAttr
279313
//===----------------------------------------------------------------------===//

‎clang/include/clang/CIR/Dialect/IR/CIRDialect.td

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ def CIR_Dialect : Dialect {
2727
let useDefaultAttributePrinterParser = 0;
2828
let useDefaultTypePrinterParser = 0;
2929

30+
let hasConstantMaterializer = 1;
31+
3032
let extraClassDeclaration = [{
3133

3234
// Names of CIR parameter attributes.

‎clang/include/clang/CIR/Dialect/IR/CIROps.td

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,6 +1217,7 @@ def ComplexCreateOp : CIR_Op<"complex.create", [Pure, SameTypeOperands]> {
12171217
}];
12181218

12191219
let hasVerifier = 1;
1220+
let hasFolder = 1;
12201221
}
12211222

12221223
//===----------------------------------------------------------------------===//
@@ -1245,6 +1246,7 @@ def ComplexRealOp : CIR_Op<"complex.real", [Pure]> {
12451246
}];
12461247

12471248
let hasVerifier = 1;
1249+
let hasFolder = 1;
12481250
}
12491251

12501252
def ComplexImagOp : CIR_Op<"complex.imag", [Pure]> {
@@ -1269,6 +1271,7 @@ def ComplexImagOp : CIR_Op<"complex.imag", [Pure]> {
12691271
}];
12701272

12711273
let hasVerifier = 1;
1274+
let hasFolder = 1;
12721275
}
12731276

12741277
//===----------------------------------------------------------------------===//

‎clang/lib/CIR/Dialect/IR/CIRAttrs.cpp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,26 @@ LogicalResult cir::FPAttr::verify(function_ref<InFlightDiagnostic()> emitError,
362362
return success();
363363
}
364364

365+
//===----------------------------------------------------------------------===//
366+
// ComplexAttr definitions
367+
//===----------------------------------------------------------------------===//
368+
369+
LogicalResult ComplexAttr::verify(function_ref<InFlightDiagnostic()> emitError,
370+
mlir::cir::ComplexType type,
371+
mlir::TypedAttr real, mlir::TypedAttr imag) {
372+
auto elemTy = type.getElementTy();
373+
if (real.getType() != elemTy) {
374+
emitError() << "type of the real part does not match the complex type";
375+
return failure();
376+
}
377+
if (imag.getType() != elemTy) {
378+
emitError() << "type of the imaginary part does not match the complex type";
379+
return failure();
380+
}
381+
382+
return success();
383+
}
384+
365385
//===----------------------------------------------------------------------===//
366386
// CmpThreeWayInfoAttr definitions
367387
//===----------------------------------------------------------------------===//

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

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,14 @@ void cir::CIRDialect::initialize() {
124124
addInterfaces<CIROpAsmDialectInterface>();
125125
}
126126

127+
Operation *cir::CIRDialect::materializeConstant(mlir::OpBuilder &builder,
128+
mlir::Attribute value,
129+
mlir::Type type,
130+
mlir::Location loc) {
131+
return builder.create<mlir::cir::ConstantOp>(
132+
loc, type, mlir::cast<mlir::TypedAttr>(value));
133+
}
134+
127135
//===----------------------------------------------------------------------===//
128136
// Helpers
129137
//===----------------------------------------------------------------------===//
@@ -344,7 +352,8 @@ static LogicalResult checkConstantTypes(mlir::Operation *op, mlir::Type opType,
344352
return success();
345353
}
346354

347-
if (mlir::isa<mlir::cir::IntAttr, mlir::cir::FPAttr>(attrType)) {
355+
if (mlir::isa<mlir::cir::IntAttr, mlir::cir::FPAttr, mlir::cir::ComplexAttr>(
356+
attrType)) {
348357
auto at = cast<TypedAttr>(attrType);
349358
if (at.getType() != opType) {
350359
return op->emitOpError("result type (")
@@ -638,6 +647,26 @@ LogicalResult ComplexCreateOp::verify() {
638647
return success();
639648
}
640649

650+
OpFoldResult ComplexCreateOp::fold(FoldAdaptor adaptor) {
651+
auto real = adaptor.getReal();
652+
auto imag = adaptor.getImag();
653+
654+
if (!real || !imag)
655+
return nullptr;
656+
657+
// When both of real and imag are constants, we can fold the operation into an
658+
// `cir.const #cir.complex` operation.
659+
660+
auto realAttr = mlir::cast<mlir::TypedAttr>(real);
661+
auto imagAttr = mlir::cast<mlir::TypedAttr>(imag);
662+
assert(realAttr.getType() == imagAttr.getType() &&
663+
"real part and imag part should be of the same type");
664+
665+
auto complexTy =
666+
mlir::cir::ComplexType::get(getContext(), realAttr.getType());
667+
return mlir::cir::ComplexAttr::get(complexTy, realAttr, imagAttr);
668+
}
669+
641670
//===----------------------------------------------------------------------===//
642671
// ComplexRealOp and ComplexImagOp
643672
//===----------------------------------------------------------------------===//
@@ -650,6 +679,14 @@ LogicalResult ComplexRealOp::verify() {
650679
return success();
651680
}
652681

682+
OpFoldResult ComplexRealOp::fold(FoldAdaptor adaptor) {
683+
auto input =
684+
mlir::cast_if_present<mlir::cir::ComplexAttr>(adaptor.getOperand());
685+
if (input)
686+
return input.getReal();
687+
return nullptr;
688+
}
689+
653690
LogicalResult ComplexImagOp::verify() {
654691
if (getType() != getOperand().getType().getElementTy()) {
655692
emitOpError() << "cir.complex.imag result type does not match operand type";
@@ -658,6 +695,14 @@ LogicalResult ComplexImagOp::verify() {
658695
return success();
659696
}
660697

698+
OpFoldResult ComplexImagOp::fold(FoldAdaptor adaptor) {
699+
auto input =
700+
mlir::cast_if_present<mlir::cir::ComplexAttr>(adaptor.getOperand());
701+
if (input)
702+
return input.getImag();
703+
return nullptr;
704+
}
705+
661706
//===----------------------------------------------------------------------===//
662707
// ComplexRealPtrOp and ComplexImagPtrOp
663708
//===----------------------------------------------------------------------===//

‎clang/lib/CIR/Dialect/Transforms/CIRSimplify.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ void CIRSimplifyPass::runOnOperation() {
146146
getOperation()->walk([&](Operation *op) {
147147
// CastOp here is to perform a manual `fold` in
148148
// applyOpPatternsAndFold
149-
if (isa<BrOp, BrCondOp, ScopeOp, SwitchOp, CastOp, TryOp, UnaryOp>(op))
149+
if (isa<BrOp, BrCondOp, ScopeOp, SwitchOp, CastOp, TryOp, UnaryOp,
150+
ComplexCreateOp, ComplexRealOp, ComplexImagOp>(op))
150151
ops.push_back(op);
151152
});
152153

‎clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1179,6 +1179,30 @@ class CIRConstantLowering
11791179
attr = rewriter.getFloatAttr(
11801180
typeConverter->convertType(op.getType()),
11811181
mlir::cast<mlir::cir::FPAttr>(op.getValue()).getValue());
1182+
} else if (auto complexTy =
1183+
mlir::dyn_cast<mlir::cir::ComplexType>(op.getType())) {
1184+
auto complexAttr = mlir::cast<mlir::cir::ComplexAttr>(op.getValue());
1185+
auto complexElemTy = complexTy.getElementTy();
1186+
auto complexElemLLVMTy = typeConverter->convertType(complexElemTy);
1187+
1188+
mlir::Attribute components[2];
1189+
if (mlir::isa<mlir::cir::IntType>(complexElemTy)) {
1190+
components[0] = rewriter.getIntegerAttr(
1191+
complexElemLLVMTy,
1192+
mlir::cast<mlir::cir::IntAttr>(complexAttr.getReal()).getValue());
1193+
components[1] = rewriter.getIntegerAttr(
1194+
complexElemLLVMTy,
1195+
mlir::cast<mlir::cir::IntAttr>(complexAttr.getImag()).getValue());
1196+
} else {
1197+
components[0] = rewriter.getFloatAttr(
1198+
complexElemLLVMTy,
1199+
mlir::cast<mlir::cir::FPAttr>(complexAttr.getReal()).getValue());
1200+
components[1] = rewriter.getFloatAttr(
1201+
complexElemLLVMTy,
1202+
mlir::cast<mlir::cir::FPAttr>(complexAttr.getImag()).getValue());
1203+
}
1204+
1205+
attr = rewriter.getArrayAttr(components);
11821206
} else if (mlir::isa<mlir::cir::PointerType>(op.getType())) {
11831207
// Optimize with dedicated LLVM op for null pointers.
11841208
if (mlir::isa<mlir::cir::ConstPtrAttr>(op.getValue())) {

0 commit comments

Comments
 (0)