From 4ef14b04a23005d3db149611600e9d082031c8f0 Mon Sep 17 00:00:00 2001 From: Johan Euphrosine Date: Tue, 14 Feb 2023 15:28:40 +0900 Subject: [PATCH] xschem: fix paths - fix symbols path - fix models extension --- cells/xschem/tests/test_dnwpw.sch | 14 +++++++------- cells/xschem/tests/test_mim_2p0fF.sch | 14 +++++++------- cells/xschem/tests/test_nmos_3p3.sch | 6 +++--- cells/xschem/tests/test_nmos_3p3_sab.sch | 6 +++--- cells/xschem/tests/test_nmos_6p0.sch | 6 +++--- cells/xschem/tests/test_nmos_6p0_nat.sch | 6 +++--- cells/xschem/tests/test_nmoscap_3p3.sch | 12 ++++++------ cells/xschem/tests/test_nmoscap_6p0.sch | 12 ++++++------ cells/xschem/tests/test_np_3p3.sch | 14 +++++++------- cells/xschem/tests/test_nplus_u.sch | 10 +++++----- cells/xschem/tests/test_npolyf_u.sch | 10 +++++----- cells/xschem/tests/test_nwell.sch | 10 +++++----- cells/xschem/tests/test_pmos_3p3.sch | 6 +++--- cells/xschem/tests/test_pmos_3p3_sab.sch | 6 +++--- cells/xschem/tests/test_pmos_6p0.sch | 6 +++--- cells/xschem/tests/test_pmoscap_3p3.sch | 12 ++++++------ cells/xschem/tests/test_pmoscap_6p0.sch | 12 ++++++------ cells/xschem/tests/test_pplus_u.sch | 10 +++++----- cells/xschem/tests/test_ppolyf_u.sch | 10 +++++----- cells/xschem/tests/test_rm1.sch | 10 +++++----- cells/xschem/tests/test_vnpn_10x10.sch | 14 +++++++------- cells/xschem/tests/test_vpnp_10x10.sch | 14 +++++++------- 22 files changed, 110 insertions(+), 110 deletions(-) diff --git a/cells/xschem/tests/test_dnwpw.sch b/cells/xschem/tests/test_dnwpw.sch index fbabca3a..88b02d35 100644 --- a/cells/xschem/tests/test_dnwpw.sch +++ b/cells/xschem/tests/test_dnwpw.sch @@ -49,12 +49,12 @@ lab=P} C {devices/code_shown.sym} 30 -200 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical -.lib $::180MCU_MODELS/sm141064.spice res_typical -.lib $::180MCU_MODELS/sm141064.spice moscap_typical -.lib $::180MCU_MODELS/sm141064.spice diode_typical -* .lib $::180MCU_MODELS/sm141064.spice res_statistical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical +.lib $::180MCU_MODELS/sm141064.ngspice res_typical +.lib $::180MCU_MODELS/sm141064.ngspice moscap_typical +.lib $::180MCU_MODELS/sm141064.ngspice diode_typical +* .lib $::180MCU_MODELS/sm141064.ngspice res_statistical "} C {devices/code_shown.sym} 390 -450 0 0 {name=NGSPICE only_toplevel=true value=" @@ -75,7 +75,7 @@ xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name] } C {devices/gnd.sym} 230 -290 0 0 {name=l2 lab=GND} C {devices/lab_pin.sym} 230 -490 0 1 {name=l3 sig_type=std_logic lab=P} -C {gf180mcu_fd_pr/dnwpw.sym} 230 -390 0 0 {name=D1 +C {symbols/dnwpw.sym} 230 -390 0 0 {name=D1 model=dnwpw r_w=3u r_l=3u diff --git a/cells/xschem/tests/test_mim_2p0fF.sch b/cells/xschem/tests/test_mim_2p0fF.sch index e4d15c9f..cb649ef2 100644 --- a/cells/xschem/tests/test_mim_2p0fF.sch +++ b/cells/xschem/tests/test_mim_2p0fF.sch @@ -76,12 +76,12 @@ lab=IN} C {devices/code_shown.sym} 30 -200 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical -.lib $::180MCU_MODELS/sm141064.spice res_typical -.lib $::180MCU_MODELS/sm141064.spice moscap_typical -.lib $::180MCU_MODELS/sm141064.spice mimcap_typical -* .lib $::180MCU_MODELS/sm141064.spice res_statistical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical +.lib $::180MCU_MODELS/sm141064.ngspice res_typical +.lib $::180MCU_MODELS/sm141064.ngspice moscap_typical +.lib $::180MCU_MODELS/sm141064.ngspice mimcap_typical +* .lib $::180MCU_MODELS/sm141064.ngspice res_statistical "} C {devices/code_shown.sym} 390 -450 0 0 {name=NGSPICE only_toplevel=true value=" @@ -99,7 +99,7 @@ tclcommand=" xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw " } -C {gf180mcu_fd_pr/mim_2p0fF.sym} 230 -390 0 0 {name=C1 +C {symbols/mim_2p0fF.sym} 230 -390 0 0 {name=C1 W=10e-6 L=10e-6 model=mim_2p0fF diff --git a/cells/xschem/tests/test_nmos_3p3.sch b/cells/xschem/tests/test_nmos_3p3.sch index 4146540b..49baf338 100644 --- a/cells/xschem/tests/test_nmos_3p3.sch +++ b/cells/xschem/tests/test_nmos_3p3.sch @@ -48,8 +48,8 @@ lab=S} C {devices/code_shown.sym} 20 -160 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical "} C {devices/lab_pin.sym} 50 -410 0 0 {name=l1 sig_type=std_logic lab=G} C {devices/lab_pin.sym} 130 -490 0 0 {name=l2 sig_type=std_logic lab=D} @@ -68,7 +68,7 @@ write test_nmos_3p3.raw .endc "} C {devices/title.sym} 160 -30 0 0 {name=l5 author="GlobalFoundries PDK Authors"} -C {gf180mcu_fd_pr/nmos_3p3.sym} 110 -410 0 0 {name=M1 +C {symbols/nmos_3p3.sym} 110 -410 0 0 {name=M1 L=0.28u W=0.22u nf=1 diff --git a/cells/xschem/tests/test_nmos_3p3_sab.sch b/cells/xschem/tests/test_nmos_3p3_sab.sch index d2a42b0b..fdb685a8 100644 --- a/cells/xschem/tests/test_nmos_3p3_sab.sch +++ b/cells/xschem/tests/test_nmos_3p3_sab.sch @@ -48,8 +48,8 @@ lab=S} C {devices/code_shown.sym} 20 -160 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical "} C {devices/lab_pin.sym} 50 -410 0 0 {name=l1 sig_type=std_logic lab=G} C {devices/lab_pin.sym} 130 -490 0 0 {name=l2 sig_type=std_logic lab=D} @@ -68,7 +68,7 @@ write test_nmos_3p3_sab.raw .endc "} C {devices/title.sym} 160 -30 0 0 {name=l5 author="GlobalFoundries PDK Authors"} -C {gf180mcu_fd_pr/nmos_3p3_sab.sym} 110 -410 0 0 {name=M1 +C {symbols/nmos_3p3_sab.sym} 110 -410 0 0 {name=M1 L=0.28u W=0.22u nf=1 diff --git a/cells/xschem/tests/test_nmos_6p0.sch b/cells/xschem/tests/test_nmos_6p0.sch index f07c8e4f..8e222e6a 100644 --- a/cells/xschem/tests/test_nmos_6p0.sch +++ b/cells/xschem/tests/test_nmos_6p0.sch @@ -48,8 +48,8 @@ lab=S} C {devices/code_shown.sym} 20 -160 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical "} C {devices/lab_pin.sym} 50 -410 0 0 {name=l1 sig_type=std_logic lab=G} C {devices/lab_pin.sym} 130 -490 0 0 {name=l2 sig_type=std_logic lab=D} @@ -68,7 +68,7 @@ write test_nmos_6p0.raw .endc "} C {devices/title.sym} 160 -30 0 0 {name=l5 author="GlobalFoundries PDK Authors"} -C {gf180mcu_fd_pr/nmos_6p0.sym} 110 -410 0 0 {name=M1 +C {symbols/nmos_6p0.sym} 110 -410 0 0 {name=M1 L=0.70u W=0.30u nf=1 diff --git a/cells/xschem/tests/test_nmos_6p0_nat.sch b/cells/xschem/tests/test_nmos_6p0_nat.sch index 76837165..7910620a 100644 --- a/cells/xschem/tests/test_nmos_6p0_nat.sch +++ b/cells/xschem/tests/test_nmos_6p0_nat.sch @@ -48,8 +48,8 @@ lab=S} C {devices/code_shown.sym} 20 -160 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical "} C {devices/lab_pin.sym} 50 -410 0 0 {name=l1 sig_type=std_logic lab=G} C {devices/lab_pin.sym} 130 -490 0 0 {name=l2 sig_type=std_logic lab=D} @@ -68,7 +68,7 @@ write test_nmos_6p0_nat.raw .endc "} C {devices/title.sym} 160 -30 0 0 {name=l5 author="GlobalFoundries PDK Authors"} -C {gf180mcu_fd_pr/nmos_6p0_nat.sym} 110 -410 0 0 {name=M1 +C {symbols/nmos_6p0_nat.sym} 110 -410 0 0 {name=M1 L=1.80u W=0.80u nf=1 diff --git a/cells/xschem/tests/test_nmoscap_3p3.sch b/cells/xschem/tests/test_nmoscap_3p3.sch index 9e1fe2f7..2cfc2ed9 100644 --- a/cells/xschem/tests/test_nmoscap_3p3.sch +++ b/cells/xschem/tests/test_nmoscap_3p3.sch @@ -76,11 +76,11 @@ lab=IN} C {devices/code_shown.sym} 30 -200 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical -.lib $::180MCU_MODELS/sm141064.spice res_typical -.lib $::180MCU_MODELS/sm141064.spice moscap_typical -* .lib $::180MCU_MODELS/sm141064.spice res_statistical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical +.lib $::180MCU_MODELS/sm141064.ngspice res_typical +.lib $::180MCU_MODELS/sm141064.ngspice moscap_typical +* .lib $::180MCU_MODELS/sm141064.ngspice res_statistical "} C {devices/code_shown.sym} 390 -450 0 0 {name=NGSPICE only_toplevel=true value=" @@ -98,7 +98,7 @@ tclcommand=" xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw " } -C {gf180mcu_fd_pr/nmoscap_3p3.sym} 230 -390 0 0 {name=C1 +C {symbols/nmoscap_3p3.sym} 230 -390 0 0 {name=C1 W=10e-6 L=10e-6 model=nmoscap_3p3 diff --git a/cells/xschem/tests/test_nmoscap_6p0.sch b/cells/xschem/tests/test_nmoscap_6p0.sch index b2b971d0..d0fc3403 100644 --- a/cells/xschem/tests/test_nmoscap_6p0.sch +++ b/cells/xschem/tests/test_nmoscap_6p0.sch @@ -76,11 +76,11 @@ lab=IN} C {devices/code_shown.sym} 30 -200 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical -.lib $::180MCU_MODELS/sm141064.spice res_typical -.lib $::180MCU_MODELS/sm141064.spice moscap_typical -* .lib $::180MCU_MODELS/sm141064.spice res_statistical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical +.lib $::180MCU_MODELS/sm141064.ngspice res_typical +.lib $::180MCU_MODELS/sm141064.ngspice moscap_typical +* .lib $::180MCU_MODELS/sm141064.ngspice res_statistical "} C {devices/code_shown.sym} 390 -450 0 0 {name=NGSPICE only_toplevel=true value=" @@ -98,7 +98,7 @@ tclcommand=" xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw " } -C {gf180mcu_fd_pr/nmoscap_6p0.sym} 230 -390 0 0 {name=C1 +C {symbols/nmoscap_6p0.sym} 230 -390 0 0 {name=C1 W=10e-6 L=10e-6 model=nmoscap_6p0 diff --git a/cells/xschem/tests/test_np_3p3.sch b/cells/xschem/tests/test_np_3p3.sch index aca9b40b..a4cd36a3 100644 --- a/cells/xschem/tests/test_np_3p3.sch +++ b/cells/xschem/tests/test_np_3p3.sch @@ -49,12 +49,12 @@ lab=P} C {devices/code_shown.sym} 30 -200 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical -.lib $::180MCU_MODELS/sm141064.spice res_typical -.lib $::180MCU_MODELS/sm141064.spice moscap_typical -.lib $::180MCU_MODELS/sm141064.spice diode_typical -* .lib $::180MCU_MODELS/sm141064.spice res_statistical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical +.lib $::180MCU_MODELS/sm141064.ngspice res_typical +.lib $::180MCU_MODELS/sm141064.ngspice moscap_typical +.lib $::180MCU_MODELS/sm141064.ngspice diode_typical +* .lib $::180MCU_MODELS/sm141064.ngspice res_statistical "} C {devices/code_shown.sym} 390 -450 0 0 {name=NGSPICE only_toplevel=true value=" @@ -75,7 +75,7 @@ xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name] } C {devices/gnd.sym} 230 -290 0 0 {name=l2 lab=GND} C {devices/lab_pin.sym} 230 -490 0 1 {name=l3 sig_type=std_logic lab=P} -C {gf180mcu_fd_pr/np_3p3.sym} 230 -390 0 0 {name=D1 +C {symbols/np_3p3.sym} 230 -390 0 0 {name=D1 model=np_3p3 r_w=1u r_l=1u diff --git a/cells/xschem/tests/test_nplus_u.sch b/cells/xschem/tests/test_nplus_u.sch index 53a80abf..e631e5a1 100644 --- a/cells/xschem/tests/test_nplus_u.sch +++ b/cells/xschem/tests/test_nplus_u.sch @@ -65,10 +65,10 @@ lab=M} C {devices/code_shown.sym} 20 -160 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical -.lib $::180MCU_MODELS/sm141064.spice res_typical -* .lib $::180MCU_MODELS/sm141064.spice res_statistical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical +.lib $::180MCU_MODELS/sm141064.ngspice res_typical +* .lib $::180MCU_MODELS/sm141064.ngspice res_statistical "} C {devices/lab_pin.sym} 130 -490 0 0 {name=l2 sig_type=std_logic lab=P} C {devices/lab_pin.sym} 130 -310 0 0 {name=l3 sig_type=std_logic lab=M} @@ -93,7 +93,7 @@ tclcommand=" xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw " } -C {gf180mcu_fd_pr/nplus_u.sym} 130 -410 0 0 {name=R1 +C {symbols/nplus_u.sym} 130 -410 0 0 {name=R1 W=5e-6 L=5e-6 model=nplus_u diff --git a/cells/xschem/tests/test_npolyf_u.sch b/cells/xschem/tests/test_npolyf_u.sch index 64066dbe..b2e499a2 100644 --- a/cells/xschem/tests/test_npolyf_u.sch +++ b/cells/xschem/tests/test_npolyf_u.sch @@ -65,10 +65,10 @@ lab=M} C {devices/code_shown.sym} 20 -160 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical -.lib $::180MCU_MODELS/sm141064.spice res_typical -* .lib $::180MCU_MODELS/sm141064.spice res_statistical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical +.lib $::180MCU_MODELS/sm141064.ngspice res_typical +* .lib $::180MCU_MODELS/sm141064.ngspice res_statistical "} C {devices/lab_pin.sym} 130 -490 0 0 {name=l2 sig_type=std_logic lab=P} C {devices/lab_pin.sym} 130 -310 0 0 {name=l3 sig_type=std_logic lab=M} @@ -93,7 +93,7 @@ tclcommand=" xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw " } -C {gf180mcu_fd_pr/npolyf_u.sym} 130 -410 0 0 {name=R1 +C {symbols/npolyf_u.sym} 130 -410 0 0 {name=R1 W=1e-6 L=1e-6 model=npolyf_u diff --git a/cells/xschem/tests/test_nwell.sch b/cells/xschem/tests/test_nwell.sch index 33eeaf30..266ee959 100644 --- a/cells/xschem/tests/test_nwell.sch +++ b/cells/xschem/tests/test_nwell.sch @@ -65,10 +65,10 @@ lab=M} C {devices/code_shown.sym} 20 -160 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical -.lib $::180MCU_MODELS/sm141064.spice res_typical -* .lib $::180MCU_MODELS/sm141064.spice res_statistical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical +.lib $::180MCU_MODELS/sm141064.ngspice res_typical +* .lib $::180MCU_MODELS/sm141064.ngspice res_statistical "} C {devices/lab_pin.sym} 130 -490 0 0 {name=l2 sig_type=std_logic lab=P} C {devices/lab_pin.sym} 130 -310 0 0 {name=l3 sig_type=std_logic lab=M} @@ -93,7 +93,7 @@ tclcommand=" xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw " } -C {gf180mcu_fd_pr/nwell.sym} 130 -410 0 0 {name=R1 +C {symbols/nwell.sym} 130 -410 0 0 {name=R1 W=5e-6 L=5e-6 model=nwell diff --git a/cells/xschem/tests/test_pmos_3p3.sch b/cells/xschem/tests/test_pmos_3p3.sch index 81969d9f..6d6110d5 100644 --- a/cells/xschem/tests/test_pmos_3p3.sch +++ b/cells/xschem/tests/test_pmos_3p3.sch @@ -69,7 +69,7 @@ tclcommand=" xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw " } -C {gf180mcu_fd_pr/pmos_3p3.sym} 110 -410 0 0 {name=M1 +C {symbols/pmos_3p3.sym} 110 -410 0 0 {name=M1 L=0.28u W=0.22u nf=1 @@ -86,6 +86,6 @@ spiceprefix=X C {devices/code_shown.sym} 60 -170 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical "} diff --git a/cells/xschem/tests/test_pmos_3p3_sab.sch b/cells/xschem/tests/test_pmos_3p3_sab.sch index 5f05168b..708fe093 100644 --- a/cells/xschem/tests/test_pmos_3p3_sab.sch +++ b/cells/xschem/tests/test_pmos_3p3_sab.sch @@ -69,7 +69,7 @@ tclcommand=" xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw " } -C {gf180mcu_fd_pr/pmos_3p3_sab.sym} 110 -410 0 0 {name=M1 +C {symbols/pmos_3p3_sab.sym} 110 -410 0 0 {name=M1 L=0.28u W=0.22u nf=1 @@ -86,6 +86,6 @@ spiceprefix=X C {devices/code_shown.sym} 60 -170 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical "} diff --git a/cells/xschem/tests/test_pmos_6p0.sch b/cells/xschem/tests/test_pmos_6p0.sch index 724aa227..c86ee6de 100644 --- a/cells/xschem/tests/test_pmos_6p0.sch +++ b/cells/xschem/tests/test_pmos_6p0.sch @@ -69,7 +69,7 @@ tclcommand=" xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw " } -C {gf180mcu_fd_pr/pmos_6p0.sym} 110 -410 0 0 {name=M1 +C {symbols/pmos_6p0.sym} 110 -410 0 0 {name=M1 L=0.50u W=0.30u nf=1 @@ -86,6 +86,6 @@ spiceprefix=X C {devices/code_shown.sym} 60 -170 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical "} diff --git a/cells/xschem/tests/test_pmoscap_3p3.sch b/cells/xschem/tests/test_pmoscap_3p3.sch index 48dc220b..bd27db5e 100644 --- a/cells/xschem/tests/test_pmoscap_3p3.sch +++ b/cells/xschem/tests/test_pmoscap_3p3.sch @@ -76,11 +76,11 @@ lab=M} C {devices/code_shown.sym} 30 -200 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical -.lib $::180MCU_MODELS/sm141064.spice res_typical -.lib $::180MCU_MODELS/sm141064.spice moscap_typical -* .lib $::180MCU_MODELS/sm141064.spice res_statistical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical +.lib $::180MCU_MODELS/sm141064.ngspice res_typical +.lib $::180MCU_MODELS/sm141064.ngspice moscap_typical +* .lib $::180MCU_MODELS/sm141064.ngspice res_statistical "} C {devices/code_shown.sym} 390 -450 0 0 {name=NGSPICE only_toplevel=true value=" @@ -99,7 +99,7 @@ tclcommand=" xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw " } -C {gf180mcu_fd_pr/pmoscap_3p3.sym} 230 -390 0 0 {name=C1 +C {symbols/pmoscap_3p3.sym} 230 -390 0 0 {name=C1 W=10e-6 L=10e-6 model=pmoscap_3p3 diff --git a/cells/xschem/tests/test_pmoscap_6p0.sch b/cells/xschem/tests/test_pmoscap_6p0.sch index e996da9d..56c1af07 100644 --- a/cells/xschem/tests/test_pmoscap_6p0.sch +++ b/cells/xschem/tests/test_pmoscap_6p0.sch @@ -76,11 +76,11 @@ lab=M} C {devices/code_shown.sym} 30 -200 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical -.lib $::180MCU_MODELS/sm141064.spice res_typical -.lib $::180MCU_MODELS/sm141064.spice moscap_typical -* .lib $::180MCU_MODELS/sm141064.spice res_statistical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical +.lib $::180MCU_MODELS/sm141064.ngspice res_typical +.lib $::180MCU_MODELS/sm141064.ngspice moscap_typical +* .lib $::180MCU_MODELS/sm141064.ngspice res_statistical "} C {devices/code_shown.sym} 390 -450 0 0 {name=NGSPICE only_toplevel=true value=" @@ -99,7 +99,7 @@ tclcommand=" xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw " } -C {gf180mcu_fd_pr/pmoscap_6p0.sym} 230 -390 0 0 {name=C1 +C {symbols/pmoscap_6p0.sym} 230 -390 0 0 {name=C1 W=10e-6 L=10e-6 model=pmoscap_6p0 diff --git a/cells/xschem/tests/test_pplus_u.sch b/cells/xschem/tests/test_pplus_u.sch index 1f1abe82..0549bc72 100644 --- a/cells/xschem/tests/test_pplus_u.sch +++ b/cells/xschem/tests/test_pplus_u.sch @@ -65,10 +65,10 @@ lab=M} C {devices/code_shown.sym} 20 -160 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical -.lib $::180MCU_MODELS/sm141064.spice res_typical -* .lib $::180MCU_MODELS/sm141064.spice res_statistical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical +.lib $::180MCU_MODELS/sm141064.ngspice res_typical +* .lib $::180MCU_MODELS/sm141064.ngspice res_statistical "} C {devices/lab_pin.sym} 130 -490 0 0 {name=l2 sig_type=std_logic lab=P} C {devices/lab_pin.sym} 130 -310 0 0 {name=l3 sig_type=std_logic lab=M} @@ -93,7 +93,7 @@ tclcommand=" xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw " } -C {gf180mcu_fd_pr/pplus_u.sym} 130 -410 0 0 {name=R1 +C {symbols/pplus_u.sym} 130 -410 0 0 {name=R1 W=5e-6 L=5e-6 model=pplus_u diff --git a/cells/xschem/tests/test_ppolyf_u.sch b/cells/xschem/tests/test_ppolyf_u.sch index 4ba9472b..99a081d5 100644 --- a/cells/xschem/tests/test_ppolyf_u.sch +++ b/cells/xschem/tests/test_ppolyf_u.sch @@ -65,10 +65,10 @@ lab=M} C {devices/code_shown.sym} 20 -160 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical -.lib $::180MCU_MODELS/sm141064.spice res_typical -* .lib $::180MCU_MODELS/sm141064.spice res_statistical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical +.lib $::180MCU_MODELS/sm141064.ngspice res_typical +* .lib $::180MCU_MODELS/sm141064.ngspice res_statistical "} C {devices/lab_pin.sym} 130 -490 0 0 {name=l2 sig_type=std_logic lab=P} C {devices/lab_pin.sym} 130 -310 0 0 {name=l3 sig_type=std_logic lab=M} @@ -93,7 +93,7 @@ tclcommand=" xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw " } -C {gf180mcu_fd_pr/ppolyf_u.sym} 130 -410 0 0 {name=R1 +C {symbols/ppolyf_u.sym} 130 -410 0 0 {name=R1 W=1e-6 L=1e-6 model=ppolyf_u diff --git a/cells/xschem/tests/test_rm1.sch b/cells/xschem/tests/test_rm1.sch index b8e79f65..46d6bb9c 100644 --- a/cells/xschem/tests/test_rm1.sch +++ b/cells/xschem/tests/test_rm1.sch @@ -65,10 +65,10 @@ lab=M} C {devices/code_shown.sym} 20 -160 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical -.lib $::180MCU_MODELS/sm141064.spice res_typical -* .lib $::180MCU_MODELS/sm141064.spice res_statistical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical +.lib $::180MCU_MODELS/sm141064.ngspice res_typical +* .lib $::180MCU_MODELS/sm141064.ngspice res_statistical "} C {devices/lab_pin.sym} 130 -490 0 0 {name=l2 sig_type=std_logic lab=P} C {devices/lab_pin.sym} 130 -310 0 0 {name=l3 sig_type=std_logic lab=M} @@ -93,7 +93,7 @@ tclcommand=" xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw " } -C {gf180mcu_fd_pr/rm1.sym} 130 -410 0 0 {name=R1 +C {symbols/rm1.sym} 130 -410 0 0 {name=R1 W=0.6e-6 L=60e-6 model=rm1 diff --git a/cells/xschem/tests/test_vnpn_10x10.sch b/cells/xschem/tests/test_vnpn_10x10.sch index 3bb1fe38..0dd5a8c5 100644 --- a/cells/xschem/tests/test_vnpn_10x10.sch +++ b/cells/xschem/tests/test_vnpn_10x10.sch @@ -69,12 +69,12 @@ lab=C} C {devices/code_shown.sym} 30 -200 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical -.lib $::180MCU_MODELS/sm141064.spice res_typical -.lib $::180MCU_MODELS/sm141064.spice moscap_typical -.lib $::180MCU_MODELS/sm141064.spice bjt_typical -* .lib $::180MCU_MODELS/sm141064.spice res_statistical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical +.lib $::180MCU_MODELS/sm141064.ngspice res_typical +.lib $::180MCU_MODELS/sm141064.ngspice moscap_typical +.lib $::180MCU_MODELS/sm141064.ngspice bjt_typical +* .lib $::180MCU_MODELS/sm141064.ngspice res_statistical "} C {devices/code_shown.sym} 390 -450 0 0 {name=NGSPICE only_toplevel=true value=" @@ -95,7 +95,7 @@ tclcommand=" xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw " } -C {gf180mcu_fd_pr/vnpn_10x10.sym} 190 -390 0 0 {name=Q1 +C {symbols/vnpn_10x10.sym} 190 -390 0 0 {name=Q1 model=vnpn_10x10 spiceprefix=X m=1} diff --git a/cells/xschem/tests/test_vpnp_10x10.sch b/cells/xschem/tests/test_vpnp_10x10.sch index 8e41c1d0..68ab8b4c 100644 --- a/cells/xschem/tests/test_vpnp_10x10.sch +++ b/cells/xschem/tests/test_vpnp_10x10.sch @@ -71,12 +71,12 @@ lab=GND} C {devices/code_shown.sym} 30 -200 0 0 {name=MODELS only_toplevel=true format="tcleval( @value )" value=" -.include $::180MCU_MODELS/design.spice -.lib $::180MCU_MODELS/sm141064.spice typical -.lib $::180MCU_MODELS/sm141064.spice res_typical -.lib $::180MCU_MODELS/sm141064.spice moscap_typical -.lib $::180MCU_MODELS/sm141064.spice bjt_typical -* .lib $::180MCU_MODELS/sm141064.spice res_statistical +.include $::180MCU_MODELS/design.ngspice +.lib $::180MCU_MODELS/sm141064.ngspice typical +.lib $::180MCU_MODELS/sm141064.ngspice res_typical +.lib $::180MCU_MODELS/sm141064.ngspice moscap_typical +.lib $::180MCU_MODELS/sm141064.ngspice bjt_typical +* .lib $::180MCU_MODELS/sm141064.ngspice res_statistical "} C {devices/code_shown.sym} 390 -450 0 0 {name=NGSPICE only_toplevel=true value=" @@ -96,7 +96,7 @@ tclcommand=" xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw " } -C {gf180mcu_fd_pr/vpnp_10x10.sym} 190 -390 0 0 {name=Q1 +C {symbols/vpnp_10x10.sym} 190 -390 0 0 {name=Q1 model=vpnp_10x10 spiceprefix=X m=1}