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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.13551739897a1
+Version: 0.0.1.13577785562a1
 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.13577785562a1}/docs/Steps.md

@@ -105,10 +105,14 @@ 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: 
 
 

dv_flow_mgr-0.0.1.13577785562a1/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.13577785562a1}/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.13577785562a1"
 dependencies = [
     'pydantic',
     'pyyaml',

{dv_flow_mgr-0.0.1.13551739897a1 → dv_flow_mgr-0.0.1.13577785562a1}/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.13577785562a1}/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.13577785562a1/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.13577785562a1}/src/dv_flow/mgr/param_ref_eval.py

@@ -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.13577785562a1}/src/dv_flow/mgr/task_node.py

@@ -6,6 +6,7 @@ from typing import Any, Callable, ClassVar, Dict, List
 from .task_data import TaskDataInput, TaskDataOutput, TaskDataResult
 from .task_params_ctor import TaskParamsCtor
 from .param_ref_eval import ParamRefEval
+from .param import Param
 
 @dc.dataclass
 class TaskNode(object):
@@ -45,16 +46,19 @@ class TaskNode(object):
 
         eval.setVar("in", in_params)
 
-#        for attr in dir(self.params):
-#            if not attr.startswith("_"):
-#                print("Attr: %s" % attr)
         for name,field in self.params.model_fields.items():
             value = getattr(self.params, name)
