Skip to content

Commit 92927ee

Browse files
xlaukoxlauko
authored
[CIR] Infer MLIRContext in attr builders when possible (#1582)
1 parent 395999a commit 92927ee

File tree

11 files changed

+75
-46
lines changed

11 files changed

+75
-46
lines changed

‎clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -618,8 +618,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
618618
mlir::TypedAttr getConstPtrAttr(mlir::Type t, int64_t v) {
619619
auto val =
620620
mlir::IntegerAttr::get(mlir::IntegerType::get(t.getContext(), 64), v);
621-
return cir::ConstPtrAttr::get(getContext(), mlir::cast<cir::PointerType>(t),
622-
val);
621+
return cir::ConstPtrAttr::get(t, val);
623622
}
624623

625624
mlir::TypedAttr getConstNullPtrAttr(mlir::Type t) {
@@ -663,9 +662,8 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
663662
callOp->setAttr("extra_attrs", extraFnAttr);
664663
} else {
665664
mlir::NamedAttrList empty;
666-
callOp->setAttr("extra_attrs",
667-
cir::ExtraFuncAttributesAttr::get(
668-
getContext(), empty.getDictionary(getContext())));
665+
callOp->setAttr("extra_attrs", cir::ExtraFuncAttributesAttr::get(
666+
empty.getDictionary(getContext())));
669667
}
670668
return callOp;
671669
}
@@ -719,9 +717,8 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
719717
tryCallOp->setAttr("extra_attrs", extraFnAttr);
720718
} else {
721719
mlir::NamedAttrList empty;
722-
tryCallOp->setAttr("extra_attrs",
723-
cir::ExtraFuncAttributesAttr::get(
724-
getContext(), empty.getDictionary(getContext())));
720+
tryCallOp->setAttr("extra_attrs", cir::ExtraFuncAttributesAttr::get(
721+
empty.getDictionary(getContext())));
725722
}
726723
return tryCallOp;
727724
}

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

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,11 @@ def ConstArrayAttr : CIR_Attr<"ConstArray", "const_array", [TypedAttrInterface]>
312312
zeros = typeSize - mlir::cast<mlir::ArrayAttr>(elts).size();
313313

314314
return $_get(type.getContext(), type, elts, zeros);
315+
}]>,
316+
AttrBuilderWithInferredContext<(ins "cir::ArrayType":$type,
317+
"mlir::Attribute":$elts,
318+
"int":$trailingZerosNum), [{
319+
return $_get(type.getContext(), type, elts, trailingZerosNum);
315320
}]>
316321
];
317322

