dv-flow-mgr 0.0.1.13551739897a1__tar.gz → 0.0.1.13644197178a1__tar.gz

{dv_flow_mgr-0.0.1.13551739897a1 → dv_flow_mgr-0.0.1.13644197178a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.13551739897a1
+Version: 0.0.1.13644197178a1
 Summary: DV Flow Manager is a build system for silicon design
 Author-email: Matthew Ballance <matt.ballance@gmail.com>
 License:                                  Apache License

{dv_flow_mgr-0.0.1.13551739897a1 → dv_flow_mgr-0.0.1.13644197178a1}/docs/Steps.md

@@ -105,10 +105,41 @@ runner.run(simImg)
 factory.addTaskType(MyTask.ctor)
 
 # Proper values
-- Show that can pass individual values
+* Show that can pass individual values
 - Need to test append/prepend/path-append/path-prepend
-- Need to process and expand expressions
+* Need to process and expand expressions
 - 
 
+with:
+  args: <value>
+  # List-of 
+  - append-list: 
+
+# Why PSS?
+- Key usecases
+
+# Open Source and PSS
+
+# YAML basics
+- Load packages and create TaskNodeCtor objects from a YAML file
+- Define types in YAML
+- Implement a 'task factory'
+  - Support package overrides (config setting?)
+  - 
+
+# TaskNode, TaskNodeCtor
+- TaskNodeCtor exists for each node type
+  - Every node declaration in a YAML file
+  - Node types accessed via the Python API
+- A new node -- likely with different parameter values -- can be created via the API
+- A node created via the YAML spec has a dedicated node ctor
+
+When created via the 
+
+# Early Differentiators
+- Library of tools with aggressive work avoidance (faster turnaround)
+- Cross-tool support (strategy for category support)
+- Extract and display markers (easier identification of failures)
+
 
 

dv_flow_mgr-0.0.1.13644197178a1/fwperiph_dma.pss

@@ -0,0 +1,127 @@
+
+struct wb_if { }
+struct clk_rst_if { }
+
+// Need to mark hierarchies as 'verilog'
+// This allows 
+component fwperiph_dma : vlog_blackbox_c {
+    // All contain refs
+    // Upper must connect during init_down
+    export_c<wb_if>     reg_if;
+    port_c<wb_if>       mem_if;
+    port_c<wb_if>       clk_rst_if;
+
+    exec init_down {
+        module_type = "fwperiph_dma #(%s,%s)" % hh;
+
+        // Append port bindings?
+    }
+}
+
+component wb_initiator_bfm_c {
+
+    // Port: consumer - requires something to implement the API
+    // Export: provider - is, or provides, an implementation
+    port_c<
+}
+
+// Effectively want to partition such that PSS model is valid,
+// and we can extract a region to generate as SV
+
+// Want to create a full testbench env from PSS input
+// - Still have to pull the 
+
+// Hierarchy mirrors the design and surrounding environment
+component pss_top {
+    wb_initiator_bfm_c        reg_if;
+    fwperiph_dma_c            dut;
+
+    exec init_down {
+
+    }
+}
+
+// port/export are orthogonal to interface/mirror
+
+// Wire ports have two components
+// Always use 'export', since we are providing 
+
+
+
+For wire ports, outside world must be able to determine internal binding (?)
+- No, not really. Assume netlister will create temp wires with names like container
+- dma_u_adr_i
+- ...
+
+Port must have a reference to an export
+Directionality may be arbitrary...
+
+port: initiator
+export: target
+
+Need to elaborate component tree in order to connect up bound port/export
+
+Goal is to be able to:
+- Instance the dut
+- Isolate stimulus
+- Synthesize stimulus
+
+
+Create reactive tests
+- Must be able to identify reactive portion
+- "constraints" surrounding reactive data must be sufficiently open
+- Must be able to "lower" reactive subset of the description
+
+"Scope of reactivity"
+- Loop:
+  repeat (<variable>) {
+    // body must also be autonomous?
+    // body is fixed or autonomous
+  }
+
+Action traversal cannot cross partition boundaries?
+- Specifically, must convert to reads/writes
+- Maybe automate 
+
+Capture required Emu / DfX content as part of UTP
+- Platform required
+- Target-specific requirements
+- Known dependencies (eg content for related blocks)
+- Stub requirements (which interfaces must be accessed)
+=> Goal: produce reusable content with minimal additional effort
+
+Pitch: multiple teams developing cross-platform test content from a natural-language spec
+- IP team needs to deliver to firmware
+- Emu team often re-engineers init content, builds SL content on top
+- Likewise, DfX team often re-engineers ; may be delayed due to dependency
+-> Want to reduce or eliminate redundant work
+-> Want consistency in what is used -- verifcation 
+-> 
+Pitch: capture initialization in machine-readable format
+-> Derive natural-language description and diagrams
+-> Derive platform-appropriate content
+-> Save time
+
+Formal capture of init sequences
+- Capture in PSS
+- Derive user documentation (AI for summarization + comments)
+
+struct wishbone_s : protocol_s {
+
+}
+
+struct wishbone_rtl_abstraction_s <ADDR_WIDTH=32, DATA_WIDTH=32> : abstraction_s<wishbone_s> {
+  @port(init_dir=Output, targ_dir=Input)
+  bit[DATA_WIDTH]   wr_data;
+
+  @port(init_dir=Output, targ_dir=Input)
+  bit[DATA_WIDTH]   rd_data;
+}
+
+// bus type
+// abstraction 
+// initiator, target, initiator_mirror, 
+
+component wb_initiator_c {
+  
+}

{dv_flow_mgr-0.0.1.13551739897a1 → dv_flow_mgr-0.0.1.13644197178a1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dv-flow-mgr"
-version = "0.0.1.13551739897a1"
+version = "0.0.1.13644197178a1"
 dependencies = [
     'pydantic',
     'pyyaml',

{dv_flow_mgr-0.0.1.13551739897a1 → dv_flow_mgr-0.0.1.13644197178a1}/src/dv_flow/mgr/__init__.py

@@ -7,4 +7,5 @@ from .task_data import *
 from .task_graph_runner import TaskGraphRunner
 from .task_graph_runner_local import TaskGraphRunnerLocal
 from .task_graph_builder import TaskGraphBuilder
+from .task_node import task
 

{dv_flow_mgr-0.0.1.13551739897a1 → dv_flow_mgr-0.0.1.13644197178a1}/src/dv_flow/mgr/eval_jq.py

@@ -8,8 +8,9 @@ def eval_jq(input, args):
     filt = jq.compile(args[0])
 
     if type(input) == str:
-        ret = filt.input_text(input).all()
+        ret = filt.input_text(input).text()
     else:
-        ret = filt.input_value(input).all()
+        ret = filt.input_value(input).text()
+
 
     return ret

{dv_flow_mgr-0.0.1.13551739897a1 → dv_flow_mgr-0.0.1.13644197178a1}/src/dv_flow/mgr/expr_eval.py

@@ -19,8 +19,11 @@ class ExprEval(ExprVisitor):
         return val
     
     def _toString(self, val):
-        obj = self._toObject(val)
-        return json.dumps(obj)
+        rval = val
+        if type(val) != str:
+            obj = self._toObject(val)
+            rval = json.dumps(obj)
+        return rval
 #        if isinstance(val, list):
 #            val = '[' + ",".join(self._toString(v) for v in val) + ']'
 #        elif hasattr(val, "model_dump_json"):

{dv_flow_mgr-0.0.1.13551739897a1 → dv_flow_mgr-0.0.1.13644197178a1}/src/dv_flow/mgr/package_def.py

@@ -33,7 +33,7 @@ from typing import Any, Dict, List, Callable, Tuple, ClassVar
 from .fragment_def import FragmentDef
 from .package import Package
 from .package_import_spec import PackageImportSpec, PackageSpec
-#from .task import TaskCtorCls, TaskCtorParam, TaskCtorParamCls
+from .task_node import TaskNodeCtor, TaskNodeCtorProxy, TaskNodeCtorTask
 from .task_ctor import TaskCtor
 from .task_def import TaskDef, TaskSpec
 from .std.task_null import TaskNull
@@ -151,20 +151,7 @@ class PackageDef(BaseModel):
             if decl_params:
                 self._log.debug("Type declares new parameters")
                 # We need to combine base parameters with new parameters
-                ptype_m = {
-                    "str" : str,
-                    "int" : int,
-                    "float" : float,
-                    "bool" : bool,
-                    "list" : List
-                }
-                pdflt_m = {
-                    "str" : "",
-                    "int" : 0,
-                    "float" : 0.0,
-                    "bool" : False,
-                    "list" : []
-                }
+
                 for p in task.params.keys():
                     param = task.params[p]
                     self._log.debug("param: %s" % str(param))
@@ -221,16 +208,24 @@ class PackageDef(BaseModel):
 
     def mkTaskCtor(self, session, task, srcdir, tasks_m) -> TaskCtor:
         self._log.debug("--> %s::mkTaskCtor %s (srcdir: %s)" % (self.name, task.name, srcdir))
+        base_ctor_t : TaskCtor = None
         ctor_t : TaskCtor = None
+        base_params : BaseModel = None
+        callable = None
+        needs = [] if task.needs is None else task.needs.copy()
+
+        if task.uses is not None:
+            base_ctor_t = self.getTaskCtor(session, task.uses, tasks_m)
+            base_params = base_ctor_t.mkTaskParams()
 
         # Determine the implementation constructor first
-        if task.pyclass is not None:
+        if task.pytask is not None:
             # Built-in impl
             # Now, lookup the class
-            self._log.debug("Use PyClass implementation")
-            last_dot = task.pyclass.rfind('.')
-            clsname = task.pyclass[last_dot+1:]
-            modname = task.pyclass[:last_dot]
+            self._log.debug("Use PyTask implementation")
+            last_dot = task.pytask.rfind('.')
+            clsname = task.pytask[last_dot+1:]
+            modname = task.pytask[:last_dot]
 
             try:
                 if modname not in sys.modules:
@@ -245,26 +240,26 @@ class PackageDef(BaseModel):
                 
             if not hasattr(mod, clsname):
                 raise Exception("Class %s not found in module %s" % (clsname, modname))
-            task_ctor = getattr(mod, clsname)
-
-            # Determine if we need to use a new 
-
-            if task.uses is not None:
-                uses = self.getTaskCtor(session, task.uses, tasks_m)
-            else:
-                uses = None
+            callable = getattr(mod, clsname)
 
-            ctor_t = TaskCtorCls(
+        # Determine if we need to use a new 
+        paramT = self._getParamT(task, base_params)
+        
+        if callable is not None:
+            ctor_t = TaskNodeCtorTask(
                 name=task.name,
-                uses=uses,
-                task_ctor=task_ctor,
-                srcdir=srcdir)
-        elif task.uses is not None:
+                srcdir=srcdir,
+                paramT=paramT, # TODO: need to determine the parameter type
+                needs=needs, # TODO: need to determine the needs
+                task=callable)
+        elif base_ctor_t is not None:
             # Use the existing (base) to create the implementation
-            ctor_t = TaskCtor(
+            ctor_t = TaskNodeCtorProxy(
                 name=task.name,
-                uses=self.getTaskCtor(session, task.uses, tasks_m),
-                srcdir=srcdir)
+                srcdir=srcdir,
+                paramT=paramT, # TODO: need to determine the parameter type
+                needs=needs,
+                uses=base_ctor_t)
         else:
             self._log.debug("Use 'Null' as the class implementation")
             ctor_t = TaskCtorCls(
@@ -272,11 +267,77 @@ class PackageDef(BaseModel):
                 task_ctor=TaskNull,
                 srcdir=srcdir)
 
-        ctor_t = self.handleParams(task, ctor_t)
-        ctor_t.depends.extend(task.depends)
+# TODO:
+#        ctor_t = self.handleParams(task, ctor_t)
+#        ctor_t.depends.extend(task.depends)
 
         self._log.debug("<-- %s::mkTaskCtor %s" % (self.name, task.name))
         return ctor_t
+    
+    def _getParamT(self, task, base_t : BaseModel):
+        # Get the base parameter type (if available)
+        # We will build a new type with updated fields
+
+        ptype_m = {
+            "str" : str,
+            "int" : int,
+            "float" : float,
+            "bool" : bool,
+            "list" : List
+        }
+        pdflt_m = {
+            "str" : "",
+            "int" : 0,
+            "float" : 0.0,
+            "bool" : False,
+            "list" : []
+        }
+
+        fields = []
+        field_m : Dict[str,int] = {}
+
+        # First, pull out existing fields (if there's a base type)
+        if base_t is not None:
+            self._log.debug("Base type: %s" % str(base_t))
+            for name,f in base_t.model_fields.items():
+                ff : dc.Field = f
+                fields.append(f)
+                field_m[name] = (f.annotation, getattr(base_t, name))
+        else:
+            self._log.debug("No base type")
+
+        for p in task.params.keys():
+            param = task.params[p]
+            self._log.debug("param: %s %s (%s)" % (p, str(param), str(type(param))))
+            if hasattr(param, "type") and param.type is not None:
+                ptype_s = param.type
+                if ptype_s not in ptype_m.keys():
+                    raise Exception("Unknown type %s" % ptype_s)
+                ptype = ptype_m[ptype_s]
+
+                if p in field_m.keys():
+                    raise Exception("Duplicate field %s" % p)
+                if param.value is not None:
+                    field_m[p] = (ptype, param.value)
+                else:
+                    field_m[p] = (ptype, pdflt_m[ptype_s])
+                self._log.debug("Set param=%s to %s" % (p, str(field_m[p][1])))
+            else:
+                if p not in field_m.keys():
+                    raise Exception("Field %s not found" % p)
+                if type(param) != dict:
+                    value = param
+                elif "value" in param.keys():
+                    value = param["value"]
+                else:
+                    raise Exception("No value specified for param %s: %s" % (
+                        p, str(param)))
+                field_m[p] = (field_m[p][0], value)
+                self._log.debug("Set param=%s to %s" % (p, str(field_m[p][1])))
+
+        params_t = pydantic.create_model("Task%sParams" % task.name, **field_m)
+
+        return params_t
 
     @staticmethod
     def load(path, exp_pkg_name=None):

dv_flow_mgr-0.0.1.13644197178a1/src/dv_flow/mgr/param.py

@@ -0,0 +1,20 @@
+
+from pydantic import BaseModel
+import pydantic.dataclasses as pdc
+from typing import Any, List, Union
+
+class ParamMeta(type):
+    def __getitem__(self, T):
+        ret = Union[T, Param]
+        return ret
+
+class ParamT(metaclass=ParamMeta):
+    pass
+
+class Param(BaseModel):
+    append : Union[Any,List] = pdc.Field(default=None)
+    prepend : Union[Any,List] = pdc.Field(default=None)
+    append_path : Union[Any,List] = pdc.Field(default=None, alias="append-path")
+    prepend_path : Union[Any,List] = pdc.Field(default=None, alias="prepend-path")
+
+

{dv_flow_mgr-0.0.1.13551739897a1 → dv_flow_mgr-0.0.1.13644197178a1}/src/dv_flow/mgr/param_def.py

@@ -14,7 +14,6 @@ class ComplexType(BaseModel):
     map : Union[MapType, None] = None
 
 class ParamDef(BaseModel):
-    name : str
     doc : str = None
     type : Union[str, 'ComplexType'] = None
     value : Union[Any, None] = None

{dv_flow_mgr-0.0.1.13551739897a1 → dv_flow_mgr-0.0.1.13644197178a1}/src/dv_flow/mgr/param_ref_eval.py

@@ -7,8 +7,8 @@ from .eval_jq import eval_jq
 @dc.dataclass
 class ParamRefEval(object):
 
-    parser : ExprParser = ExprParser()
-    expr_eval : ExprEval = ExprEval()
+    parser : ExprParser = dc.field(default_factory=ExprParser)
+    expr_eval : ExprEval = dc.field(default_factory=ExprEval)
 
     def __post_init__(self):
         self.expr_eval.methods["jq"] = eval_jq
@@ -26,12 +26,9 @@ class ParamRefEval(object):
                     raise Exception("unterminated variable ref")
                 
                 ref = val[idx+3:eidx].strip()
-                print("ref: %s" % ref)
 
                 expr_ast = self.parser.parse(ref)
-                print("expr_ast: %s" % str(expr_ast))
                 exp_val = self.expr_eval.eval(expr_ast)
-                print("exp_val: %s" % str(exp_val))
 
                 # Replacing [idx..eidx+2] with len(exp_val)
                 val = val[:idx] + exp_val + val[eidx+2:]

{dv_flow_mgr-0.0.1.13551739897a1 → dv_flow_mgr-0.0.1.13644197178a1}/src/dv_flow/mgr/task_def.py

@@ -35,11 +35,11 @@ class TaskDef(BaseModel):
     name : str
 #    type : Union[str,TaskSpec] = dc.Field(default_factory=list)
     uses : str = dc.Field(default=None)
-    pyclass : str = dc.Field(default=None)
+    pytask : str = dc.Field(default=None)
     desc : str = dc.Field(default="")
     doc : str = dc.Field(default="")
-    depends : List[Union[str,TaskSpec]] = dc.Field(default_factory=list, alias="needs")
-    params: List[ParamDef] = dc.Field(default_factory=list, alias="with")
+    needs : List[Union[str,TaskSpec]] = dc.Field(default_factory=list, alias="needs")
+    params: Dict[str,Union[str,ParamDef]] = dc.Field(default_factory=dict, alias="with")
 #    out: List[TaskOutput] = dc.Field(default_factory=list)
 
     def copy(self) -> 'TaskDef':

{dv_flow_mgr-0.0.1.13551739897a1 → dv_flow_mgr-0.0.1.13644197178a1}/src/dv_flow/mgr/task_graph_builder.py

@@ -96,20 +96,26 @@ class TaskGraphBuilder(object):
 
         self._logger.debug("ctor_t: %s" % ctor_t.name)
 
-        depends = []
+        needs = []
 
-        for dep in ctor_t.depends:
-            if not dep in self._task_m.keys():
-                task = self._mkTaskGraph(dep, rundir)
-                self._task_m[dep] = task
-                pass
-            depends.append(self._task_m[dep])
+        # for dep in ctor_t.depends:
+        #     if not dep in self._task_m.keys():
+        #         task = self._mkTaskGraph(dep, rundir)
+        #         self._task_m[dep] = task
+        #         pass
+        #     depends.append(self._task_m[dep])
 
         # The returned task should have all param references resolved
-        task = ctor_t.mkTask(
+        params = ctor_t.mkTaskParams()
+
+        if params is None:
+            raise Exception("ctor %s returned None for params" % str(ctor_t))
+
+        task = ctor_t.mkTaskNode(
+            params=params,
             name=task_name,
-            depends=depends,
-            rundir=rundir)
+            needs=needs)
+        task.rundir = rundir
         
         self._task_m[task.name] = task