fb84d47e-a3e9-4303-b1fd-3f93f383bf69

Committed 06 Jun 2024 03:17PM UTC coverage: 79.902% (-4.9%) from 84.82%

Build # fb84d47e-a3e9-4303-b1fd-3f93f383bf69

Build Type

push

circleci

Committed by

Nic30

Commit Message

feat: use hwt RtlNetlistPass class

Run Details

581 of 784 branches covered (74.11%)

Branch coverage included in aggregate %.

30 of 30 new or added lines in 3 files covered. (100.0%)

72 existing lines in 2 files now uncovered.

1367 of 1654 relevant lines covered (82.65%)

0.83 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

89.58

/hwtGraph/elk/containers/lEdge.py

from typing import List

from hwt.synthesizer.componentPath import ComponentPath
from hwtGraph.elk.containers.constants import PortType


class LEdge():
    """
    Edge in layout graph

    :ivar ~.parentNode: parent node instance
    :ivar ~.name: name of this edge (label)
    :ivar ~.originObj: optional object which was this edge generated for
    :ivar ~.srcs: list of LPort instances where this edge starts
    :ivar ~.dsts: list of LPort instances where this edge ends
    """

    def __init__(self, parentNode: "LNode", srcs: List["LPort"], dsts: List["LPort"],
                 name: str=None, originObj=None):
        self.parentNode = parentNode
        if name is not None:
            assert isinstance(name, str)

        self.name = name
        self.originObj = originObj

        assert isinstance(srcs, list) and len(srcs) >= 1, originObj
        assert isinstance(dsts, list) and len(dsts) >= 1, originObj

        self.srcs = []
        self.dsts = []
        for src in srcs:
            self.addSource(src, addToSrc=False)
        self.srcs = srcs

        for dst in dsts:
            self.addTarget(dst, addToDst=False)
        self.dsts = dsts

    def removeTarget(self, dst: "LPort"):
        self.dsts.remove(dst)
        dst.incomingEdges.remove(self)

    def addTarget(self, dst: "LPort", addToDst=True):
        if self.parentNode is dst.parentNode:
            # connection between input and output on nodes with same parent
            assert dst.direction == PortType.OUTPUT, dst
        elif self.parentNode.parent is dst.parentNode:
            # target is parent output port
            assert dst.direction == PortType.INPUT, dst
        else:
            # target is child input port
            assert self.parentNode is dst.parentNode.parent, dst
            assert dst.direction == PortType.INPUT, dst

        if addToDst:
            self.dsts.append(dst)
        dst.incomingEdges.append(self)

    def removeSource(self, src: "LPort"):
        self.srcs.remove(src)
        src.outgoingEdges.remove(self)

    def addSource(self, src: "LPort", addToSrc=True):
        if self.parentNode is src.parentNode:
            # connection between input and output on nodes with same parent
            assert src.direction == PortType.INPUT, src
        elif self.parentNode.parent is src.parentNode:
            # source is parent input port
            assert src.direction == PortType.INPUT, src
        else:
            # source is child output port
            assert self.parentNode is src.parentNode.parent, src
            assert src.direction == PortType.OUTPUT, src
        if addToSrc:
            self.srcs.append(src)
        src.outgoingEdges.append(self)

    def remove(self):
        for dst in self.dsts:
            dst.incomingEdges.remove(self)
        for src in self.srcs:
            src.outgoingEdges.remove(self)
        self.srcs.clear()
        self.dsts.clear()

    def toElkJson(self, idStore, path_prefix: ComponentPath):
        def getId(o):
            k = path_prefix / o
            return str(idStore[k])
        if len(self.dsts) > 1 or len(self.srcs) > 1:
            # hyperedge
            d = {
                "sources": [(getId(src.parentNode),
                             getId(src)) for src in self.srcs],
                "targets": [(getId(dst.parentNode),
                             getId(dst)) for dst in self.dsts],
            }
        else:
            # regular edge
            src = self.srcs[0]
            dst = self.dsts[0]
            d = {
                "source": getId(src.parentNode),
                "sourcePort": getId(src),
                "target": getId(dst.parentNode),
                "targetPort": getId(dst),
            }
        d["id"] = getId(self)
        name = self.name
        if name is None and self.originObj is not None:
            name = repr(self.originObj)
        d["hwMeta"] = {"name": name}

        return d

    def __repr__(self):
        return f"<{self.__class__.__name__:s}, {self.srcs} -> {self.dsts}>"

