Skip to content

Commit 6754869

Browse files
committed
[FIRRTL] Drop auxiliary MemOp builders
Remove auxiliary MemOp builders. These had exactly one user, `LowerTypes`, and this user switched to the tablegen-generated builders in a previous commit. Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
1 parent 8a3dd14 commit 6754869

File tree

2 files changed

+0
-62
lines changed

2 files changed

+0
-62
lines changed

include/circt/Dialect/FIRRTL/FIRRTLDeclarations.td

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -258,24 +258,6 @@ def MemOp : HardwareDeclOp<"mem", [DeclareOpInterfaceMethods<CombDataflow>]> {
258258
$ruw `` custom<MemOp>(attr-dict) `:` qualified(type($results))
259259
}];
260260

261-
let builders = [
262-
OpBuilder<(ins "::mlir::TypeRange":$resultTypes,
263-
"uint32_t":$readLatency, "uint32_t":$writeLatency,
264-
"uint64_t":$depth, "RUWAttr":$ruw,
265-
"ArrayRef<Attribute>":$portNames,
266-
CArg<"StringRef", "{}">:$name,
267-
CArg<"NameKindEnum", "NameKindEnum::DroppableName">:$nameKind,
268-
CArg<"ArrayRef<Attribute>", "{}">:$annotations,
269-
CArg<"ArrayRef<Attribute>", "{}">:$portAnnotations,
270-
CArg<"StringAttr", "StringAttr()">:$innerSym)>,
271-
OpBuilder<(ins "::mlir::TypeRange":$resultTypes, "uint32_t":$readLatency,
272-
"uint32_t":$writeLatency, "uint64_t":$depth, "RUWAttr":$ruw,
273-
"ArrayRef<Attribute>":$portNames, "StringRef":$name,
274-
"NameKindEnum":$nameKind, "ArrayRef<Attribute>":$annotations,
275-
"ArrayRef<Attribute>":$portAnnotations,
276-
"hw::InnerSymAttr":$innerSym)>
277-
];
278-
279261
let hasVerifier = 1;
280262

281263
let hasCanonicalizer = true;

lib/Dialect/FIRRTL/FIRRTLOps.cpp

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2854,50 +2854,6 @@ InstanceChoiceOp::erasePorts(OpBuilder &builder,
28542854
// MemOp
28552855
//===----------------------------------------------------------------------===//
28562856

2857-
void MemOp::build(OpBuilder &builder, OperationState &result,
2858-
TypeRange resultTypes, uint32_t readLatency,
2859-
uint32_t writeLatency, uint64_t depth, RUWAttr ruw,
2860-
ArrayRef<Attribute> portNames, StringRef name,
2861-
NameKindEnum nameKind, ArrayRef<Attribute> annotations,
2862-
ArrayRef<Attribute> portAnnotations,
2863-
hw::InnerSymAttr innerSym) {
2864-
auto &properties = result.getOrAddProperties<Properties>();
2865-
properties.setReadLatency(
2866-
builder.getIntegerAttr(builder.getIntegerType(32), readLatency));
2867-
properties.setWriteLatency(
2868-
builder.getIntegerAttr(builder.getIntegerType(32), writeLatency));
2869-
properties.setDepth(
2870-
builder.getIntegerAttr(builder.getIntegerType(64), depth));
2871-
properties.setRuw(::RUWAttrAttr::get(builder.getContext(), ruw));
2872-
properties.setPortNames(builder.getArrayAttr(portNames));
2873-
properties.setName(builder.getStringAttr(name));
2874-
properties.setNameKind(NameKindEnumAttr::get(builder.getContext(), nameKind));
2875-
properties.setAnnotations(builder.getArrayAttr(annotations));
2876-
if (innerSym)
2877-
properties.setInnerSym(innerSym);
2878-
result.addTypes(resultTypes);
2879-
2880-
if (portAnnotations.empty()) {
2881-
SmallVector<Attribute, 16> portAnnotationsVec(resultTypes.size(),
2882-
builder.getArrayAttr({}));
2883-
properties.setPortAnnotations(builder.getArrayAttr(portAnnotationsVec));
2884-
} else {
2885-
assert(portAnnotations.size() == resultTypes.size());
2886-
properties.setPortAnnotations(builder.getArrayAttr(portAnnotations));
2887-
}
2888-
}
2889-
2890-
void MemOp::build(OpBuilder &builder, OperationState &result,
2891-
TypeRange resultTypes, uint32_t readLatency,
2892-
uint32_t writeLatency, uint64_t depth, RUWAttr ruw,
2893-
ArrayRef<Attribute> portNames, StringRef name,
2894-
NameKindEnum nameKind, ArrayRef<Attribute> annotations,
2895-
ArrayRef<Attribute> portAnnotations, StringAttr innerSym) {
2896-
build(builder, result, resultTypes, readLatency, writeLatency, depth, ruw,
2897-
portNames, name, nameKind, annotations, portAnnotations,
2898-
innerSym ? hw::InnerSymAttr::get(innerSym) : hw::InnerSymAttr());
2899-
}
2900-
29012857
ArrayAttr MemOp::getPortAnnotation(unsigned portIdx) {
29022858
assert(portIdx < getNumResults() &&
29032859
"index should be smaller than result number");

0 commit comments

Comments
 (0)