luke
/
OpenRAM
mirror of https://github.com/VLSIDA/OpenRAM.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into add_wmask

This commit is contained in:
jsowash 2019-09-04 10:48:50 -07:00
parent 496a9919b8 283183ae9f
commit d9749a62eb
2 changed files with 73 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
technology/scn4m_subm/tf/mosis.lyp
View File

@ -337,8 +337,8 @@
<marked>false</marked> <marked>false</marked>
<xfill>false</xfill> <xfill>false</xfill>
<animation>0</animation> <animation>0</animation>
<name>Via2.drawing - 50/0</name> <name>Via2.drawing - 61/0</name>
<source>50/0@1</source> <source>61/0@1</source>
</properties> </properties>
<properties> <properties>
<frame-color>#5e00e6</frame-color> <frame-color>#5e00e6</frame-color>
@ -354,8 +354,42 @@
<marked>false</marked> <marked>false</marked>
<xfill>false</xfill> <xfill>false</xfill>
<animation>0</animation> <animation>0</animation>
<name>Metal3.drawing - 50/0</name> <name>Metal3.drawing - 62/0</name>
<source>50/0@1</source> <source>62/0@1</source>
</properties>
<properties>
<frame-color>#ffe6bf</frame-color>
<fill-color>#ffe6bf</fill-color>
<frame-brightness>0</frame-brightness>
<fill-brightness>0</fill-brightness>
<dither-pattern>I1</dither-pattern>
<line-style>C0</line-style>
<valid>true</valid>
<visible>true</visible>
<transparent>false</transparent>
<width>1</width>
<marked>false</marked>
<xfill>false</xfill>
<animation>0</animation>
<name>Via3.drawing - 30/0</name>
<source>30/0@1</source>
</properties>
<properties>
<frame-color>#ffe6bf</frame-color>
<fill-color>#ffe6bf</fill-color>
<frame-brightness>0</frame-brightness>
<fill-brightness>0</fill-brightness>
<dither-pattern>C5</dither-pattern>
<line-style>C0</line-style>
<valid>true</valid>
<visible>true</visible>
<transparent>false</transparent>
<width>1</width>
<marked>false</marked>
<xfill>false</xfill>
<animation>0</animation>
<name>Metal4.drawing - 31/0</name>
<source>31/0@1</source>
</properties> </properties>
<properties> <properties>
<frame-color>#ff8000</frame-color> <frame-color>#ff8000</frame-color>
@ -578,23 +612,6 @@
<name>Metal2.pin - 0/0</name> <name>Metal2.pin - 0/0</name>
<source>0/0@1</source> <source>0/0@1</source>
</properties> </properties>
<properties>
<frame-color>#333399</frame-color>
<fill-color>#333399</fill-color>
<frame-brightness>0</frame-brightness>
<fill-brightness>0</fill-brightness>
<dither-pattern>C16</dither-pattern>
<line-style>C0</line-style>
<valid>true</valid>
<visible>true</visible>
<transparent>false</transparent>
<width>1</width>
<marked>false</marked>
<xfill>false</xfill>
<animation>0</animation>
<name>Metal3.pin - 0/0</name>
<source>0/0@1</source>
</properties>
<properties> <properties>
<frame-color>#ffffff</frame-color> <frame-color>#ffffff</frame-color>
<fill-color>#ffffff</fill-color> <fill-color>#ffffff</fill-color>
@ -1122,6 +1139,23 @@
<name>Via2.net - 0/0</name> <name>Via2.net - 0/0</name>
<source>0/0@1</source> <source>0/0@1</source>
</properties> </properties>
<properties>
<frame-color>#ffe6bf</frame-color>
<fill-color>#ffe6bf</fill-color>
<frame-brightness>0</frame-brightness>
<fill-brightness>0</fill-brightness>
<dither-pattern>C29</dither-pattern>
<line-style>C0</line-style>
<valid>false</valid>
<visible>true</visible>
<transparent>false</transparent>
<width>1</width>
<marked>false</marked>
<xfill>false</xfill>
<animation>0</animation>
<name>Metal4.net - 0/0</name>
<source>0/0@1</source>
</properties>
<properties> <properties>
<frame-color>#ff3333</frame-color> <frame-color>#ff3333</frame-color>
<fill-color>#ff3333</fill-color> <fill-color>#ff3333</fill-color>

25
technology/scn4m_subm/tf/mosis.tf
View File

