diff options
| author | jackkoenig | 2016-08-02 09:05:01 -0700 |
|---|---|---|
| committer | jackkoenig | 2016-08-02 09:05:01 -0700 |
| commit | 203616271a864ded538904721f19a975b2959569 (patch) | |
| tree | 773275bd203de7b2acc30845b6585f48c4a22c0c /src | |
| parent | dc493d5a1479a57125dd05f4601da94be7fa8be7 (diff) | |
Fix use of global state in instance loop checking
Also increase sensitivity of thread safety checking
Fixes #159
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/scala/firrtl/passes/Checks.scala | 2 | ||||
| -rw-r--r-- | src/test/scala/firrtlTests/MultiThreadingSpec.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/firrtl/passes/Checks.scala b/src/main/scala/firrtl/passes/Checks.scala index 9bbf7fa8..ab6db202 100644 --- a/src/main/scala/firrtl/passes/Checks.scala +++ b/src/main/scala/firrtl/passes/Checks.scala @@ -256,7 +256,7 @@ object CheckHighForm extends Pass with LazyLogging { if (!c.modules.map(_.name).contains(s.module)) errors.append(new ModuleNotDefinedException(s.module)) // Check to see if a recursive module instantiation has occured - val childToParent = moduleGraph.add(mname, s.module) + val childToParent = moduleGraph.add(m.name, s.module) if(childToParent.nonEmpty) { errors.append(new InstanceLoop(childToParent.mkString("->"))) } diff --git a/src/test/scala/firrtlTests/MultiThreadingSpec.scala b/src/test/scala/firrtlTests/MultiThreadingSpec.scala index c5ec95d1..bfaed330 100644 --- a/src/test/scala/firrtlTests/MultiThreadingSpec.scala +++ b/src/test/scala/firrtlTests/MultiThreadingSpec.scala @@ -22,7 +22,7 @@ class MultiThreadingSpec extends FirrtlPropSpec { new firrtl.LowFirrtlCompiler, new firrtl.VerilogCompiler) val inputFilePath = s"/integration/GCDTester.fir" // arbitrary - val numThreads = 8 // arbitrary + val numThreads = 64 // arbitrary // Begin the actual test val inputStream = getClass().getResourceAsStream(inputFilePath) |