Skip to content

Commit

Permalink
Merge pull request google#72 from mabrains/ngspice_regression
Browse files Browse the repository at this point in the history 
Ngspice regression
  • Loading branch information
@Mohamed-Gomaa1
Mohamed-Gomaa1 authored Jan 15, 2023
2 parents 0d645fc + 811758b commit 48cdbb5
Show file tree
Hide file tree
Showing 98 changed files with 1,915 additions and 4,099 deletions.
11 changes: 0 additions & 11 deletions models/ngspice/testing/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ Add_run-dir:
smoke-test:
@echo "========== Runing models_xyce SMOKE TEST regression =========="
@cd $(Testing_DIR)/smoke_test
@python3 ng_smoke_test.py

#================================
# ---------- models-MOS----------
Expand All @@ -60,7 +59,6 @@ models-MOS-vgs:Add_run-dir
@cd $(Testing_DIR)/$(run_folder)/mos_iv_vgs
@echo "========== Runing models_ngspice-MOS-VGS regression ==========" |& tee -a ../run_log.log
@python3 models_regression.py |& tee -a ../run_log.log
@python3 plotting.py

.ONESHELL:
models-MOS-vbs:Add_run-dir
Expand All @@ -69,7 +67,6 @@ models-MOS-vbs:Add_run-dir
@cd $(Testing_DIR)/$(run_folder)/mos_iv_vbs
@echo "========== Runing models_ngspice-MOS-VBS regression ==========" |& tee -a ../run_log.log
@python3 models_regression.py |& tee -a ../run_log.log
@python3 plotting.py

.ONESHELL:
models-MOS-cv:Add_run-dir
Expand All @@ -78,7 +75,6 @@ models-MOS-cv:Add_run-dir
@cd $(Testing_DIR)/$(run_folder)/mos_cv
@echo "========== Runing models_ngspice-MOS-CV regression ==========" |& tee -a ../run_log.log
@python3 models_regression.py |& tee -a ../run_log.log
@python3 plotting.py

#================================
# ---------- models-BJT----------
Expand All @@ -94,7 +90,6 @@ models-BJT-cj:Add_run-dir
@cd $(Testing_DIR)/$(run_folder)/bjt_cj
@echo "========== Runing models_ngspice-BJT-cj regression ==========" |& tee -a ../run_log.log
@python3 models_regression.py |& tee -a ../run_log.log
@python3 plotting.py

.ONESHELL:
models-BJT-beta:Add_run-dir
Expand All @@ -103,7 +98,6 @@ models-BJT-beta:Add_run-dir
@cd $(Testing_DIR)/$(run_folder)/bjt_beta
@echo "========== Runing models_ngspice-BJT-beta regression ==========" |& tee -a ../run_log.log
@python3 models_regression.py |& tee -a ../run_log.log
@python3 plotting.py

.ONESHELL:
models-BJT-iv:Add_run-dir
Expand All @@ -112,7 +106,6 @@ models-BJT-iv:Add_run-dir
@cd $(Testing_DIR)/$(run_folder)/bjt_iv
@echo "========== Runing models_ngspice-BJT-iv regression ==========" |& tee -a ../run_log.log
@python3 models_regression.py |& tee -a ../run_log.log
@python3 plotting.py

#================================
# --------- models-diode --------
Expand All @@ -125,7 +118,6 @@ models-diode: Add_run-dir
@cd $(Testing_DIR)/$(run_folder)/diode
@echo "========== Runing models_ngspice-didoe regression ==========" |& tee -a ../run_log.log
@python3 models_regression.py |& tee -a ../run_log.log
@python3 plotting.py

#================================
# -------- models-MOSCAP --------
Expand All @@ -138,7 +130,6 @@ models-MOSCAP: Add_run-dir
@cd $(Testing_DIR)/$(run_folder)/moscap_c
@echo "========== Runing models_ngspice-MOSCAP regression ==========" |& tee -a ../run_log.log
@python3 models_regression.py |& tee -a ../run_log.log
@python3 plotting.py