1	from typing import List	1✔
2
3	from hwt.synthesizer.componentPath import ComponentPath	1✔
4	from hwtGraph.elk.containers.constants import PortType	1✔
5
6
7	class LEdge():	1✔
8	"""
9	Edge in layout graph
10
11	:ivar ~.parentNode: parent node instance
12	:ivar ~.name: name of this edge (label)
13	:ivar ~.originObj: optional object which was this edge generated for
14	:ivar ~.srcs: list of LPort instances where this edge starts
15	:ivar ~.dsts: list of LPort instances where this edge ends
16	"""
17
18	def __init__(self, parentNode: "LNode", srcs: List["LPort"], dsts: List["LPort"],	1✔
19	name: str=None, originObj=None):
20	self.parentNode = parentNode	1✔
21	if name is not None:	1✔
22	assert isinstance(name, str)	1✔
23
24	self.name = name	1✔
25	self.originObj = originObj	1✔
26
27	assert isinstance(srcs, list) and len(srcs) >= 1, originObj	1✔
28	assert isinstance(dsts, list) and len(dsts) >= 1, originObj	1✔
29
30	self.srcs = []	1✔
31	self.dsts = []	1✔
32	for src in srcs:	1✔
33	self.addSource(src, addToSrc=False)	1✔
34	self.srcs = srcs	1✔
35
36	for dst in dsts:	1✔
37	self.addTarget(dst, addToDst=False)	1✔
38	self.dsts = dsts	1✔
39
40	def removeTarget(self, dst: "LPort"):	1✔
41	self.dsts.remove(dst)	1✔
42	dst.incomingEdges.remove(self)	1✔
43
44	def addTarget(self, dst: "LPort", addToDst=True):	1✔
45	if self.parentNode is dst.parentNode:	1✔
46	# connection between input and output on nodes with same parent
47	assert dst.direction == PortType.OUTPUT, dst	1✔
48	elif self.parentNode.parent is dst.parentNode:	1!
49	# target is parent output port
50	assert dst.direction == PortType.INPUT, dst	×
51	else:
52	# target is child input port
53	assert self.parentNode is dst.parentNode.parent, dst	1✔
54	assert dst.direction == PortType.INPUT, dst	1✔
55
56	if addToDst:	1!
UNCOV 57	self.dsts.append(dst)	×
58	dst.incomingEdges.append(self)	1✔
59
60	def removeSource(self, src: "LPort"):	1✔
61	self.srcs.remove(src)	×
62	src.outgoingEdges.remove(self)	×
63
64	def addSource(self, src: "LPort", addToSrc=True):	1✔
65	if self.parentNode is src.parentNode:	1✔
66	# connection between input and output on nodes with same parent
67	assert src.direction == PortType.INPUT, src	1✔
68	elif self.parentNode.parent is src.parentNode:	1!
69	# source is parent input port
70	assert src.direction == PortType.INPUT, src	×
71	else:
72	# source is child output port
73	assert self.parentNode is src.parentNode.parent, src	1✔
74	assert src.direction == PortType.OUTPUT, src	1✔
75	if addToSrc:	1!
76	self.srcs.append(src)	×
77	src.outgoingEdges.append(self)	1✔
78
79	def remove(self):	1✔
80	for dst in self.dsts:	1✔
81	dst.incomingEdges.remove(self)	1✔
82	for src in self.srcs:	1✔
83	src.outgoingEdges.remove(self)	1✔
84	self.srcs.clear()	1✔
85	self.dsts.clear()	1✔
86
87	def toElkJson(self, idStore, path_prefix: ComponentPath):	1✔
88	def getId(o):	1✔
89	k = path_prefix / o	1✔
90	return str(idStore[k])	1✔
91	if len(self.dsts) > 1 or len(self.srcs) > 1:	1✔
92	# hyperedge
93	d = {	1✔
94	"sources": [(getId(src.parentNode),
95	getId(src)) for src in self.srcs],
96	"targets": [(getId(dst.parentNode),
97	getId(dst)) for dst in self.dsts],
98	}
99	else:
100	# regular edge
101	src = self.srcs[0]	1✔
102	dst = self.dsts[0]	1✔
103	d = {	1✔
104	"source": getId(src.parentNode),
105	"sourcePort": getId(src),
106	"target": getId(dst.parentNode),
107	"targetPort": getId(dst),
108	}
109	d["id"] = getId(self)	1✔
110	name = self.name	1✔
111	if name is None and self.originObj is not None:	1✔
112	name = repr(self.originObj)	1✔
113	d["hwMeta"] = {"name": name}	1✔
114
115	return d	1✔
116
117	def __repr__(self):
118	return f"<{self.__class__.__name__:s}, {self.srcs} -> {self.dsts}>"

Nic30 / hwtGraph / fb84d47e-a3e9-4303-b1fd-3f93f383bf69

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous