Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIRRTL] Use untyped propassign source accessor in LowerClasses. #6690

Merged
merged 1 commit into from
Feb 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Dialect/FIRRTL/Transforms/LowerClasses.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ updateInstanceInClass(InstanceOp firrtlInstance, hw::HierPathOp hierPath,
// Value as an actual parameter to the Object instance.
auto propertyAssignment = getPropertyAssignment(propertyResult);
assert(propertyAssignment && "properties require single assignment");
actualParameters.push_back(propertyAssignment.getSrc());
actualParameters.push_back(propertyAssignment.getSrcMutable().get());

// Erase the property assignment.
opsToErase.push_back(propertyAssignment);
Expand Down
16 changes: 16 additions & 0 deletions test/Dialect/FIRRTL/lower-classes.mlir
Original file line number Diff line number Diff line change
Expand Up @@ -338,3 +338,19 @@ firrtl.circuit "ModuleWithPropertySubmodule" {
firrtl.module private @SubmoduleWithProperty(in %prop: !firrtl.integer) {
}
}

// CHECK-LABEL: firrtl.circuit "DownwardReferences"
firrtl.circuit "DownwardReferences" {
firrtl.class @MyClass() {
}
firrtl.module @MyClassUser(in %myClassIn: !firrtl.class<@MyClass()>) {
}
firrtl.module @DownwardReferences() {
// CHECK: [[OBJ:%.+]] = om.object @MyClass
%myClass = firrtl.object @MyClass()
// CHECK: [[BP:%.+]] = om.basepath_create
// CHECK: om.object @MyClassUser_Class([[BP]], [[OBJ]])
%myClassUser.myClassIn = firrtl.instance myClassUser @MyClassUser(in myClassIn: !firrtl.class<@MyClass()>)
firrtl.propassign %myClassUser.myClassIn, %myClass : !firrtl.class<@MyClass()>
}
}