jan/snarled
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

multithread find_merge_pairs

Browse Source
This commit is contained in:
Jan Petykiewicz 2022-04-07 22:10:30 -07:00
parent e68051ccc6
commit 0adb5e6cf8
1 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
snarled/main.py
View File

@ -4,6 +4,7 @@ Main connectivity-checking functionality for `snarled`
from typing import Tuple, List, Dict, Set, Optional, Union, Sequence, Mapping, Callable from typing import Tuple, List, Dict, Set, Optional, Union, Sequence, Mapping, Callable
from collections import defaultdict from collections import defaultdict
from pprint import pformat from pprint import pformat
from concurrent.futures import ThreadPoolExecutor
import logging import logging
import numpy import numpy
@ -308,39 +309,58 @@ def find_merge_pairs(
logger.warning(f'No vias between layers {top_layer}, {bot_layer}') logger.warning(f'No vias between layers {top_layer}, {bot_layer}')
return merge_pairs return merge_pairs
for top_name in nets.keys(): tested_pairs = set()
top_polys = nets[top_name][top_layer] with ThreadPoolExecutor() as executor:
if not top_polys: for top_name in nets.keys():
continue top_polys = nets[top_name][top_layer]
if not top_polys:
for bot_name in nets.keys():
if bot_name == top_name:
continue continue
name_pair: Tuple[NetName, NetName] = tuple(sorted((top_name, bot_name))) #type: ignore for bot_name in nets.keys():
if name_pair in merge_pairs: if bot_name == top_name:
continue continue
bot_polys = nets[bot_name][bot_layer] name_pair: Tuple[NetName, NetName] = tuple(sorted((top_name, bot_name))) #type: ignore
if not bot_polys: if name_pair in tested_pairs:
continue continue
tested_pairs.add(name_pair)
if via_polys is not None: bot_polys = nets[bot_name][bot_layer]
top_bot = intersection_evenodd(top_polys, bot_polys) if not bot_polys:
descaled = scale_from_clipper(top_bot, clipper_scale_factor) continue
overlap = check_any_intersection(descaled, via_polys)
# overlap = intersection_evenodd(top_bot, via_polys)
# via_polys = difference_evenodd(via_polys, overlap) # reduce set of via polys for future nets
else:
# overlap = intersection_evenodd(top_polys, bot_polys) # TODO verify there aren't any suspicious corner cases for this
overlap = check_any_intersection(scale_from_clipper(top_polys, clipper_scale_factor), scale_from_clipper(bot_polys, clipper_scale_factor))
if overlap: executor.submit(check_overlap, top_polys, via_polys, bot_polys, clipper_scale_factor,
merge_pairs.add(name_pair) lambda np=name_pair: merge_pairs.add(np))
return merge_pairs return merge_pairs
def check_overlap(
top_polys: Sequence[contour_t],
via_polys: Optional[Sequence[NDArray[numpy.float64]]],
bot_polys: Sequence[contour_t],
clipper_scale_factor: int,
action: Callable[[], None],
) -> None:
"""
Check for interaction between top and bottom polys, mediated by via polys if present.
"""
if via_polys is not None:
top_bot = intersection_evenodd(top_polys, bot_polys)
descaled = scale_from_clipper(top_bot, clipper_scale_factor)
overlap = check_any_intersection(descaled, via_polys)
# overlap = intersection_evenodd(top_bot, via_polys)
# via_polys = difference_evenodd(via_polys, overlap) # reduce set of via polys for future nets
else:
# overlap = intersection_evenodd(top_polys, bot_polys) # TODO verify there aren't any suspicious corner cases for this
overlap = check_any_intersection(
scale_from_clipper(top_polys, clipper_scale_factor),
scale_from_clipper(bot_polys, clipper_scale_factor))
if overlap:
action()
def check_any_intersection(polys_a, polys_b) -> bool: def check_any_intersection(polys_a, polys_b) -> bool:
for poly_a in polys_a: for poly_a in polys_a:
for poly_b in polys_b: for poly_b in polys_b: