diff options
| author | Jack Koenig | 2020-08-21 11:27:50 -0700 |
|---|---|---|
| committer | GitHub | 2020-08-21 18:27:50 +0000 |
| commit | 73868fc6e8110282ce545c296540d3ebbafadfeb (patch) | |
| tree | f06427c430dde383b0d6362874aa44ed188052aa /src/main/scala/firrtl/passes/memlib | |
| parent | f1c314e6c7e116df33ffc215ec907212037292dc (diff) | |
Fix Uniquify bug and improve ReplaceSeqMems transforms (#1855)
* Fix bug in Uniquify clobbering DefInstance types
* Change ReplaceMemTransform to not run Uniquify nor fixups
Use invalidation as mechanism for rerunning resolution passes
Diffstat (limited to 'src/main/scala/firrtl/passes/memlib')
| -rw-r--r-- | src/main/scala/firrtl/passes/memlib/ReplaceMemTransform.scala | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/main/scala/firrtl/passes/memlib/ReplaceMemTransform.scala b/src/main/scala/firrtl/passes/memlib/ReplaceMemTransform.scala index 79e07640..c88d6ba7 100644 --- a/src/main/scala/firrtl/passes/memlib/ReplaceMemTransform.scala +++ b/src/main/scala/firrtl/passes/memlib/ReplaceMemTransform.scala @@ -116,7 +116,10 @@ class ReplSeqMem extends Transform with HasShellOptions with DependencyAPIMigrat override def prerequisites = Forms.MidForm override def optionalPrerequisites = Seq.empty override def optionalPrerequisiteOf = Forms.MidEmitters - override def invalidates(a: Transform) = false + override def invalidates(a: Transform) = a match { + case InferTypes | ResolveKinds | ResolveFlows | LowerTypes => true + case _ => false + } val options = Seq( new ShellOption[String]( @@ -138,13 +141,7 @@ class ReplSeqMem extends Transform with HasShellOptions with DependencyAPIMigrat new ResolveMemoryReference, new CreateMemoryAnnotations(inConfigFile), new ReplaceMemMacros(outConfigFile), - new WiringTransform, - new SimpleMidTransform(RemoveEmpty), - new SimpleMidTransform(CheckInitialization), - new SimpleMidTransform(InferTypes), - Uniquify, - new SimpleMidTransform(ResolveKinds), - new SimpleMidTransform(ResolveFlows) + new WiringTransform ) def execute(state: CircuitState): CircuitState = { |