Merge pull request #12 from broccolimicro/develop

Develop
broccolimicro · Nov 6, 2024 · fbe779e · fbe779e
2 parents 0705751 + 7d7c888
commit fbe779e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.9.1
+0.10.0
diff --git a/bin/ckt b/bin/ckt
diff --git a/lib/interpret_sch b/lib/interpret_sch
diff --git a/lib/phy b/lib/phy
diff --git a/lib/prs b/lib/prs
diff --git a/lib/sch b/lib/sch
diff --git a/tech/sky130.py b/tech/sky130.py
@@ -343,10 +343,10 @@
 ns = subst(nsdm, no, no)
 ps = subst(psdm, no, no)
 hvp = subst(hvtp, no, no)
-hvn = subst(hvntm, no, no)
-lvn = subst(lvtn, no, no)
-nvn = subst(nvtn, no, no)
-hvx = subst(hvi, no, no)
+hvn = subst(hvntm, no, no) # TODO(edward.bingham) DRC rules
+lvn = subst(lvtn, no, no)  # TODO(edward.bingham) DRC rules
+nvn = subst(nvtn, no, no)  # TODO(edward.bingham) DRC rules
+hvx = subst(hvi, no, no)   # TODO(edward.bingham) DRC rules
 nw = well(nwell, nwell_label, nwell_pin)
 pw = well(no, pwell_label, pwell_pin)
 
@@ -358,14 +358,14 @@
 m4 = route(met4, met4_label, met4_pin)
 m5 = route(met5, met5_label, met5_pin)
 
-nfet = nmos("svt", "sky130_fd_pr__nfet_01v8", [df, ns, pw], [hvp, lvn, hvx])
-nfet_lvt = nmos("lvt", "sky130_fd_pr__nfet_01v8_lvt", [df, ns, lvn, pw], [nvn])
+nfet = nmos("svt", "sky130_fd_pr__nfet_01v8", [df, ns, pw], exclude=[hvp, lvn, hvx], bins=[(0,500)])
+nfet_lvt = nmos("lvt", "sky130_fd_pr__nfet_01v8_lvt", [df, ns, lvn, pw], exclude=[nvn], bins=[(0,500)])
 nfet_pin = nmos("npin", "sky130_fd_pr__nfet_g5v0d10v5", [df, ns, hvn, pw, hvx])
 nfet_nvt = nmos("nvt", "sky130_fd_pr__nfet_05v0_nvt", [df, ns, nvn, lvn, pw])
 
-pfet = pmos("svt", "sky130_fd_pr__pfet_01v8", [df, ps, nw], [hvp, lvn, hvx])
-pfet_hvt = pmos("hvt", "sky130_fd_pr__pfet_01v8_hvt", [df, ps, hvp, nw])
-pfet_lvt = pmos("lvt", "sky130_fd_pr__pfet_01v8_lvt", [df, ps, lvn, nw])
+pfet = pmos("svt", "sky130_fd_pr__pfet_01v8", [df, ps, nw], exclude=[hvp, lvn, hvx], bins=[(0,500)])
+pfet_hvt = pmos("hvt", "sky130_fd_pr__pfet_01v8_hvt", [df, ps, hvp, nw], bins=[(0,500)])
+pfet_lvt = pmos("lvt", "sky130_fd_pr__pfet_01v8_lvt", [df, ps, lvn, nw], bins=[(0,500)])
 pfet_pin = nmos("ppin", "sky130_fd_pr__pfet_g5v0d10v5", [df, ps, nw, hvx])
 
 via(nfet, m0, licon1)
+6 −6		interpret_sch/export.cpp
+8 −8		interpret_sch/import.cpp
+53 −0		sch/Constraint.cpp
+33 −0		sch/Constraint.h
+25 −22		sch/Draw.cpp
+11 −15		sch/Isomorph.h
+2 −2		sch/Mapping.cpp
+2 −1		sch/Netlist.cpp
+167 −81		sch/Placer.cpp
+16 −9		sch/Placer.h
+1,157 −614		sch/Router.cpp
+33 −41		sch/Router.h
+479 −185		sch/Subckt.cpp
+47 −11		sch/Subckt.h
+7 −7		sch/Tapeout.cpp
+17 −0		sch/bitset.cpp
+2 −0		sch/bitset.h
+12 −7		tests/iso.cpp
+6 −6		tests/placer.cpp