Merge pull request #29 from kc611/regions

Added region heirarchy and fixed region rendering

Author: esc

numba_rvsdg/core/datastructures/basic_block.py

@@ -7,19 +7,23 @@
 
 
 @dataclass(frozen=True)
-class BasicBlock:
+class Block:
     name_gen: InitVar[NameGenerator]
-    """Block Name Generator associated with this BasicBlock.
+    """Block Name Generator associated with this Block.
        Note: This is an initialization only argument and not
        a class attribute."""
 
-    block_name: BlockName = field(init=False)
-    """Unique name identifier for this block"""
-
     label: Label
     """The corresponding Label for this block."""
 
-    def __post_init__(self, name_gen):
+
+@dataclass(frozen=True)
+class BasicBlock(Block):
+
+    block_name: BlockName = field(init=False)
+    """Unique name identifier for this block"""
+
+    def __post_init__(self, name_gen: NameGenerator):
         block_name = name_gen.new_block_name(label=self.label)
         object.__setattr__(self, "block_name", block_name)
 

numba_rvsdg/core/datastructures/flow_info.py

@@ -94,7 +94,7 @@ def build_basicblocks(self: "FlowInfo", end_offset=None) -> "SCFG":
                 targets = [names[o] for o in self.jump_insts[term_offset]]
 
             block_name = names[begin]
-            scfg.add_connections(block_name, targets, [])
+            scfg.add_connections(block_name, targets)
 
         scfg.check_graph()
         return scfg

numba_rvsdg/core/datastructures/labels.py

@@ -19,6 +19,11 @@ class ControlLabel(Label):
     pass
 
 
+@dataclass(frozen=True, order=True)
+class RegionLabel(Label):
+    pass
+
+
 @dataclass(frozen=True, order=True)
 class SyntheticBranch(ControlLabel):
     pass
@@ -59,6 +64,16 @@ class SynthenticAssignment(ControlLabel):
     pass
 
 
+@dataclass(frozen=True, order=True)
+class LoopRegionLabel(RegionLabel):
+    pass
+
+
+@dataclass(frozen=True, order=True)
+class MetaRegionLabel(RegionLabel):
+    pass
+
+
 # Maybe we can register new labels over here instead of static lists
 label_types = {
     "label": Label,
@@ -83,15 +98,24 @@ def get_label_class(label_type_string):
 
 
 @dataclass(frozen=True, order=True)
-class BlockName:
+class Name:
     name: str
-    ...
+    
+    def __repr__(self):
+        return self.name
+
+    def __str__(self):
+        return self.name
 
 
 @dataclass(frozen=True, order=True)
-class RegionName:
-    name: str
-    ...
+class BlockName(Name):
+    pass
+
+
+@dataclass(frozen=True, order=True)
+class RegionName(Name):
+    pass
 
 
 @dataclass
@@ -117,10 +141,10 @@ def new_block_name(self, label: str) -> BlockName:
         self.block_index += 1
         return BlockName(str(label).lower().split("(")[0] + "_" + str(ret))
 
-    def new_region_name(self, kind: str) -> RegionName:
+    def new_region_name(self, label: str) -> RegionName:
         ret = self.region_index
         self.region_index += 1
-        return RegionName(str(kind).lower().split("(")[0] + "_" + str(ret))
+        return RegionName(str(label).lower().split("(")[0] + "_" + str(ret))
 
     def new_var_name(self) -> str:
         variable_name = chr(self.variable_index)

numba_rvsdg/core/datastructures/region.py

@@ -1,22 +1,47 @@
-from dataclasses import dataclass, field, InitVar
+from dataclasses import dataclass, field
+from numba_rvsdg.core.datastructures.basic_block import Block
 
 from numba_rvsdg.core.datastructures.labels import NameGenerator, RegionName, BlockName
 
 
 @dataclass(frozen=True)
-class Region:
-    name_gen: InitVar[NameGenerator]
-    """Region Name Generator associated with this Region.
-       Note: This is an initialization only argument and not
-       a class attribute."""
-
+class Region(Block):
     region_name: RegionName = field(init=False)
     """Unique name identifier for this region"""
 
-    kind: str
+    def __post_init__(self, name_gen: NameGenerator):
+        region_name = name_gen.new_region_name(self.label)
+        object.__setattr__(self, "region_name", region_name)
+
+
+@dataclass(frozen=True)
+class LoopRegion(Region):
     header: BlockName
     exiting: BlockName
+    ...
 
-    def __post_init__(self, name_gen):
-        region_name = name_gen.new_region_name(kind=self.kind)
-        object.__setattr__(self, "region_name", region_name)
+
+@dataclass(frozen=True)
+class MetaRegion(Region):
+    ...
+
+
+# TODO: Register new regions over here
+region_types = {
+    "loop": LoopRegion
+}
+
+
+def get_region_class(region_type_string: str):
+    if region_type_string in region_types:
+        return region_types[region_type_string]
+    else:
+        raise TypeError(f"Region Type {region_type_string} not recognized.")
+
+
+def get_region_class_str(region: Region):
+    for key, value in region_types.items():
+        if isinstance(region, value):
+            return key
+    else:
+        raise TypeError(f"Region Type of {region} not recognized.")