Starting to get layout to work

Author: wulffern

src/cicpy/cic.py

@@ -32,12 +32,39 @@
 import json
 import cicspi
 import yaml
+import logging
+
+
+class ColorFormatter(logging.Formatter):
+    COLORS = {
+        'DEBUG': '\033[36m',     # Cyan
+        'INFO': '\033[32m',      # Green
+        'WARNING': '\033[33m',   # Yellow
+        'ERROR': '\033[31m',     # Red
+        'CRITICAL': '\033[1;31m' # Bold Red
+    }
+    RESET = '\033[0m'
+
+    def format(self, record):
+        color = self.COLORS.get(record.levelname, self.RESET)
+        message = super().format(record)
+        return f"{color}{message}{self.RESET}"
+
+log = logging.getLogger("spi2mag")
 
 @click.group()
 @click.pass_context
 def cli(ctx):
     """ Python toolbox for Custom Integrated Circuit Creator (ciccreator). """
     ctx.ensure_object(dict)
+    handler = logging.StreamHandler()
+    formatter = ColorFormatter('%(levelname)s: %(message)s')
+    handler.setFormatter(formatter)
+
+    logger = logging.getLogger()
+    logger.addHandler(handler)
+    logger.setLevel(logging.DEBUG)
+
     pass
 
 @cli.command("transpile")
@@ -251,17 +278,23 @@ def _runMethod(lcell,module,method):
     if(module is not None):
         if(hasattr(module,method)):
             fn = getattr(module,method)
+            log.info("Running " + method + " from " + lcell.name + ".py")
             fn(lcell)
 
 
 def _spi2mag(spi,lib,cell,libdir,techlib,xspace,yspace,gbreak):
 
+
+
     techfile = f"../tech/cic/{techlib}.tech"
-    print(f"INFO: Loading rules {techfile}")
+    log.info(f"Loading rules {techfile}")
     rules = cic.Rules(techfile)
 
+    log.info(f"Finding Magic cells in {libdir}")
     design = cic.MagicDesign(techlib,rules)
     design.scanLibraryPath(libdir)
+
+    log.info(f"Reading {spi}")
     lcell = design.readFromSpice(spi,cell)
 
     if("," in gbreak):
@@ -288,25 +321,41 @@ def _spi2mag(spi,lib,cell,libdir,techlib,xspace,yspace,gbreak):
         pycell = importlib.import_module(lcell.name)
         dir(pycell)
 
-
+    log.info(f"Assembling layout....")
 
     _runMethod(lcell,pycell,"beforePlace")
+
+
     #- Place cell
+    log.info(f"place()")
     lcell.place()
 
     _runMethod(lcell,pycell,"afterPlace")
 
+    _runMethod(lcell,pycell,"beforeRoute")
+
+    log.info(f"route()")
+    lcell.route()
+
+    _runMethod(lcell,pycell,"afterRoute")
 
+    _runMethod(lcell,pycell,"beforePaint")
 
+    log.info(f"paint()")
+
+    _runMethod(lcell,pycell,"afterPaint")
+
+    log.info(f"addAllPorts()")
+    lcell.addAllPorts()
 
     obj = cic.MagicPrinter(libdir + lib,rules)
     obj.print(design)
-    obj = design.toJson()
-    with open(libdir + lib + os.path.sep + lcell.name + ".cic","w") as fo:
-        fo.write(json.dumps(obj,indent=4))
+    #for m in design.maglib.values():
+        #if(m._lay is not None):
 
-    #obj = cic.MagicPrinter(libdir + lib,cell)
-    #obj.print(design)
+    with open(libdir + lib + os.path.sep + lcell.name + ".cic","w") as fo:
+        fo.write(json.dumps(design.toJson(),indent=4))
+        #fo.write(json.dumps(design.maglib["JNWTR_RPPO2"]._lay.toJson(),indent=4))
 
 
 

src/cicpy/core/cell.py

@@ -40,6 +40,8 @@ def __init__ (self,name=""):
         super().__init__()
         self.subckt = None
         self.name = name
+        self.allports = dict()
+        self.allPortNames = list()
         self.ignoreBoundaryRouting = False
         self.physicalOnly = False
         self.abstract = False
@@ -61,9 +63,10 @@ def __init__ (self,name=""):
 
     def getPort(self,name:str):
         p = None
+
         if(name in self.ports):
             p = self.ports[name]
-        return
+        return p
 
     # Find the first rectangle in this cell that uses layer
     def getRect(self,layer):
@@ -75,8 +78,10 @@ def add(self, child):
         if(child == None):
             raise Exception("Null rectangle added")
 
-        if(child.isPort()):
+        if(child.isPort() or child.isInstancePort()):
             self.ports[child.name] = child
