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.

Sign up for GitHub

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

Make BaseModule.name lazy #912

Merged
merged 2 commits into from
Oct 28, 2018
Merged

Make BaseModule.name lazy #912

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2416d1d
Make BaseModule.name lazy
seldridge Oct 25, 2018
f64388e
Check BaseModule.name for NullPointerException
seldridge Oct 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chiselFrontend/src/main/scala/chisel3/core/Module.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ abstract class BaseModule extends HasId {
def desiredName = this.getClass.getName.split('.').last

/** Legalized name of this module. */
final val name = Builder.globalNamespace.name(desiredName)
final lazy val name = Builder.globalNamespace.name(desiredName)

/** Returns a FIRRTL ModuleName that references this object
* @note Should not be called until circuit elaboration is complete
Expand Down
9 changes: 9 additions & 0 deletions src/test/scala/chiselTests/Module.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@ class ModuleRewrap extends Module {
val inst2 = Module(inst)
}

class ModuleWrapper(gen: => Module) extends Module {
val io = IO(new Bundle{})
val child = Module(gen)
override lazy val desiredName = s"${child.desiredName}Wrapper"
}

class ModuleSpec extends ChiselPropSpec {

property("ModuleVec should elaborate") {
Expand Down Expand Up @@ -138,4 +144,7 @@ class ModuleSpec extends ChiselPropSpec {
"a" -> m.a, "b" -> m.b))
})
}
property("A desiredName parameterized by a submodule should work") {
Driver.elaborate(() => new ModuleWrapper(new ModuleWire)).name should be ("ModuleWireWrapper")
}
}