From 800931dd9032d78809b153b2765e1c2bc2e392fa Mon Sep 17 00:00:00 2001 From: esc Date: Tue, 8 Aug 2023 17:47:32 +0200 Subject: [PATCH] Merge pull request #92 from kc611/debug_patch Patching debug logging calls and debug print statements --- numba_rvsdg/core/datastructures/byte_flow.py | 5 +++-- numba_rvsdg/core/transformations.py | 12 +++++++----- numba_rvsdg/core/utils.py | 4 ++-- numba_rvsdg/rendering/rendering.py | 6 +++--- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/numba_rvsdg/core/datastructures/byte_flow.py b/numba_rvsdg/core/datastructures/byte_flow.py index fb08a79..f2ad220 100644 --- a/numba_rvsdg/core/datastructures/byte_flow.py +++ b/numba_rvsdg/core/datastructures/byte_flow.py @@ -6,7 +6,8 @@ from numba_rvsdg.core.datastructures.scfg import SCFG from numba_rvsdg.core.datastructures.basic_block import RegionBlock from numba_rvsdg.core.datastructures.flow_info import FlowInfo -from numba_rvsdg.core.utils import _logger, _LogWrap + +# from numba_rvsdg.core.utils import _logger, _LogWrap from numba_rvsdg.core.transformations import ( restructure_loop, @@ -55,7 +56,7 @@ def from_bytecode(code: Callable) -> "ByteFlow": # type: ignore The resulting ByteFlow object. """ bc = dis.Bytecode(code) - _logger.debug("Bytecode\n%s", _LogWrap(lambda: bc.dis())) # type: ignore # noqa E501 + # _logger.debug("Bytecode\n%s", _LogWrap(lambda: bc.dis())) # type: ignore # noqa E501 flowinfo = FlowInfo.from_bytecode(bc) scfg = flowinfo.build_basicblocks() diff --git a/numba_rvsdg/core/transformations.py b/numba_rvsdg/core/transformations.py index ab1cd13..318a18c 100644 --- a/numba_rvsdg/core/transformations.py +++ b/numba_rvsdg/core/transformations.py @@ -12,7 +12,7 @@ ) from numba_rvsdg.core.datastructures import block_names -from numba_rvsdg.core.utils import _logger +# from numba_rvsdg.core.utils import _logger def loop_restructure_helper(scfg: SCFG, loop: Set[str]) -> None: @@ -257,9 +257,11 @@ def restructure_loop(parent_region: RegionBlock) -> None: or next(iter(nodes)) in scfg[next(iter(nodes))].jump_targets ] - _logger.debug( - "restructure_loop found %d loops in %s", len(loops), scfg.graph.keys() - ) + # _logger.debug( + # "restructure_loop found %d loops in %s", + # len(loops), + # scfg.graph.keys() + # ) # rotate and extract loop for loop in loops: loop_restructure_helper(scfg, loop) @@ -442,7 +444,7 @@ def extract_region( def restructure_branch(parent_region: RegionBlock) -> None: assert parent_region.subregion is not None scfg: SCFG = parent_region.subregion - print("restructure_branch", scfg.graph) + # print("restructure_branch", scfg.graph) doms = _doms(scfg) postdoms = _post_doms(scfg) postimmdoms = _imm_doms(postdoms) diff --git a/numba_rvsdg/core/utils.py b/numba_rvsdg/core/utils.py index 08940db..a52b036 100644 --- a/numba_rvsdg/core/utils.py +++ b/numba_rvsdg/core/utils.py @@ -1,6 +1,6 @@ -import logging +# import logging -_logger = logging.getLogger(__name__) +# _logger = logging.getLogger(__name__) class _LogWrap: diff --git a/numba_rvsdg/rendering/rendering.py b/numba_rvsdg/rendering/rendering.py index a8c1ba0..b33b524 100644 --- a/numba_rvsdg/rendering/rendering.py +++ b/numba_rvsdg/rendering/rendering.py @@ -1,4 +1,4 @@ -import logging +#import logging from abc import abstractmethod from numba_rvsdg.core.datastructures.basic_block import ( BasicBlock, @@ -79,7 +79,7 @@ def render_block( elif isinstance(block, SyntheticBlock): self.render_basic_block(digraph, name, block) else: - raise Exception("unreachable") + raise Exception(f"unreachable: {type(block)}") def render_edges(self, scfg: SCFG) -> None: """Function that renders the edges in an SCFG. @@ -323,7 +323,7 @@ def view(self, name: Optional[str] = None) -> None: self.g.view(name) -logging.basicConfig(level=logging.DEBUG) +# logging.basicConfig(level=logging.DEBUG) def render_func(func) -> None: # type: ignore