terapines
/
circt
mirror of https://github.com/llvm/circt.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[FIRRTL] Make `sym_name` an inherent attr for symbol ops 

Making this an inherent attribute means that it will be stored in the
properties of the operation. Some module-like classes already had
declared it as an input, but our older modules kinds did not.
This commit is contained in:
Andrew Young 2024-10-30 12:34:40 -07:00
parent a7bd275fb9
commit cb90e658ab
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/circt/Dialect/FIRRTL/FIRRTLStructure.td
View File

@ -134,7 +134,8 @@ def FModuleOp : FIRRTLModuleLike<"module", [SingleBlock, NoTerminator]> {
the module. the module.
}]; }];
let arguments = let arguments =
(ins ConventionAttr:$convention, (ins SymbolNameAttr:$sym_name,
ConventionAttr:$convention,
DenseBoolArrayAttr:$portDirections, DenseBoolArrayAttr:$portDirections,
ArrayRefAttr:$portLocations, ArrayRefAttr:$portLocations,
ArrayRefAttr:$portAnnotations, ArrayRefAttr:$portAnnotations,
@ -196,7 +197,8 @@ def FExtModuleOp : FIRRTLModuleLike<"extmodule"> {
port must be removed by LowerXMR pass. port must be removed by LowerXMR pass.
}]; }];
let arguments = let arguments =
(ins OptionalAttr<StrAttr>:$defname, (ins SymbolNameAttr:$sym_name,
OptionalAttr<StrAttr>:$defname,
ParamDeclArrayAttr:$parameters, ParamDeclArrayAttr:$parameters,
ConventionAttr:$convention, ConventionAttr:$convention,
DenseBoolArrayAttr:$portDirections, DenseBoolArrayAttr:$portDirections,
@ -239,7 +241,8 @@ def FIntModuleOp : FIRRTLModuleLike<"intmodule"> {
The "firrtl.intmodule" operation represents a compiler intrinsic. The "firrtl.intmodule" operation represents a compiler intrinsic.
}]; }];
let arguments = let arguments =
(ins StrAttr:$intrinsic, (ins SymbolNameAttr:$sym_name,
StrAttr:$intrinsic,
ParamDeclArrayAttr:$parameters, ParamDeclArrayAttr:$parameters,
DenseBoolArrayAttr:$portDirections, DenseBoolArrayAttr:$portDirections,
ArrayRefAttr:$portLocations, ArrayRefAttr:$portLocations,
@ -285,7 +288,8 @@ def FMemModuleOp : FIRRTLModuleLike<"memmodule"> {
are not directly lowered to registers by the compiler. are not directly lowered to registers by the compiler.
}]; }];
let arguments = let arguments =
(ins UI32Attr:$numReadPorts, UI32Attr:$numWritePorts, (ins SymbolNameAttr:$sym_name,
UI32Attr:$numReadPorts, UI32Attr:$numWritePorts,
UI32Attr:$numReadWritePorts, UI32Attr:$dataWidth, UI32Attr:$maskBits, UI32Attr:$numReadWritePorts, UI32Attr:$dataWidth, UI32Attr:$maskBits,
UI32Attr:$readLatency, UI32Attr:$writeLatency, UI64Attr:$depth, UI32Attr:$readLatency, UI32Attr:$writeLatency, UI64Attr:$depth,
ArrayAttr:$extraPorts, ArrayAttr:$extraPorts,

8
test/Dialect/FIRRTL/annotations-generic.mlir
View File

@ -15,12 +15,12 @@ firrtl.circuit "Foo" attributes {rawAnnotations = [
// CHECK-LABEL: "firrtl.extmodule"() < // CHECK-LABEL: "firrtl.extmodule"() <
// CHECK-SAME: portAnnotations = {{['[']['[']}}{class = "circt.test", data = "a"}]] // CHECK-SAME: portAnnotations = {{['[']['[']}}{class = "circt.test", data = "a"}]]
// CHECK-SAME: > ({
// CHECK: }) {
// CHECK-SAME: sym_name = "Bar" // CHECK-SAME: sym_name = "Bar"
// CHECK-SAME: > ({
// CHECK: })
// CHECK-LABEL: "firrtl.module"() < // CHECK-LABEL: "firrtl.module"() <
// CHECK-SAME: portAnnotations = {{['[']['[']}}{class = "circt.test", data = "b"}]] // CHECK-SAME: portAnnotations = {{['[']['[']}}{class = "circt.test", data = "b"}]]
// CHECK-SAME: > ({
// CHECK: }) {
// CHECK-SAME: sym_name = "Foo" // CHECK-SAME: sym_name = "Foo"
// CHECK-SAME: > ({
// CHECK: })