dv-flow-mgr 1.7.14886019138rc0__py3-none-any.whl → 1.8.14920283751rc0__py3-none-any.whl

dv_flow/mgr/__init__.py

@@ -31,7 +31,7 @@ from .task_node_ctor_wrapper import task
 from .task_runner import TaskSetRunner
 from .task_listener_log import TaskListenerLog
 
-VERSION="1.7.0"
-SUFFIX="14886019138rc0"
+VERSION="1.8.0"
+SUFFIX="14920283751rc0"
 __version__="%s%s" % (VERSION, SUFFIX)
 

dv_flow/mgr/cmds/cmd_run.py

@@ -28,6 +28,7 @@ from ..task_data import SeverityE
 from ..task_graph_builder import TaskGraphBuilder
 from ..task_runner import TaskSetRunner
 from ..task_listener_log import TaskListenerLog
+from ..task_listener_trace import TaskListenerTrace
 
 
 class CmdRun(object):
@@ -98,7 +99,14 @@ class CmdRun(object):
         if args.j != -1:
             runner.nproc = int(args.j)
 
+        if not os.path.isdir(os.path.join(rundir, "log")):
+            os.makedirs(os.path.join(rundir, "log"))
+        
+        fp = open(os.path.join(rundir, "log", "%s.trace.json" % pkg.name), "w")
+        trace = TaskListenerTrace(fp)
+
         runner.add_listener(listener.event)
+        runner.add_listener(trace.event)
 
         tasks = []
 
@@ -110,6 +118,9 @@ class CmdRun(object):
 
         asyncio.run(runner.run(tasks))
 
+        trace.close()
+        fp.close()
+
         return runner.status
 
 

dv_flow/mgr/task_listener_trace.py

@@ -0,0 +1,160 @@
+import dataclasses as dc
+import json
+import time
+from typing import Dict, List, TextIO
+from .task_node import TaskNode
+
+@dc.dataclass
+class TaskListenerTrace(object):
+    """Task listener that generates Google Trace Event Format output."""
+    
+    fp: TextIO  # File to write trace events to
+    _free_tids: List = dc.field(default_factory=list)  # Pool of available thread IDs
+    _task_tid_map: Dict = dc.field(default_factory=dict)  # Map of tasks to their assigned thread IDs
+    _next_tid: int = dc.field(default=1)  # Next thread ID to assign if pool is empty
+    _next_flow_id: int = dc.field(default=1)  # Counter for unique flow IDs
+    _events: List = dc.field(default_factory=list)  # Store events in memory
+    
+    def __post_init__(self):
+        # Add metadata event
+        self._events.append({
+            "name": "metadata",
+            "ph": "M",
+            "pid": 1,
+            "tid": 0,
+            "args": {
+                "name": "Task Execution",
+                "timeUnit": "us"
+            }
+        })
+
+    def close(self):
+        """Write the complete trace file and close it."""
+        trace = {
+            "traceEvents": self._events,
+            "displayTimeUnit": "ms"  # Show times in milliseconds in the viewer
+        }
+        json.dump(trace, self.fp, indent=2)
+        self.fp.flush()
+        
+    def _get_tid(self, task: TaskNode) -> int:
+        """Get a thread ID for a task, either from the pool or creating a new one."""
+        if task in self._task_tid_map:
+            return self._task_tid_map[task]
+            
+        if len(self._free_tids) > 0:
+            tid = self._free_tids.pop()
+        else:
+            tid = self._next_tid
+            self._next_tid += 1
+            
+        self._task_tid_map[task] = tid
+        return tid
+        
+    def _release_tid(self, task: TaskNode):
+        """Return a task's thread ID to the pool."""
+        if task in self._task_tid_map:
+            tid = self._task_tid_map[task]
+            del self._task_tid_map[task]
+            self._free_tids.append(tid)
+
+    def event(self, task: TaskNode, reason: str):
+        """Record a task execution event.
+        
+        Args:
+            task: The task that generated the event
+            reason: Either 'enter' or 'leave' marking start/end of task execution
+        """
+        # Get/create thread ID for this task
+        tid = self._get_tid(task)
+        
+        # Map the event type
+        ph = 'B' if reason == 'enter' else 'E'
+            
+        # Get current timestamp in microseconds
+        ts = int(time.time() * 1_000_000) if reason == "enter" else int(task.end.timestamp() * 1_000_000)
+
+        # Create the duration event
+        event = {
+            "name": task.name,
+            "cat": "task",
+            "ph": ph, 
+            "pid": 1,
+            "tid": tid,
+            "ts": ts
+        }
+
+        # Store the duration event
+        self._events.append(event)
+
+        if reason == "enter":
+            # When a task starts, create flow events from all its dependencies
+            for need, _ in task.needs:
+                flow_id = self._next_flow_id
+                self._next_flow_id += 1
+
+                # # Add flow end event connecting to this task
+                # flow_end = {
+                #     "name": f"{need.name} -> {task.name}",
+                #     "cat": "flow",
+                #     "ph": "e",  # Flow end
+                #     "pid": 1,
+                #     "tid": tid,  # Target task's thread
+                #     "ts": ts,
+                #     "id": flow_id,
+                #     "bp": "e"  # Connect to enclosing slice
+                # }
+                # self._events.append(flow_end)
+
+                # # Add flow start event from dependency
+                # flow_start = {
+                #     "name": f"{need.name} -> {task.name}",
+                #     "cat": "flow",
+                #     "ph": "b",  # Flow begin
+                #     "pid": 1,
+                #     "tid": self._task_tid_map.get(need, 0),  # Source task's thread
+                #     "ts": int(need.end.timestamp() * 1_000_000) if need.end else ts,
+                #     "id": flow_id,
+                #     "bp": "e"  # Connect to enclosing slice
+                # }
+                # self._events.append(flow_start)
+
+        elif reason == 'leave':
+            # For completed tasks, emit flow start events
+            if task.result:
+                event["args"] = {
+                    "status": task.result.status,
+                    "changed": task.result.changed
+                }
+
+                # Find any tasks that depend on this one and create flow events
+                for dep_task, dep_tid in self._task_tid_map.items():
+                    if any(need[0] is task for need in dep_task.needs):
+                        # # Create flow start event
+                        # flow = {
+                        #     "name": f"{task.name} -> {dep_task.name}",
+                        #     "cat": "flow",
+                        #     "ph": "s",  # Flow start
+                        #     "pid": 1,
+                        #     "tid": tid,  # Source task's thread
+                        #     "ts": ts,  # Use task end time
+                        #     "id": self._next_flow_id,
+                        #     "bp": "e"  # Connect to enclosing slice
+                        # }
+                        # self._events.append(flow)
+
+                        # # Create flow end event
+                        # flow_end = {
+                        #     "name": f"{task.name} -> {dep_task.name}",
+                        #     "cat": "flow",
+                        #     "ph": "f",  # Flow finish
+                        #     "pid": 1,
+                        #     "tid": dep_tid,  # Target task's thread
+                        #     "ts": ts,  # Will be updated when target task starts
+                        #     "id": self._next_flow_id,
+                        #     "bp": "e"  # Connect to enclosing slice
+                        # }
+                        # self._events.append(flow_end)
+                        self._next_flow_id += 1
+
+            self._release_tid(task)

dv_flow/mgr/task_node.py

@@ -24,6 +24,7 @@ import json
 import os
 import sys
 import dataclasses as dc
+import datetime
 import pydantic.dataclasses as pdc
 import logging
 import toposort
@@ -55,8 +56,8 @@ class TaskNode(object):
     rundir : List[str] = dc.field(default=None)
     output : TaskDataOutput = dc.field(default=None)
     result : TaskDataResult = dc.field(default=None)
-    start : float = dc.field(default=None)
-    end : float = dc.field(default=None)
+    start : datetime.datetime = dc.field(default=None)
+    end : datetime.datetime = dc.field(default=None)
     save_exec_data : bool = dc.field(default=True)
     iff : bool = dc.field(default=True)
     parent : 'TaskNode' = dc.field(default=None)

{dv_flow_mgr-1.7.14886019138rc0.dist-info → dv_flow_mgr-1.8.14920283751rc0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 1.7.14886019138rc0
+Version: 1.8.14920283751rc0
 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-1.7.14886019138rc0.dist-info → dv_flow_mgr-1.8.14920283751rc0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-dv_flow/mgr/__init__.py,sha256=IGdCSIE1H9oiKxdBHCoep36ZQbA0PNZeiF-QVlXh3gQ,1315
+dv_flow/mgr/__init__.py,sha256=NUUQLnpk4-yjT3DaUH9ugThEF8n1nqhlzLs6YW9zLHU,1315
 dv_flow/mgr/__main__.py,sha256=BogNdBkXhgg05E8_IumNkVoag6WwvfbpiI8346oOtPo,3844
 dv_flow/mgr/cond_def.py,sha256=2ZkzPusqVkN1fFMTvkDl9O_OJLPdD_cK3xzX9J75RMw,343
 dv_flow/mgr/config.py,sha256=b2MVlVVNB0psk8x4bQRAYshkpNJrtyMtV1Ymhmx9AfM,137
@@ -37,7 +37,8 @@ dv_flow/mgr/task_def.py,sha256=8NPwtTROfWDkMqcO9mKXV4dw0sC4mCMmnsNuv8uTdTY,5094
 dv_flow/mgr/task_graph_builder.py,sha256=q7BS7OLYkS6uZwQLvo6P_CtJkhIvPal_tXLZHgUuLpU,28172
 dv_flow/mgr/task_graph_dot_writer.py,sha256=qK4Imy9o2_F1aKoU1tJ-qoBHslq2BhSMbdjAUPfpN7I,6009
 dv_flow/mgr/task_listener_log.py,sha256=Ai-6X5BOoGsaNTgnlXEW0-czrjJm7__ShNK501CUmko,4337
-dv_flow/mgr/task_node.py,sha256=3L1qqwisV_qRdbUdRG25uzcsO57T2Z7fbvXYF87Ta1U,5191
+dv_flow/mgr/task_listener_trace.py,sha256=76Fqb7hiAT2GH8_-_bMRAl6T2lrTly6sP1Zis6BG3wU,6192
+dv_flow/mgr/task_node.py,sha256=OC3rkeRSFv9wmgkMZ_7eJu7nuXGJcwW_b6FGQM-w7AU,5231
 dv_flow/mgr/task_node_compound.py,sha256=0biBPT_2SpCPJL7DFaFY27_K7kNxJ1taIut3Fv12HXk,3347
 dv_flow/mgr/task_node_ctor.py,sha256=YsoVMX5WbpbzcHvEK7ps_ZRV-J7MZ3F8NNozQw7vbog,4418
 dv_flow/mgr/task_node_ctor_compound.py,sha256=290JdcTnL3b3Gv7s_wRLjdM02ezKhc9QnxZE0mv72i8,4379
@@ -56,7 +57,7 @@ dv_flow/mgr/type.py,sha256=hoJTatlPC0yOazKSWduK-5CfY38RPkc6qXFzOCcVSdM,723
 dv_flow/mgr/type_def.py,sha256=4sge3PibO1jDnS0cXdX0PiurcKbDA3kT6rb4DGIKwEM,1176
 dv_flow/mgr/yaml_srcinfo_loader.py,sha256=29BNRiB8Hj1FepkrLtdjHSv5U_85Q432gBeeK80nKEA,1606
 dv_flow/mgr/cmds/cmd_graph.py,sha256=yg5KbNrGvm3dySiI0Qei_pMWZkOE9GtEyaQ4IdNVmoE,2852
-dv_flow/mgr/cmds/cmd_run.py,sha256=J53JJnUPn9yLDFHFv_DJdnZR2qMvbhsGWY8APHoVtWE,3707
+dv_flow/mgr/cmds/cmd_run.py,sha256=SsCZXwutJW1XT5iXtJqvdeg6p6HEa86V5hELNKuaWgA,4082
 dv_flow/mgr/cmds/cmd_show.py,sha256=JOIFaVXt8YCf9bKXfq6qzV5wQdxdLHqE-yCj0ecGREs,3755
 dv_flow/mgr/share/flow.json,sha256=lNmZex9NXkYbyb2aZseQfUOkV9CMyfH0iLODEI7EPBw,5096
 dv_flow/mgr/std/create_file.py,sha256=SEpKTQdiY32002C7b4kYfAiK9v_xajixOJU5WftW75I,2957
@@ -73,9 +74,9 @@ dv_flow/mgr/util/util.py,sha256=BO7iqP_c9ttmXkojq7nKDN-g8wl1_Pco9k-KnrXxjwE,1889
 dv_flow/mgr/util/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dv_flow/mgr/util/cmds/cmd_schema.py,sha256=IJzZdxCSEgIQ79LpYiM7UqJ9RJ-7yraqmBN2XVgAgXA,1752
 dv_flow/mgr/util/cmds/cmd_workspace.py,sha256=egmaIXpe5L-TePwmcfisfrG6tdiTUWSjqa9Za5WChVs,890
-dv_flow_mgr-1.7.14886019138rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-1.7.14886019138rc0.dist-info/METADATA,sha256=BdTQJ9Wt87mId9RnZiwCzqIYuHtedmHd8zGNmMykNDc,13335
-dv_flow_mgr-1.7.14886019138rc0.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-dv_flow_mgr-1.7.14886019138rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-1.7.14886019138rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-1.7.14886019138rc0.dist-info/RECORD,,
+dv_flow_mgr-1.8.14920283751rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.8.14920283751rc0.dist-info/METADATA,sha256=CeTzqO-0eYhSYkg9hMV97sS0lr_W_2gulAFrOH5wy_4,13335
+dv_flow_mgr-1.8.14920283751rc0.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+dv_flow_mgr-1.8.14920283751rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.8.14920283751rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.8.14920283751rc0.dist-info/RECORD,,