-            print("Field: %s %s" % (name, str(value)))
-            if value.find("${{") != -1:
-                new_val = eval.eval(value)
-                setattr(self.params, name, new_val)
-            pass
+            if type(value) == str:
+                if value.find("${{") != -1:
+                    new_val = eval.eval(value)
+                    setattr(self.params, name, new_val)
+            elif isinstance(value, list):
+                for i,elem in enumerate(value):
+                    if elem.find("${{") != -1:
+                        new_val = eval.eval(elem)
+                        value[i] = new_val
+            else:
+                raise Exception("Unhandled param type: %s" % str(value))
 
         input = TaskDataInput(
             changed=changed,
@@ -83,12 +87,6 @@ class TaskNode(object):
     def __hash__(self):
         return id(self)
     
-@staticmethod
-def task(paramT):
-    def wrapper(T):
-        ctor = TaskNodeCtorWrapper(T.__name__, T, paramT)
-        return ctor
-    return wrapper
 
 @dc.dataclass
 class TaskNodeCtor(object):
@@ -99,7 +97,6 @@ class TaskNodeCtor(object):
     """
     name : str
 
-
     def mkTaskNode(self, srcdir, params, name=None) -> TaskNode:
         raise NotImplementedError("mkTaskNode in type %s" % str(type(self)))
 
@@ -140,5 +137,25 @@ class TaskNodeCtorWrapper(TaskNodeCtor):
                     str(type(obj)),
                     key))
             else:
-                setattr(obj, key, value)
+                if isinstance(value, Param):
+                    if value.append is not None:
+                        ex_value = getattr(obj, key, [])
+                        ex_value.extend(value.append)
+                        setattr(obj, key, ex_value)
+                    elif value.prepend is not None:
+                        ex_value = getattr(obj, key, [])
+                        value = value.copy()
+                        value.extend(ex_value)
+                        setattr(obj, key, value)
+                        pass
+                    else:
+                        raise Exception("Unhandled value spec: %s" % str(value))
+                else:
+                    setattr(obj, key, value)
         return obj
+
+def task(paramT):
+    def wrapper(T):
+        ctor = TaskNodeCtorWrapper(T.__name__, T, paramT)
+        return ctor
+    return wrapper

{dv_flow_mgr-0.0.1.13551739897a1 → dv_flow_mgr-0.0.1.13577785562a1}/src/dv_flow_mgr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.13551739897a1
+Version: 0.0.1.13577785562a1
 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.13577785562a1}/src/dv_flow_mgr.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 .gitignore
 LICENSE
 README.md
+fwperiph_dma.pss
 ivpm.yaml
 pyproject.toml
 .github/workflows/ci.yml
@@ -31,6 +32,7 @@ src/dv_flow/mgr/out
 src/dv_flow/mgr/package.py
 src/dv_flow/mgr/package_def.py
 src/dv_flow/mgr/package_import_spec.py
+src/dv_flow/mgr/param.py
 src/dv_flow/mgr/param_def.py
 src/dv_flow/mgr/param_ref_eval.py
 src/dv_flow/mgr/parsetab.py

{dv_flow_mgr-0.0.1.13551739897a1 → dv_flow_mgr-0.0.1.13577785562a1}/tests/unit/test_pytask_smoke.py

@@ -1,10 +1,14 @@
 import asyncio
 import pytest
+from typing import List, Union
 import dataclasses as dc
+import pydantic.dataclasses as pdc
 from pydantic import BaseModel
+from dv_flow.mgr.param import Param, ParamT
 from dv_flow.mgr.task import Task
 from dv_flow.mgr.task_data import TaskDataResult, TaskMarker, TaskParameterSet
 from dv_flow.mgr.task_node import task as t_decorator
+from dv_flow.mgr.task_node import task
 from dv_flow.mgr.task_runner import SingleTaskRunner, TaskSetRunner
 
 
@@ -138,4 +142,98 @@ def test_smoke_4(tmpdir):
 
     assert len(called) == 3
     assert called[-1][0] == "MyTask3"
-    assert called[-1][1] == "[1, 2]"
+    assert called[-1][1] == "[1, 2]"
+
+def test_smoke_5(tmpdir):
+
+    class Params(BaseModel):
+        p1 : ParamT[List[str]] = pdc.Field(default_factory=list)
+
+    class TaskData(TaskParameterSet):
+        files : ParamT[List[str]] = pdc.Field(default_factory=list)
+
+    called = []
+
+    @task(Params)
+    async def MyTask1(runner, input):
+            nonlocal called
+            called.append(("MyTask1", input.params.p1))
+            return TaskDataResult(
+                  output=[TaskData(files=["f1", "f2", "f3"])]
+            )
+
+    @task(Params)
+    async def MyTask2(runner, input):
+            nonlocal called
+            called.append(("MyTask2", input.params.p1))
+            return TaskDataResult(
+                  output=[TaskData(files=["f4", "f5", "f6"])]
+            )
+
+    @task(Params)
+    async def MyTask3(runner, input):
+            nonlocal called
+            called.append(("MyTask3", input.params.p1))
+            return TaskDataResult()
+
+    task1 = MyTask1("srcdir", p1="1")
+    task2 = MyTask2("srcdir", p1="2")
+    task3 = MyTask3("srcdir", 
+                    p1="${{ in | jq('[.[] .files]') | jq('flatten') }}", 
+#                    p1="${{ in | jq('.[] .files') }}", 
+                    needs=[task1, task2])
+    runner = TaskSetRunner("rundir")
+
+    result = asyncio.run(runner.run(task3))
+
+    assert len(called) == 3
+    assert called[-1][0] == "MyTask3"
+    assert called[-1][1] == '["f1", "f2", "f3", "f4", "f5", "f6"]'
+
+def test_smoke_6(tmpdir):
+
+    class Params(BaseModel):
+        p1 : ParamT[List[str]] = pdc.Field(default=["1","2"])
+
+    class TaskData(TaskParameterSet):
+        files : ParamT[List[str]] = pdc.Field(default_factory=list)
+
+    called = []
+
+    @task(Params)
+    async def MyTask1(runner, input):
+            nonlocal called
+            called.append(("MyTask1", input.params.p1))
+            return TaskDataResult(
+                  output=[TaskData(files=["f1", "f2", "f3"])]
+            )
+
+    @task(Params)
+    async def MyTask2(runner, input):
+            nonlocal called
+            called.append(("MyTask2", input.params.p1))
+            return TaskDataResult(
+                  output=[TaskData(files=["f4", "f5", "f6"])]
+            )
+
+    @task(Params)
+    async def MyTask3(runner, input):
+            nonlocal called
+            called.append(("MyTask3", input.params.p1))
+            return TaskDataResult()
+
+    task1 = MyTask1("srcdir", p1="3")
+    task2 = MyTask2("srcdir", p1=Param(append=["4"]))
+    task3 = MyTask3("srcdir", 
+                    p1="${{ in | jq('[.[] .files]') | jq('flatten') }}", 
+#                    p1="${{ in | jq('.[] .files') }}", 
+                    needs=[task1, task2])
+    runner = TaskSetRunner("rundir")
+
+    result = asyncio.run(runner.run(task3))
+
+    assert len(called) == 3
+    assert called[1][0] == "MyTask2"
+    assert called[1][1] == ["1", "2", "4"]
+    assert called[-1][0] == "MyTask3"
+    assert called[-1][1] == '["f1", "f2", "f3", "f4", "f5", "f6"]'