#================================
# -------- models-MIMCAP --------
Expand All @@ -151,7 +142,6 @@ models-MIMCAP: Add_run-dir
@cd $(Testing_DIR)/$(run_folder)/mimcap_c
@echo "========== Runing models_ngspice-MIMCAP regression ==========" |& tee -a ../run_log.log
@python3 models_regression.py |& tee -a ../run_log.log
@python3 plotting.py

#================================
# --------- models-RES ----------
Expand All @@ -164,7 +154,6 @@ models-RES: Add_run-dir
@cd $(Testing_DIR)/$(run_folder)/resistor_r
@echo "========== Runing models_ngspice-RES regression ==========" |& tee -a ../run_log.log
@python3 models_regression.py |& tee -a ../run_log.log
@python3 plotting.py

#===============================
# --------- Clean ALL ----------
Expand Down
7 changes: 4 additions & 3 deletions models/ngspice/testing/regression/bjt_beta/device_netlists/npn.spice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ xq1 c b 0 0 {{device}}

.control
set filetype=ascii

set wr_singlescale
set wr_vecnames
dc Vbp 0.2 1.2 0.01 Vcp 1 3 1
wrdata bjt_beta_regr/npn/ic_simulated/simulated_{{device}}_t{{temp}}.csv -i(Vcp)
wrdata bjt_beta_regr/npn/ib_simulated/simulated_{{device}}_t{{temp}}.csv -i(Vbp)
wrdata bjt_beta_regr/npn/npn_netlists/ic_simulated_{{device}}_t{{temp}}.csv -i(Vcp) v(c)
wrdata bjt_beta_regr/npn/npn_netlists/ib_simulated_{{device}}_t{{temp}}.csv -i(Vbp) v(c)
.endc

.include "../../../design.ngspice"
Expand Down
7 changes: 4 additions & 3 deletions models/ngspice/testing/regression/bjt_beta/device_netlists/pnp.spice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ xq1 c b 0 {{device}}

.control
set filetype=ascii

set wr_singlescale
set wr_vecnames
dc Vbp -0.2 -1.2 -0.01 Vcp -1 -3 -1
wrdata bjt_beta_regr/pnp/ic_simulated/simulated_{{device}}_t{{temp}}.csv -i(Vcp)
wrdata bjt_beta_regr/pnp/ib_simulated/simulated_{{device}}_t{{temp}}.csv -i(Vbp)
wrdata bjt_beta_regr/pnp/pnp_netlists/ic_simulated_{{device}}_t{{temp}}.csv i(Vcp) v(c)
wrdata bjt_beta_regr/pnp/pnp_netlists/ib_simulated_{{device}}_t{{temp}}.csv i(Vbp) v(c)
.endc

.include "../../../design.ngspice"
Expand Down
178 changes: 91 additions & 87 deletions models/ngspice/testing/regression/bjt_beta/models_regression.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,12 +269,10 @@ def run_sim(char, dirpath, device, temp):

netlist_path = f"{dirpath}/{dev}_netlists" + f"/netlist_{device}_t{temp_str}.spice"

result_path_ib = f"{dirpath}/ib_simulated/" + f"simulated_{device}_t{temp_str}.csv"
result_path_ic = f"{dirpath}/ic_simulated/" + f"simulated_{device}_t{temp_str}.csv"

for c in char:
os.makedirs(f"{dirpath}/{c}_simulated", exist_ok=True)
result_path_ib = f"{dirpath}/{dev}_netlists/" + f"ib_simulated_{device}_t{temp_str}.csv"
result_path_ic = f"{dirpath}/{dev}_netlists/" + f"ic_simulated_{device}_t{temp_str}.csv"


with open(netlist_tmp) as f:
tmpl = Template(f.read())
os.makedirs(f"{dirpath}/{dev}_netlists", exist_ok=True)
Expand Down Expand Up @@ -325,43 +323,44 @@ def run_sims(char, df, dirpath, num_workers=mp.cpu_count()):
logging.info(f"Test case generated an exception: {exc}")

