diff --git a/cumulus/src/plugins/alpha/block/block.py b/cumulus/src/plugins/alpha/block/block.py index cc7637d2..afd877f3 100644 --- a/cumulus/src/plugins/alpha/block/block.py +++ b/cumulus/src/plugins/alpha/block/block.py @@ -580,7 +580,6 @@ class Block ( object ): self.etesian.getCell().flattenNets( None, Cell.Flags_NoClockFlatten ) if self.conf.useHFNS: self.etesian.doHFNS() self.etesian.place() - self.etesian.flattenPower() Breakpoint.stop( 100, 'Placement done.' ) self.etesian.clearColoquinte() @@ -744,8 +743,10 @@ class Block ( object ): #if self.conf.useHFNS: self.findHfnTrees() break if self.conf.useClockTree: self.splitClocks() - if self.conf.isCoreBlock: self.doConnectCore() self.spares.removeUnusedBuffers() + self.etesian.toHurricane() + self.etesian.flattenPower() + if self.conf.isCoreBlock: self.doConnectCore() status = self.route() if not self.conf.isCoreBlock: self.addBlockages() diff --git a/cumulus/src/plugins/alpha/block/spares.py b/cumulus/src/plugins/alpha/block/spares.py index e3a98a29..d1f4e9d7 100644 --- a/cumulus/src/plugins/alpha/block/spares.py +++ b/cumulus/src/plugins/alpha/block/spares.py @@ -774,7 +774,9 @@ class QuadTree ( object ): netBuff = self.bOutputPlug.getNet() trace( 540, '\tBuffer: {}\n'.format(self.buffer) ) trace( 540, '\tBuffer output: {}\n'.format(netBuff) ) - if not self.plugs: return + if not self.plugs: + trace( 540, '-' ) + return for plug in self.plugs: trace( 540, '\t| Leaf: {}\n'.format(plug) ) trace( 540, '\t| netBuff: {}\n'.format(netBuff) ) diff --git a/cumulus/src/plugins/clocktree.py b/cumulus/src/plugins/clocktree.py index f5c8c9dd..3e575509 100644 --- a/cumulus/src/plugins/clocktree.py +++ b/cumulus/src/plugins/clocktree.py @@ -87,10 +87,11 @@ def scriptMain ( **kw ): if editor: editor.refresh() etesian = Etesian.EtesianEngine.create( cell ) etesian.place() - etesian.destroy() ht.connectLeaf() #ht.prune() ht.route() + etesian.toHurricane() + etesian.destroy() ht.save( cell ) except Exception, e: helpers.io.catch( e )