@ -552,6 +552,8 @@ layerRules(
( ("P1Con" "drawing") 47 0 t ) ( ("P1Con" "drawing") 47 0 t )
( ("Metal1" "drawing") 49 0 t ) ( ("Metal1" "drawing") 49 0 t )
( ("Metal2" "drawing") 51 0 t ) ( ("Metal2" "drawing") 51 0 t )
( ("Metal3" "drawing") 62 0 t )
( ("Metal4" "drawing") 31 0 t )
( ("annotate" "drawing") 0 0 nil ) ( ("annotate" "drawing") 0 0 nil )
( ("annotate" "drawing1") 0 0 nil ) ( ("annotate" "drawing1") 0 0 nil )
( ("annotate" "drawing2") 0 0 nil ) ( ("annotate" "drawing2") 0 0 nil )
@ -562,7 +564,6 @@ layerRules(
( ("annotate" "drawing7") 0 0 nil ) ( ("annotate" "drawing7") 0 0 nil )
( ("annotate" "drawing8") 0 0 nil ) ( ("annotate" "drawing8") 0 0 nil )
( ("annotate" "drawing9") 0 0 nil ) ( ("annotate" "drawing9") 0 0 nil )
( ("Via" "drawing") 50 0 t )
( ("Glass" "drawing") 52 0 t ) ( ("Glass" "drawing") 52 0 t )
( ("XP" "drawing") 60 0 t ) ( ("XP" "drawing") 60 0 t )
( ("Metal2" "pin") 0 0 nil ) ( ("Metal2" "pin") 0 0 nil )
@ -590,8 +591,9 @@ layerRules(
( ("P1Con" "net") 0 0 nil ) ( ("P1Con" "net") 0 0 nil )
( ("Metal1" "net") 0 0 nil ) ( ("Metal1" "net") 0 0 nil )
( ("Metal2" "net") 0 0 nil ) ( ("Metal2" "net") 0 0 nil )
( ("Metal3" "net") 0 0 nil )
( ("Metal4" "net") 0 0 nil )
( ("device" "label") 0 0 nil ) ( ("device" "label") 0 0 nil )
( ("Via" "net") 0 0 nil )
( ("pin" "label") 0 0 nil ) ( ("pin" "label") 0 0 nil )
( ("text" "drawing") 63 0 t ) ( ("text" "drawing") 63 0 t )
( ("pin" "drawing") 0 0 nil ) ( ("pin" "drawing") 0 0 nil )
@ -649,11 +651,12 @@ layerRules(
( Metal2 0 0 nil ) ( Metal2 0 0 nil )
( Glass 0 0 nil ) ( Glass 0 0 nil )
( XP 0 0 nil ) ( XP 0 0 nil )
( ("Via2" "drawing") 50 0 t ) ( ("Via" "drawing") 50 0 t )
( ("Via" "net") 0 0 nil )
( ("Via2" "drawing") 61 0 t )
( ("Via2" "net") 0 0 nil ) ( ("Via2" "net") 0 0 nil )
( ("Metal3" "drawing") 50 0 t ) ( ("Via3" "drawing") 30 0 t )
( ("Metal3" "net") 0 0 nil ) ( ("Via3" "net") 0 0 nil )
( ("Metal3" "pin") 0 0 nil )
( ("CapWell" "drawing") 0 0 nil ) ( ("CapWell" "drawing") 0 0 nil )
( ("CapWell" "net") 0 0 nil ) ( ("CapWell" "net") 0 0 nil )
( ("SiBlock" "drawing") 0 0 nil ) ( ("SiBlock" "drawing") 0 0 nil )
@ -665,6 +668,7 @@ layerRules(
viaLayers( viaLayers(
;( layer1 viaLayer layer2 ) ;( layer1 viaLayer layer2 )
;( ------ -------- ------ ) ;( ------ -------- ------ )
( Metal3 Via3 Metal4 )
( Metal2 Via2 Metal3 ) ( Metal2 Via2 Metal3 )
( Metal1 Via Metal2 ) ( Metal1 Via Metal2 )
( Active ActX Poly1 ) ( Active ActX Poly1 )
@ -798,6 +802,10 @@ electricalRules(
( currentDensity "Metal1" 1.0 ) ( currentDensity "Metal1" 1.0 )
( currentDensity "Via" 1.0 ) ( currentDensity "Via" 1.0 )
( currentDensity "Metal2" 1.0 ) ( currentDensity "Metal2" 1.0 )
( currentDensity "Via2" 1.0 )
( currentDensity "Metal3" 1.0 )
( currentDensity "Via3" 1.0 )
( currentDensity "Metal4" 1.0 )
) ;characterizationRules ) ;characterizationRules
) ;electricalRules ) ;electricalRules
@ -824,10 +832,13 @@ leRules(
( Metal2 drawing ) ( Metal2 drawing )
( Via2 drawing ) ( Via2 drawing )
( Metal3 drawing ) ( Metal3 drawing )
( Via3 drawing )
( Metal4 drawing )
( Poly1 pin ) ( Poly1 pin )
( Metal1 pin ) ( Metal1 pin )
( Metal2 pin ) ( Metal2 pin )
( Metal3 pin ) ( Metal3 pin )
( Metal4 pin )
( Poly2 drawing ) ( Poly2 drawing )
( P2Con drawing ) ( P2Con drawing )
( instance drawing ) ( instance drawing )
@ -853,7 +864,7 @@ leRules(
lxRules( lxRules(
lxExtractLayers( lxExtractLayers(
(Metal1 Metal2 Metal3) (Metal1 Metal2 Metal3 Metal4)
) ;lxExtractLayers ) ;lxExtractLayers
) ;lxRules ) ;lxRules