transforms.devirtualizer → analyses.devirtualization.

m-labs · Oct 8, 2015 · 7043b33 · 7043b33
1 parent 962dd9d
commit 7043b33
Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/artiq/compiler/analyses/__init__.py b/artiq/compiler/analyses/__init__.py
@@ -1 +1,2 @@
 from .domination import DominatorTree
+from .devirtualization import Devirtualization
diff --git a/artiq/compiler/transforms/devirtualizer.py → artiq/compiler/analyses/devirtualization.py b/artiq/compiler/transforms/devirtualizer.py → artiq/compiler/analyses/devirtualization.py
@@ -102,7 +102,7 @@ def visit_Assign(self, node):
                     continue
                 _advance(self.method_map, (instance_type, target.attr), value)
 
-class Devirtualizer:
+class Devirtualization:
     def __init__(self):
         self.variable_map = dict()
         self.method_map = dict()
@@ -114,4 +114,3 @@ def visit(self, node):
 
         method_resolver = MethodResolver(self.variable_map, self.method_map)
         method_resolver.visit(node)
-        print(self.method_map)
diff --git a/artiq/compiler/module.py b/artiq/compiler/module.py
@@ -10,7 +10,7 @@
 
 import os
 from pythonparser import source, diagnostic, parse_buffer
-from . import prelude, types, transforms, validators
+from . import prelude, types, transforms, analyses, validators
 
 class Source:
     def __init__(self, source_buffer, engine=None):
@@ -57,7 +57,7 @@ def __init__(self, src, ref_period=1e-6):
                                                          ref_period=ref_period)
         dead_code_eliminator = transforms.DeadCodeEliminator(engine=self.engine)
         local_access_validator = validators.LocalAccessValidator(engine=self.engine)
-        devirtualizer = transforms.Devirtualizer()
+        devirtualization = analyses.Devirtualization()
 
         self.name = src.name
         self.globals = src.globals
@@ -66,7 +66,7 @@ def __init__(self, src, ref_period=1e-6):
         monomorphism_validator.visit(src.typedtree)
         escape_validator.visit(src.typedtree)
         iodelay_estimator.visit_fixpoint(src.typedtree)
-        devirtualizer.visit(src.typedtree)
+        devirtualization.visit(src.typedtree)
         self.artiq_ir = artiq_ir_generator.visit(src.typedtree)
         dead_code_eliminator.process(self.artiq_ir)
         local_access_validator.process(self.artiq_ir)

diff --git a/artiq/compiler/transforms/__init__.py b/artiq/compiler/transforms/__init__.py
@@ -3,6 +3,5 @@
 from .int_monomorphizer import IntMonomorphizer
 from .iodelay_estimator import IODelayEstimator
 from .artiq_ir_generator import ARTIQIRGenerator
-from .devirtualizer import Devirtualizer
 from .dead_code_eliminator import DeadCodeEliminator
 from .llvm_ir_generator import LLVMIRGenerator
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		from .domination import DominatorTree
		from .devirtualization import Devirtualization