Added bunch of stuff with help of AI, probably needs cleanup for many things

Author: wulffern

src/cicpy/cic.py

@@ -274,18 +274,10 @@ def spi2mag(ctx,spi,lib,cell,libdir,techlib,xspace,yspace,gbreak):
     """Translate a SPICE file to Magic"""
     _spi2mag(spi,lib,cell,libdir,techlib,xspace,yspace,gbreak)
 
-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"
     log.info(f"Loading rules {techfile}")
     rules = cic.Rules(techfile)
@@ -316,37 +308,14 @@ def _spi2mag(spi,lib,cell,libdir,techlib,xspace,yspace,gbreak):
     lcell.dirname = libdir + lib + os.path.sep
 
     pycell = None
+    pycellData = None
     if(os.path.exists(lcell.dirname + lcell.name + ".py")):
         sys.path.append(lcell.dirname)
         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")
+        if(hasattr(pycell,"data")):
+            pycellData = pycell.data
 
-    log.info(f"addAllPorts()")
-    lcell.addAllPorts()
+    lcell.layout(pycell,pycellData)
 
     obj = cic.MagicPrinter(libdir + lib,rules)
     obj.print(design)

src/cicpy/core/__init__.py

@@ -12,3 +12,8 @@
 from .layoutplacer import *
 from .instanceport import *
 from .layer import *
+from .route import *
+from .cut import *
+from .guard import *
+from .routering import *
+from .graph import *

src/cicpy/core/cell.py

@@ -59,6 +59,7 @@ def __init__ (self,name=""):
         self.has_pr = False
         self.meta = list()
         self.obj = False #- Original JSON obj
+        self.named_rects = dict()
 
 
     def getPort(self,name:str):
@@ -70,8 +71,12 @@ def getPort(self,name:str):
 
     # Find the first rectangle in this cell that uses layer
     def getRect(self,layer):
-        raise Exception("Not implemented")
-        pass
+        for child in self.children:
+            if(child is None):
+                continue
+            if(child.layer == layer):
+                return child
+        return None
 
     # Add a rectangle to the cell, hooks updated() of the child to updateBoundingRect
     def add(self, child):
@@ -90,6 +95,8 @@ def add(self, child):
             self.children.append(child)
             child.connect(self.updateBoundingRect)
 
+        self.updateBoundingRect()
+
 
     # Move this cell, and all children by dx and dy
     def translate(self, dx, dy):
@@ -104,7 +111,7 @@ def mirrorX(self,ax):
         super().mirrorX(ax)
         for child in self.children:
             child.mirrorX(ax)
-        for port in self.ports:
+        for _, port in self.ports.items():
             port.mirrorX(ax)
         self.updateBoundingRect()
         self.emit_updated()
@@ -115,8 +122,8 @@ def mirrorY(self,ay):
         super().mirrorY(ay)
         for child in self.children:
             child.mirrorY(ay)
-        for port in self.ports:
-            port.mirrorY()
+        for _, port in self.ports.items():
+            port.mirrorY(ay)
         self.updateBoundingRect()
         self.emit_updated
 
@@ -135,28 +142,29 @@ def moveTo(self,ax, ay):
     # Center this cell, and all children on ax and ay
     def moveCenter(self,ax, ay):
         self.updateBoundingRect()
-
-        xc1 = self.centerX
-        yc1 = self.centerY
-
-        xpos = self.left - (xc1 - ax)
-        ypos = self.bottom - (yc1 - ay)
-
-        self.moveTo(xpos,ypos)
+        xc1 = self.centerX()
+        yc1 = self.centerY()
+        dx = ax - xc1
+        dy = ay - yc1
+        self.translate(dx, dy)
 
     # Shortcut for adding ports
     def addPort(name, rect):
-        raise Exception("Not implemented")
-        pass
+        if(rect is None):
+            return None
+        p = Port(name)
+        p.setRect(rect)
+        self.add(p)
+        return p
 
     # Mirror this cell, and all children around horizontal center point (basically flip horizontal)
     def mirrorCenterX(self):
-        self.mirrorX(self.centerY)
+        self.mirrorX(self.centerY())
         pass
 
 
     def mirrorCenterY(self):
-        self.mirrorY(self.centerX)
+        self.mirrorY(self.centerX())
         pass
 
     def updateBoundingRect(self):
@@ -404,9 +412,34 @@ def updatePort(self,name:str,r:Rect):
 
 
     #     //! Find all rectangles by regular expression
-    #     virtual QList<Rect *> findRectanglesByRegex(QString regex,QString layer);
-    #     virtual void findRectangles(QList<Rect*> &rects,QString name,QString layer);
-    #     virtual QList<Rect *> findAllRectangles(QString regex, QString layer);
+    def findRectanglesByRegex(self, regex:str, layer:str):
+        rects = list()
+        self.findRectangles(rects, regex, layer)
+        return rects
+
+    def findRectangles(self, rects:list, name:str, layer:str):
+        for child in self.children:
+            if child is None:
+                continue
+            if layer and child.layer != layer:
+                continue
+            if re.search(name, getattr(child,'name', '')):
+                rects.append(child)
+            # Also include plain rects on layer when name matches empty or wildcard
+            elif name == "" and (hasattr(child,'isRect') and child.isRect()):
+                rects.append(child)
+
+    def findAllRectangles(self, regex:str, layer:str):
+        rects = list()
+        for child in self.children:
+            if child is None:
+                continue
+            if layer and child.layer != layer:
+                continue
+            cname = getattr(child,'name','')
+            if re.search(regex, cname) or (hasattr(child,'isRect') and child.isRect() and re.search(regex, layer)):
+                rects.append(child)
+        return rects
 
     #     QJsonObject toJson();
     #     void fromJson(QJsonObject o);