for c in char:
sf = glob.glob(f"{dirpath}/{c}_simulated/*.csv") # stored simulated data files
sf = glob.glob(f"{dirpath}/*_netlists/{c}*.csv") # stored simulated data files

for i in range(len(sf)):
sdf = pd.read_csv(
df = pd.read_csv(
sf[i],
header=None,
delimiter=r"\s+",
)

sweep = len(pd.read_csv(glob.glob(f"{dirpath}/{c}_measured/*.csv")[1]))

new_array = np.empty((sweep, 1 + int(sdf.shape[0] / sweep)))
new_array[:, 0] = sdf.iloc[:sweep, 0]
times = int(sdf.shape[0] / sweep)

for j in range(times):
new_array[:, (j + 1)] = sdf.iloc[j * sweep : (j + 1) * sweep, 1]

# Writing final simulated data 1
sdf = pd.DataFrame(new_array)
sdf.to_csv(
sf[i],
index=False,
)

sdf.rename(
columns={
0: "simulated_base_volt",
1: f"simulated_{c}_vcp_step1",
2: f"simulated_{c}_vcp_step2",
3: f"simulated_{c}_vcp_step3",
},
inplace=True,
)

sdf.to_csv(sf[i])

if c == "ib" and dirpath == "bjt_beta_regr/npn":
i_vds = "-i(Vbp)"
elif c == "ic" and dirpath == "bjt_beta_regr/npn":
i_vds = "-i(Vcp)"
elif c == "ib" and dirpath == "bjt_beta_regr/pnp":
i_vds = "i(Vbp)"
else:
i_vds = "i(Vcp)"
sdf = df.pivot(index="v-sweep", columns="v(c)", values=i_vds)
if dirpath == "bjt_beta_regr/npn":
sdf.rename(
columns={
1.0: f"simulated_{c}_vcp_step1",
2.0: f"simulated_{c}_vcp_step2",
3.0: f"simulated_{c}_vcp_step3",
},
inplace=True,
)
else:
sdf.rename(
columns={
-1.0: f"simulated_{c}_vcp_step1",
-2.0: f"simulated_{c}_vcp_step2",
-3.0: f"simulated_{c}_vcp_step3",
},
inplace=True,
)
# reverse the rows
sdf = sdf.iloc[::-1]
sdf.to_csv(sf[i], index=True, header=True, sep=",")
df = pd.DataFrame(results)

df = df[["device", "temp", "beta_sim_ib_unscaled", "beta_sim_ic_unscaled"]]
Expand Down Expand Up @@ -456,7 +455,7 @@ def main():
sim_df = run_sims(char, meas_df, dev_path, 3)

sim_len = len(
pd.read_csv(glob.glob(f"{dev_path}/{char[1]}_simulated/*.csv")[1])
pd.read_csv(glob.glob(f"{dev_path}/{dev}_netlists/{char[1]}*.csv")[1])
)

logging.info(
Expand All @@ -469,15 +468,25 @@ def main():

merged_all = []
for c in char:

# create a new dataframe for rms error
rms_df = pd.DataFrame(columns=["device", "temp","corner", "rms_error"])

merged_dfs = []

for i in range(len(merged_df)):

measured_data = pd.read_csv(merged_df[f"{c}_measured"][i])
simulated_data = pd.read_csv(merged_df[f"beta_{c}_sim"][i])

measured_data["v-sweep"] = simulated_data["v-sweep"]
result_data = simulated_data.merge(measured_data, how="left")
# clipping all the values to lowest_curr
lowest_curr = 5e-12
result_data[f"simulated_{c}_vcp_step1"] = result_data[f"simulated_{c}_vcp_step1"].clip(lower=lowest_curr)
result_data[f"simulated_{c}_vcp_step2"] = result_data[f"simulated_{c}_vcp_step2"].clip(lower=lowest_curr)
result_data[f"simulated_{c}_vcp_step3"] = result_data[f"simulated_{c}_vcp_step3"].clip(lower=lowest_curr)
result_data[f"measured_{c}_vcp_step1"] = result_data[f"measured_{c}_vcp_step1"].clip(lower=lowest_curr)
result_data[f"measured_{c}_vcp_step2"] = result_data[f"measured_{c}_vcp_step2"].clip(lower=lowest_curr)
result_data[f"measured_{c}_vcp_step3"] = result_data[f"measured_{c}_vcp_step3"].clip(lower=lowest_curr)

result_data["corner"] = "typical"
result_data["device"] = (
Expand Down Expand Up @@ -529,7 +538,18 @@ def main():
)
/ 3
)

# get rms error
result_data["rms_error"] = np.sqrt(
np.mean(result_data["error"] ** 2)
)
# fill rms dataframe
rms_df.loc[i] = [
result_data["device"][0],
result_data["temp"][0],
result_data["corner"][0],
result_data["rms_error"][0],
]

result_data = result_data[
[
"device",
Expand All @@ -554,56 +574,40 @@ def main():
merged_out = pd.concat(merged_dfs)

merged_out.to_csv(f"{dev_path}/error_analysis_{c}.csv", index=False)

merged_all.append(merged_out)

merged_all = pd.concat(merged_all)
list_dev = npn_devices
if dev == "pnp":
list_dev = pnp_devices
# calculating the error of each device and reporting it
for dev in list_dev:
min_error_total = float()
max_error_total = float()
error_total = float()
number_of_existance = int()

# number of rows in the final excel sheet
num_rows = merged_all["device"].count()

for n in range(num_rows):
if dev == merged_all["device"].iloc[n]:
number_of_existance += 1
error_total += merged_all["error"].iloc[n]
if merged_all["error"].iloc[n] > max_error_total:
max_error_total = merged_all["error"].iloc[n]
elif merged_all["error"].iloc[n] < min_error_total:
min_error_total = merged_all["error"].iloc[n]

mean_error_total = error_total / number_of_existance

# Making sure that min, max, mean errors are not > 100%
if min_error_total > 100:
min_error_total = 100

if max_error_total > 100:
max_error_total = 100

if mean_error_total > 100:
mean_error_total = 100

# logging.infoing min, max, mean errors to the consol
logging.info(
f"# Device {dev} min error: {min_error_total:.2f}, max error: {max_error_total:.2f}, mean error {mean_error_total:.2f}"
)

if max_error_total < PASS_THRESH:
logging.info(f"# Device {dev} has passed regression.")
else:
rms_df.to_csv(f"{dev_path}/finalerror_analysis_{c}.csv", index=False)

# calculating the error of each device and reporting it
for dev in list_dev:
min_error_total = float()
max_error_total = float()
mean_error_total = float()
# number of rows in the final excel sheet
rms_df=pd.read_csv(f"{dev_path}/finalerror_analysis_{c}.csv")
min_error_total = rms_df["rms_error"].min()
max_error_total = rms_df["rms_error"].max()
mean_error_total = rms_df["rms_error"].mean()
# Making sure that min, max, mean errors are not > 100%
if min_error_total > 100:
min_error_total = 100

if max_error_total > 100:
max_error_total = 100

if mean_error_total > 100:
mean_error_total = 100

# logging.infoing min, max, mean errors to the consol
logging.info(
f"# Device {dev} has failed regression. Needs more analysis."
f"# Device {dev} {c} min error: {min_error_total:.2f}, max error: {max_error_total:.2f}, mean error {mean_error_total:.2f}"
)

if max_error_total < PASS_THRESH:
logging.info(f"# Device {dev} {c} has passed regression.")
else:
logging.error(
f"# Device {dev} {c} has failed regression. Needs more analysis."
)


# # ================================================================
# -------------------------- MAIN --------------------------------
Expand Down
283 changes: 262 additions & 21 deletions models/ngspice/testing/regression/bjt_beta/plotting.ipynb
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 48cdbb5

Please sign in to comment.