+            self.allPortNames.append(child.name)
+
 
         if(not child in self.children):
             if(child.isRoute()):
@@ -123,7 +128,7 @@ def moveTo(self,ax, ay):
         super().moveTo(ax,ay)
         for child in self.children:
             child.translate(ax - x1, ay - y1)
-        self.updateBoundingRect
+        self.updateBoundingRect()
         self.emit_updated()
 
 
@@ -301,6 +306,29 @@ def startswith(self,ss):
             return True
         return False
 
+    def isASpicePort(self,name:str):
+        if(self.subckt is None):
+            return True
+        if(name in self.subckt.nodes):
+            return True
+        else:
+            return False
+
+    def updatePort(self,name:str,r:Rect):
+        p = None
+        if(name in self.ports):
+            p = self.ports[name]
+            p.spicePort = self.isASpicePort(name)
+            p.setRect(r)
+        else:
+            if(self.subckt):
+                if(name in self.subckt.nodes):
+                    p = Port(name)
+                    p.spicePort = self.isASpicePort(name)
+                    p.setRect(r)
+                    self.add(p)
+        return p
+
     #     Port * getPort(QString name);
     #     Port * getCellPort(QString name);
 

src/cicpy/core/design.py

@@ -35,13 +35,15 @@
 import gzip
 import json
 import re
+import logging
 
 class Design():
 
     def __init__(self):
         self.cells = dict()
         self.cellnames = list()
         self.jcells = dict()
+        self.log = logging.getLogger("DesignPrinter")
         self.prefix = ""
 
 
@@ -102,7 +104,7 @@ def read(self,filename):
         with open(filename)as fi:
 
             for line in fi:
-                if(re.search("^\s*//",line)):
+                if(re.search(r"^\s*//",line)):
                     continue
                 buffer += line
 

src/cicpy/core/graph.py

@@ -0,0 +1,31 @@
+#!/usr/bin/env python3
+import re
+class Graph():
+
+    def __init__(self):
+        self.ports = list()
+        self.name = ""
+
+    def append(p:Port):
+        if(not self.ports.contains(p)):
+            self.ports.append(p)
+
+    def getRectangles(excludeInstances:str,includeInstances:str,layer:str):
+        rects = list()
+        for p in self.ports:
+            i = p.parent()
+            if(i is None):continue
+            if(not i.isInstance()): continue
+
+            if(excludeInstances is not None):
+                if( re.search(excludeInstances,i.instanceName) \
+                    or re.search(excludeInstances,i.name)): continue
+
+            if(includeInstances is not None):
+                if(not ( re.search(includeInstances,i.instanceName) \
+                    or re.search(includeInstances,i.name))): continue
+            rp = p.get(layer)
+
+            if(rp is  None): rp = p.get()
+            if(rp is not None):
+                rects.append(rp)

src/cicpy/core/instance.py

@@ -27,8 +27,10 @@
 
 from .point import Point
 from .cell import Cell
+from .instanceport import InstancePort
 import cicspi as spi
 import logging
+import re
 
 class Instance(Cell):
 
@@ -37,6 +39,8 @@ def __init__(self):
         self.instanceName = ""
         self.cell = ""
         self.layoutcell = None
+        self.instancePorts = dict()
+        self.instancePortsList = list()
         self.libpath = ""
         self.angle = ""
         self.xcell = 0
@@ -108,7 +112,20 @@ def isLayoutCell(self):
             return c.isLayoutCell()
         return False
 
-        
+    def findRectanglesByNode(self,node:str,filterChild:str):
+        rects = list()
+        for pi in self.children:
+            if(pi is None): continue
+            if(not pi.isInstancePort()): continue
+
+            if(re.search(pi.name,node) and ((filterChild is None) or not re.search(pi.childName,filterChild))):
+               r = pi.get()
+               if(r is not None):
+                   r.parent = self
+                   rects.append(r)
+        return rects
+
+
 
     def getCellPoint(self):
         p = Point(self.x1 + self.xcell, self.y1 + self.ycell)
@@ -119,8 +136,7 @@ def calcBoundingRect(self):
         if(self.layoutcell is None):
             return self
 
-        r = self.layoutcell
-        #print(r)
+        r = self.layoutcell.getCopy()
         r.moveTo(self.x1,self.y1)
         return r
 

src/cicpy/core/instanceport.py

@@ -10,9 +10,9 @@ def __init__(self,name,port:Port,parent:Cell):
         super().__init__(name)
         self.childport = port
         self.parent = parent
-        r = p.get()
-        rules = Rules()
+        r = port.get()
+        rules = Rules.getInstance()
         if(r):
             l = rules.getLayer(r.layer)
-            self.routeLayer = l
-            self.setRect(r.layer,r.x1,r.y1,r.width,r.height)
+            self.routeLayer = l.name
+            self.setRect(r)