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

[FSM] Remove Symbol trait from InstanceOp and HWInstanceOp. (#6675) 

These are used in contexts that are not SymbolTables, so these cannot
be Symbols. It appears that nothing actually needs the Symbol
functionality, and all we need here is the string name. This removes
the Symbol trait and renames the attribute to just `name`.

Fixes https://github.com/llvm/circt/issues/6668.

Co-authored-by: John Demme <john.demme@microsoft.com>
This commit is contained in:
Mike Urbach 2024-02-08 14:45:43 -07:00 committed by GitHub
parent 641ae64eb1
commit b4fc828597
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontends/PyCDE/src/fsm.py
View File

@ -203,7 +203,7 @@ class MachineModuleBuilder(ModuleLikeBuilderBase):
op = raw_fsm.HWInstanceOp(outputs=circt_mod.type.results,
inputs=inputs,
sym_name=StringAttr.get(instance_name),
name=StringAttr.get(instance_name),
machine=FlatSymbolRefAttr.get(
StringAttr(
circt_mod.attributes["sym_name"]).value),

11
include/circt/Dialect/FSM/FSMOps.td
View File

@ -96,17 +96,17 @@ def MachineOp : FSMOp<"machine", [
let hasVerifier = 1;
}
def InstanceOp : FSMOp<"instance", [Symbol, HasCustomSSAName]> {
def InstanceOp : FSMOp<"instance", [HasCustomSSAName]> {
let summary = "Create an instance of a state machine";
let description = [{
`fsm.instance` represents an instance of a state machine, including an
instance name and a symbol reference of the machine.
}];
let arguments = (ins StrAttr:$sym_name, FlatSymbolRefAttr:$machine);
let arguments = (ins StrAttr:$name, FlatSymbolRefAttr:$machine);
let results = (outs InstanceType:$instance);
let assemblyFormat = [{ $sym_name $machine attr-dict }];
let assemblyFormat = [{ $name $machine attr-dict }];
let extraClassDeclaration = [{
/// Lookup the machine for the symbol. This returns null on invalid IR.
@ -145,7 +145,6 @@ def TriggerOp : FSMOp<"trigger", []> {
}
def HWInstanceOp : FSMOp<"hw_instance", [
Symbol,
DeclareOpInterfaceMethods<InstanceGraphInstanceOpInterface>
]> {
let summary = "Create a hardware-style instance of a state machine";
@ -156,12 +155,12 @@ def HWInstanceOp : FSMOp<"hw_instance", [
machine.
}];
let arguments = (ins StrAttr:$sym_name, FlatSymbolRefAttr:$machine,
let arguments = (ins StrAttr:$name, FlatSymbolRefAttr:$machine,
Variadic<AnyType>:$inputs, ClockType:$clock, I1:$reset);
let results = (outs Variadic<AnyType>:$outputs);
let assemblyFormat = [{
$sym_name $machine attr-dict `(` $inputs `)`
$name $machine attr-dict `(` $inputs `)`
`,` `clock` $clock `,` `reset` $reset `:` functional-type($inputs, $outputs)
}];

8
lib/Dialect/FSM/FSMOps.cpp
View File

@ -234,7 +234,7 @@ LogicalResult InstanceOp::verify() {
void InstanceOp::getAsmResultNames(
function_ref<void(Value, StringRef)> setNameFn) {
setNameFn(getInstance(), getSymName());
setNameFn(getInstance(), getName());
}
//===----------------------------------------------------------------------===//
@ -301,11 +301,9 @@ SmallVector<hw::PortInfo> HWInstanceOp::getPortList() {
StringRef HWInstanceOp::getModuleName() { return getMachine(); }
FlatSymbolRefAttr HWInstanceOp::getModuleNameAttr() { return getMachineAttr(); }
mlir::StringAttr HWInstanceOp::getInstanceNameAttr() {
return getSymNameAttr();
}
mlir::StringAttr HWInstanceOp::getInstanceNameAttr() { return getNameAttr(); }
llvm::StringRef HWInstanceOp::getInstanceName() { return getSymName(); }
llvm::StringRef HWInstanceOp::getInstanceName() { return getName(); }
//===----------------------------------------------------------------------===//
// StateOp