src/cicpy/core/cut.py

@@ -0,0 +1,52 @@
+from .cell import Cell
+from .rect import Rect
+from .rules import Rules
+
+class Cut(Cell):
+
+    def __init__(self, startlayer:str, stoplayer:str, hcuts:int, vcuts:int):
+        super().__init__(f"Cut_{startlayer}_{stoplayer}")
+        self.startlayer = startlayer
+        self.stoplayer = stoplayer
+        self.hcuts = hcuts
+        self.vcuts = vcuts
+        self._build_placeholder_geometry()
+
+    def _build_placeholder_geometry(self):
+        try:
+            rw = Rules.getInstance().get(self.stoplayer, "width")
+        except Exception:
+            rw = 0
+        r = Rect(self.stoplayer, 0, 0, rw, rw)
+        self.add(r)
+
+    @staticmethod
+    def getInstance(startlayer:str, stoplayer:str, hcuts:int, vcuts:int):
+        return Cut(startlayer, stoplayer, hcuts, vcuts)
+
+    @staticmethod
+    def getCutsForRects(routeLayer:str, rects:list, cuts:int, vcuts:int, leftAlignCut:bool=True):
+        rules = Rules.getInstance()
+        cuts_out = []
+        try:
+            cw = rules.get(routeLayer, "width")
+            cs = rules.get(routeLayer, "space")
+        except Exception:
+            cw = 0
+            cs = 0
+        for r in rects:
+            if r is None:
+                continue
+            total_width = cuts*cw + (cuts-1)*cs if cuts > 0 else 0
+            if leftAlignCut:
+                x0 = r.x1
+            else:
+                x0 = r.x2 - total_width
+            y0 = r.centerY() - (vcuts*cw + (vcuts-1)*cs)//2
+            for iv in range(max(1, vcuts)):
+                for ih in range(max(1, cuts)):
+                    x = x0 + ih*(cw+cs)
+                    y = y0 + iv*(cw+cs)
+                    cuts_out.append(Rect(routeLayer, x, y, cw, cw))
+        return cuts_out
+

src/cicpy/core/design.py

@@ -47,6 +47,8 @@ def __init__(self):
         self.prefix = ""
 
 
+        
+
     def fromJsonFile(self,fname):
         jobj = None
 
@@ -97,6 +99,7 @@ def cellNames(self):
     def getCell(self,name):
         return self.cells[name]
 
+
     def read(self,filename):
         import cicspi as spi
         #Read JSON

src/cicpy/core/graph.py

@@ -6,26 +6,31 @@ def __init__(self):
         self.ports = list()
         self.name = ""
 
-    def append(p:Port):
-        if(not self.ports.contains(p)):
+    def append(self,p):
+        if p not in self.ports:
             self.ports.append(p)
 
-    def getRectangles(excludeInstances:str,includeInstances:str,layer:str):
+    def getRectangles(self,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
+            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(excludeInstances):
+                if( re.search(excludeInstances,getattr(i,'instanceName','')) \
+                    or re.search(excludeInstances,getattr(i,'name',''))):
+                    continue
 
-            if(includeInstances is not None):
-                if(not ( re.search(includeInstances,i.instanceName) \
-                    or re.search(includeInstances,i.name))): continue
+            if(includeInstances):
+                if(not ( re.search(includeInstances,getattr(i,'instanceName','')) \
+                    or re.search(includeInstances,getattr(i,'name','')))):
+                    continue
             rp = p.get(layer)
 
             if(rp is  None): rp = p.get()
             if(rp is not None):
                 rects.append(rp)
+        return rects

src/cicpy/core/guard.py

@@ -0,0 +1,26 @@
+from .cell import Cell
+from .rect import Rect
+from .rules import Rules
+
+class Guard(Cell):
+
+    def __init__(self, rect:Rect, layers:list):
+        super().__init__("Guard")
+        self.layers = list(layers or [])
+        if rect:
+            base = rect.getCopy()
+            encx = Rules.getInstance().get("ROUTE","verticalgrid") if Rules.getInstance() else 0
+            ency = encx
+            base.adjust(encx)
+            self.add(base)
+            # For each requested layer, copy a rect
+            for layer in self.layers:
+                gr = base.getCopy(layer)
+                self.add(gr)
+
+    def getRect(self, layer:str):
+        for c in self.children:
+            if c.layer == layer:
+                return c
+        return None
+

src/cicpy/core/instance.py

@@ -79,6 +79,9 @@ def setSubcktInstance(self,inst:spi.SubcktInstance):
             cellPort = self.layoutcell.getPort(cktNode)
             if(cellPort):
                 instPort = InstancePort(instNode,cellPort,self)
+                # Track in instance port collections
+                self.instancePorts[instNode] = instPort
+                self.instancePortsList.append(instNode)
                 self.add(instPort)
             else:
                 log.warning(f"Could not find {cktNode} on {ckt.name}")
@@ -115,14 +118,15 @@ def isLayoutCell(self):
     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)
+            if(pi is None):
+                continue
+            if(not pi.isInstancePort()):
+                continue
+            if(re.search(node, pi.name) and ((filterChild is None) or not re.search(filterChild, getattr(pi, 'childName', '')))):
+                r = pi.get()
+                if(r is not None):
+                    r.parent = self
+                    rects.append(r)
         return rects
 
 

src/cicpy/core/instanceport.py

@@ -10,6 +10,7 @@ def __init__(self,name,port:Port,parent:Cell):
         super().__init__(name)
         self.childport = port
         self.parent = parent
+        self.childName = port.name
         r = port.get()
         rules = Rules.getInstance()
         if(r):