Skip to content

Commit

Permalink
Test Matrix Debug
Browse files Browse the repository at this point in the history
dan-fritchman committed Mar 26, 2024
1 parent 211c3a7 commit 3f37eb0
Showing 3 changed files with 7 additions and 14 deletions.
2 changes: 1 addition & 1 deletion pdks/Gf180/gf180_hdl21/pdk_logic.py
Original file line number Diff line number Diff line change
@@ -288,7 +288,7 @@ def scale_param(self, orig: Optional[h.Scalar], default: h.Prefixed) -> h.Scalar
if isinstance(orig, h.Prefixed):
return orig # FIXME: where's the scaling?
if isinstance(orig, h.Literal):
return h.Literal(f"({orig} * 1e6)")
return h.Literal(f"({orig.text} * 1e6)")
raise TypeError(f"Param Value {orig}")

def use_defaults(self, params: h.paramclass, modname: str, defaults: dict):
17 changes: 5 additions & 12 deletions pdks/Sky130/sky130_hdl21/pdk_data.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
# Std-Lib Imports
from copy import deepcopy
from dataclasses import field
from typing import Dict, Tuple, List
from types import SimpleNamespace

# PyPi Imports
from pydantic.dataclasses import dataclass
from typing import List

# Hdl21 Imports
import hdl21 as h
from hdl21.prefix import (
MILLI,
µ,
MEGA,
TERA,
)
@@ -35,7 +29,6 @@
# Vlsirtool Types to ease downstream parsing
from vlsirtools import SpiceType

FIXME = None # FIXME: Replace with real values!
PDK_NAME = "sky130"

"""
@@ -133,23 +126,23 @@ class MosParams:
sa = h.Param(
dtype=h.Scalar,
desc="Spacing between Adjacent Gate to Drain",
default=h.Literal(0),
default=0,
)
sb = h.Param(
dtype=h.Scalar,
desc="Spacing between Adjacent Gate to Source",
default=h.Literal(0),
default=0,
)
sd = h.Param(
dtype=h.Scalar,
desc="Spacing between Adjacent Drain to Source",
default=h.Literal(0),
default=0,
)
mult = h.Param(dtype=h.Scalar, desc="Multiplier", default=1)
m = h.Param(dtype=h.Scalar, desc="Multiplier", default=1)


# FIXME: keep this alias as prior versions may have used it
# NOTE: probably add a deprecation note for this alias; prior versions may have used it
Sky130MosParams = MosParams


2 changes: 1 addition & 1 deletion pdks/Sky130/sky130_hdl21/pdk_logic.py
Original file line number Diff line number Diff line change
@@ -356,7 +356,7 @@ def scale_param(self, orig: Optional[h.Scalar], default: h.Prefixed) -> h.Scalar
if isinstance(orig, h.Prefixed):
return orig # FIXME: where's the scaling?
if isinstance(orig, h.Literal):
return h.Literal(f"({orig} * 1e6)")
return h.Literal(f"({orig.text} * 1e6)")
raise TypeError(f"Param Value {orig}")

def use_defaults(self, params: h.paramclass, modname: str, defaults: dict):

0 comments on commit 3f37eb0

Please sign in to comment.