@@ -510,11 +515,7 @@ def ConstPtrAttr : CIR_Attr<"ConstPtr", "ptr", [TypedAttrInterface]> {
510515
let builders = [
511516
AttrBuilderWithInferredContext<(ins "mlir::Type":$type, "mlir::IntegerAttr":$value), [{
512517
return $_get(type.getContext(), mlir::cast<cir::PointerType>(type), value);
513-
}]>,
514-
AttrBuilder<(ins "mlir::Type":$type,
515-
"mlir::IntegerAttr":$value), [{
516-
return $_get($_ctxt, mlir::cast<cir::PointerType>(type), value);
517-
}]>,
518+
}]>
518519
];
519520
let extraClassDeclaration = [{
520521
bool isNullValue() const { return getValue().getInt() == 0; }
@@ -614,6 +615,16 @@ def DataMemberAttr : CIR_Attr<"DataMember", "data_member",
614615
```
615616
}];
616617

618+
let builders = [
619+
AttrBuilderWithInferredContext<(ins "cir::DataMemberType":$type), [{
620+
return $_get(type.getContext(), type, std::nullopt);
621+
}]>,
622+
AttrBuilderWithInferredContext<(ins "cir::DataMemberType":$type,
623+
"unsigned":$member_index), [{
624+
return $_get(type.getContext(), type, member_index);
625+
}]>,
626+
];
627+
617628
let genVerifyDecl = 1;
618629

619630
let assemblyFormat = [{
@@ -733,12 +744,12 @@ def GlobalViewAttr : CIR_Attr<"GlobalView", "global_view", [TypedAttrInterface]>
733744
cir.global external @elt_ptr = #cir.global_view<@rgb, [1]> : !cir.ptr<i8>
734745
cir.global external @table_of_ptrs = #cir.const_array<[#cir.global_view<@rgb, [1]> : !cir.ptr<i8>] : !cir.array<!cir.ptr<i8> x 1>>
735746
```
736-
747+
737748
Note, that unlike LLVM IR's gep instruction, CIR doesn't add the leading zero index
738749
when it's known to be constant zero, e.g. for pointers, i.e. we use indexes exactly
739750
to access sub elements or for the offset. The leading zero index is added later in
740751
the lowering.
741-
752+
742753
Example:
743754
```
744755
struct A {
@@ -751,7 +762,7 @@ def GlobalViewAttr : CIR_Attr<"GlobalView", "global_view", [TypedAttrInterface]>
751762
```
752763
VTT for B:
753764
```
754-
cir.global linkonce_odr @_ZTT1B = #cir.const_array<[#cir.global_view<@_ZTV1B, [0 : i32, 3 : i32]> : !cir.ptr<!u8i>]> : !cir.array<!cir.ptr<!u8i> x 1>
765+
cir.global linkonce_odr @_ZTT1B = #cir.const_array<[#cir.global_view<@_ZTV1B, [0 : i32, 3 : i32]> : !cir.ptr<!u8i>]> : !cir.array<!cir.ptr<!u8i> x 1>
755766
```
756767
The same for LLVM IR after CIR:
757768
```
@@ -1189,6 +1200,12 @@ def ExtraFuncAttr : CIR_Attr<"ExtraFuncAttributes", "extra"> {
11891200

11901201
let parameters = (ins "mlir::DictionaryAttr":$elements);
11911202

1203+
let builders = [
1204+
AttrBuilderWithInferredContext<(ins "mlir::DictionaryAttr":$elements), [{
1205+
return $_get(elements.getContext(), elements);
1206+
}]>
1207+
];
1208+
11921209
let assemblyFormat = [{ `(` $elements `)` }];
11931210

11941211
// Printing and parsing also available in CIRDialect.cpp
@@ -1281,6 +1298,10 @@ class CIR_GlobalCtorDtor<string name, string attrMnemonic,
12811298
AttrBuilder<(ins "llvm::StringRef":$name,
12821299
CArg<"int", "65536">:$priority), [{
12831300
return $_get($_ctxt, mlir::StringAttr::get($_ctxt, name), priority);
1301+
}]>,
1302+
AttrBuilderWithInferredContext<(ins "mlir::StringAttr":$name,
1303+
CArg<"int", "65536">:$priority), [{
1304+
return $_get(name.getContext(), name, priority);
12841305
}]>
12851306
];
12861307
let extraClassDeclaration = [{
@@ -1349,6 +1370,13 @@ def AnnotationAttr : CIR_Attr<"Annotation", "annotation"> {
13491370
let parameters = (ins "mlir::StringAttr":$name,
13501371
"mlir::ArrayAttr":$args);
13511372

1373+
let builders = [
1374+
AttrBuilderWithInferredContext<(ins "mlir::StringAttr":$name,
1375+
CArg<"mlir::ArrayAttr", "{}">:$args), [{
1376+
return $_get(name.getContext(), name, args);
1377+
}]>
1378+
];
1379+
13521380
let assemblyFormat = "`<` struct($name, $args) `>`";
13531381

13541382
let extraClassDeclaration = [{
@@ -1389,6 +1417,12 @@ def GlobalAnnotationValuesAttr : CIR_Attr<"GlobalAnnotationValues",
13891417

13901418
let parameters = (ins "mlir::ArrayAttr":$annotations);
13911419

1420+
let builders = [
1421+
AttrBuilderWithInferredContext<(ins "mlir::ArrayAttr":$annotations), [{
1422+
return $_get(annotations.getContext(), annotations);
1423+
}]>
1424+
];
1425+
13921426
let assemblyFormat = [{ $annotations }];
13931427

13941428
// Enable verifier.
@@ -1402,7 +1436,7 @@ def GlobalAnnotationValuesAttr : CIR_Attr<"GlobalAnnotationValues",
14021436
def AddressPointAttr : CIR_Attr<"AddressPoint", "address_point"> {
14031437
let summary = "Address point attribute";
14041438

1405-
let description = [{
1439+
let description = [{
14061440
Attribute specifying the address point within a C++ virtual table (vtable).
14071441

14081442
The `index` (vtable index) parameter identifies which vtable to use within a vtable

‎clang/lib/CIR/CodeGen/CIRGenBuilder.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
179179
cir::ArrayType::get(eltTy, finalSize - trailingZerosNum);
180180
auto fullArrayTy = cir::ArrayType::get(eltTy, finalSize);
181181
return cir::ConstArrayAttr::get(
182-
getContext(), fullArrayTy,
182+
fullArrayTy,
183183
mlir::StringAttr::get(str.drop_back(trailingZerosNum),
184184
truncatedArrayTy),
185185
trailingZerosNum);
@@ -258,11 +258,11 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
258258

259259
cir::DataMemberAttr getDataMemberAttr(cir::DataMemberType ty,
260260
unsigned memberIndex) {
261-
return cir::DataMemberAttr::get(getContext(), ty, memberIndex);
261+
return cir::DataMemberAttr::get(ty, memberIndex);
262262
}
263263

264264
cir::DataMemberAttr getNullDataMemberAttr(cir::DataMemberType ty) {
265-
return cir::DataMemberAttr::get(getContext(), ty, std::nullopt);
265+
return cir::DataMemberAttr::get(ty);
266266
}
267267

268268
// TODO(cir): Once we have CIR float types, replace this by something like a

‎clang/lib/CIR/CodeGen/CIRGenCall.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ RValue CIRGenFunction::emitCall(const CIRGenFunctionInfo &CallInfo,
849849
}
850850

851851
auto extraFnAttrs = cir::ExtraFuncAttributesAttr::get(
852-
&getMLIRContext(), Attrs.getDictionary(&getMLIRContext()));
852+
Attrs.getDictionary(&getMLIRContext()));
853853

854854
cir::CIRCallOpInterface callLikeOp = emitCallLikeOp(
855855
*this, callLoc, indirectFuncTy, indirectFuncVal, directFuncOp,

‎clang/lib/CIR/CodeGen/CIRGenExprConst.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2140,7 +2140,7 @@ static mlir::TypedAttr emitNullConstant(CIRGenModule &CGM, const RecordDecl *rd,
21402140
}
21412141

21422142
mlir::MLIRContext *mlirContext = record.getContext();
2143-
return cir::ConstRecordAttr::get(mlirContext, record,
2143+
return cir::ConstRecordAttr::get(record,
21442144
mlir::ArrayAttr::get(mlirContext, elements));
21452145
}
21462146

‎clang/lib/CIR/CodeGen/CIRGenModule.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2713,8 +2713,8 @@ cir::FuncOp CIRGenModule::createCIRFunction(mlir::Location loc, StringRef name,
27132713
f, mlir::SymbolTable::Visibility::Private);
27142714

27152715
// Initialize with empty dict of extra attributes.
2716-
f.setExtraAttrsAttr(cir::ExtraFuncAttributesAttr::get(
2717-
&getMLIRContext(), builder.getDictionaryAttr({})));
2716+
f.setExtraAttrsAttr(
2717+
cir::ExtraFuncAttributesAttr::get(builder.getDictionaryAttr({})));
27182718

27192719
if (!curCGF)
27202720
theModule.push_back(f);
@@ -2824,7 +2824,7 @@ void CIRGenModule::setCIRFunctionAttributesForDefinition(const Decl *decl,
28242824
}
28252825

28262826
f.setExtraAttrsAttr(cir::ExtraFuncAttributesAttr::get(
2827-
&getMLIRContext(), attrs.getDictionary(&getMLIRContext())));
2827+
attrs.getDictionary(&getMLIRContext())));
28282828
return;
28292829
}
28302830

@@ -2938,7 +2938,7 @@ void CIRGenModule::setCIRFunctionAttributesForDefinition(const Decl *decl,
29382938
}
29392939

29402940
f.setExtraAttrsAttr(cir::ExtraFuncAttributesAttr::get(
2941-
&getMLIRContext(), attrs.getDictionary(&getMLIRContext())));
2941+
attrs.getDictionary(&getMLIRContext())));
29422942

29432943
assert(!MissingFeatures::setFunctionAlignment());
29442944

@@ -2963,8 +2963,8 @@ void CIRGenModule::setCIRFunctionAttributes(GlobalDecl gd,
29632963
mlir::NamedAttrList pal{func.getExtraAttrs().getElements().getValue()};
29642964
constructAttributeList(func.getName(), info, gd, pal, callingConv, sideEffect,
29652965
/*AttrOnCallSite=*/false, isThunk);
2966-
func.setExtraAttrsAttr(cir::ExtraFuncAttributesAttr::get(
2967-
&getMLIRContext(), pal.getDictionary(&getMLIRContext())));
2966+
func.setExtraAttrsAttr(
2967+
cir::ExtraFuncAttributesAttr::get(pal.getDictionary(&getMLIRContext())));
29682968

29692969
// TODO(cir): Check X86_VectorCall incompatibility with WinARM64EC
29702970

@@ -4212,7 +4212,7 @@ cir::AnnotationAttr
42124212
CIRGenModule::emitAnnotateAttr(const clang::AnnotateAttr *aa) {
42134213
mlir::StringAttr annoGV = builder.getStringAttr(aa->getAnnotation());
42144214
mlir::ArrayAttr args = emitAnnotationArgs(aa);
4215-
return cir::AnnotationAttr::get(&getMLIRContext(), annoGV, args);
4215+
return cir::AnnotationAttr::get(annoGV, args);
42164216
}
42174217

42184218
void CIRGenModule::addGlobalAnnotations(const ValueDecl *d,

‎clang/lib/CIR/CodeGen/CIRGenOpenCL.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ void CIRGenModule::genKernelArgMetadata(cir::FuncOp Fn, const FunctionDecl *FD,
177177
mlir::NamedAttrList items{Fn.getExtraAttrs().getElements().getValue()};
178178
auto oldValue = items.set(value.getMnemonic(), value);
179179
if (oldValue != value) {
180-
Fn.setExtraAttrsAttr(cir::ExtraFuncAttributesAttr::get(
181-
&getMLIRContext(), builder.getDictionaryAttr(items)));
180+
Fn.setExtraAttrsAttr(
181+
cir::ExtraFuncAttributesAttr::get(builder.getDictionaryAttr(items)));
182182
}
183183
} else {
184184
if (shouldEmitArgName)
@@ -246,7 +246,7 @@ void CIRGenFunction::emitKernelMetadata(const FunctionDecl *FD,
246246
attrs.append(kernelMetadataAttr.getMnemonic(), kernelMetadataAttr);
247247

248248
Fn.setExtraAttrsAttr(cir::ExtraFuncAttributesAttr::get(
249-
&getMLIRContext(), attrs.getDictionary(&getMLIRContext())));
249+
attrs.getDictionary(&getMLIRContext())));
250250
}
251251

252252
void CIRGenModule::emitOpenCLMetadata() {

‎clang/lib/CIR/CodeGen/ConstantInitBuilder.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ class ConstantAggregateBuilderBase {
195195
void addPointer(cir::PointerType ptrTy, uint64_t value) {
196196
auto val = mlir::IntegerAttr::get(
197197
mlir::IntegerType::get(ptrTy.getContext(), 64), value);
198-
add(cir::ConstPtrAttr::get(ptrTy.getContext(), ptrTy, val));
198+
add(cir::ConstPtrAttr::get(ptrTy, val));
199199
}
200200

201201
/// Add a bitcast of a value to a specific type.

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2463,18 +2463,16 @@ ParseResult cir::FuncOp::parse(OpAsmParser &parser, OperationState &state) {
24632463

24642464
if (parseGlobalDtorCtor("global_ctor", [&](std::optional<int> prio) {
24652465
cir::GlobalCtorAttr globalCtorAttr =
2466-
prio ? cir::GlobalCtorAttr::get(builder.getContext(), nameAttr,
2467-
*prio)
2468-
: cir::GlobalCtorAttr::get(builder.getContext(), nameAttr);
2466+
prio ? cir::GlobalCtorAttr::get(nameAttr, *prio)
2467+
: cir::GlobalCtorAttr::get(nameAttr);
24692468
state.addAttribute(getGlobalCtorAttrName(state.name), globalCtorAttr);
24702469
}).failed())
24712470
return failure();
24722471

24732472
if (parseGlobalDtorCtor("global_dtor", [&](std::optional<int> prio) {
24742473
cir::GlobalDtorAttr globalDtorAttr =
2475-
prio ? cir::GlobalDtorAttr::get(builder.getContext(), nameAttr,
2476-
*prio)
2477-
: cir::GlobalDtorAttr::get(builder.getContext(), nameAttr);
2474+
prio ? cir::GlobalDtorAttr::get(nameAttr, *prio)
2475+
: cir::GlobalDtorAttr::get(nameAttr);
24782476
state.addAttribute(getGlobalDtorAttrName(state.name), globalDtorAttr);
24792477
}).failed())
24802478
return failure();
@@ -2490,7 +2488,7 @@ ParseResult cir::FuncOp::parse(OpAsmParser &parser, OperationState &state) {
24902488
} else {
24912489
NamedAttrList empty;
24922490
extraAttrs = cir::ExtraFuncAttributesAttr::get(
2493-
builder.getContext(), empty.getDictionary(builder.getContext()));
2491+
empty.getDictionary(builder.getContext()));
24942492
}
24952493
state.addAttribute(getExtraAttrsAttrName(state.name), extraAttrs);
24962494

@@ -2969,7 +2967,7 @@ static ::mlir::ParseResult parseCallCommon(::mlir::OpAsmParser &parser,
29692967
} else {
29702968
NamedAttrList empty;
29712969
extraAttrs = cir::ExtraFuncAttributesAttr::get(
2972-
builder.getContext(), empty.getDictionary(builder.getContext()));
2970+
empty.getDictionary(builder.getContext()));
29732971
}
29742972
result.addAttribute(extraAttrsAttrName, extraAttrs);
29752973

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ FuncOp LoweringPreparePass::buildRuntimeFunction(
230230
f, mlir::SymbolTable::Visibility::Private);
231231
mlir::NamedAttrList attrs;
232232
f.setExtraAttrsAttr(cir::ExtraFuncAttributesAttr::get(
233-
builder.getContext(), attrs.getDictionary(builder.getContext())));
233+
attrs.getDictionary(builder.getContext())));
234234
}
235235
return f;
236236
}
@@ -1532,9 +1532,9 @@ void LoweringPreparePass::buildGlobalAnnotationValues() {
15321532
return;
15331533
mlir::ArrayAttr annotationValueArray =
15341534
mlir::ArrayAttr::get(theModule.getContext(), globalAnnotations);
1535-
theModule->setAttr(cir::CIRDialect::getGlobalAnnotationsAttrName(),
1536-
cir::GlobalAnnotationValuesAttr::get(
1537-
theModule.getContext(), annotationValueArray));
1535+
theModule->setAttr(
1536+
cir::CIRDialect::getGlobalAnnotationsAttrName(),
1537+
cir::GlobalAnnotationValuesAttr::get(annotationValueArray));
15381538
}
15391539

15401540
void LoweringPreparePass::runOnOp(Operation *op) {

0 commit comments

Comments
 (0)