[refactor][relay pass] Separate analysis and transform passes (apache…

…#5035) * [refactor][relay pass] Separate analysis and transform passes into different subfolders * remove pass folder
neo-ai · Apr 17, 2020 · 0d04bec · 0d04bec
1 parent de2f773
commit 0d04bec
Show file tree

Hide file tree

Showing 83 changed files with 109 additions and 114 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -161,7 +161,9 @@ file(GLOB_RECURSE RELAY_OP_SRCS
     src/relay/op/*.cc
     )
 file(GLOB_RECURSE RELAY_PASS_SRCS
-    src/relay/pass/*.cc
+    src/relay/analysis/*.cc
+    src/relay/transforms/*.cc
+    src/relay/quantize/*.cc
     )
 file(GLOB RELAY_BACKEND_SRCS
     src/relay/backend/*.cc

diff --git a/python/tvm/relay/analysis.py b/python/tvm/relay/analysis.py
@@ -23,7 +23,6 @@
 from tvm.ir import RelayExpr, IRModule
 
 from . import _analysis
-from . import _make
 from .ty import Type
 from .feature import Feature
 
@@ -237,7 +236,7 @@ def alpha_equal(lhs, rhs):
     result : bool
         True iff lhs is alpha equal to rhs.
     """
-    return bool(_make._alpha_equal(lhs, rhs))
+    return bool(_analysis._alpha_equal(lhs, rhs))
 
 
 def assert_alpha_equal(lhs, rhs):
@@ -251,7 +250,7 @@ def assert_alpha_equal(lhs, rhs):
     rhs : tvm.relay.Expr
         One of the input Expression.
     """
-    _make._assert_alpha_equal(lhs, rhs)
+    _analysis._assert_alpha_equal(lhs, rhs)
 
 
 def graph_equal(lhs, rhs):
@@ -273,7 +272,7 @@ def graph_equal(lhs, rhs):
     result : bool
       True iff lhs is data-flow equivalent to rhs.
     """
-    return bool(_make._graph_equal(lhs, rhs))
+    return bool(_analysis._graph_equal(lhs, rhs))
 
 
 def assert_graph_equal(lhs, rhs):
@@ -290,7 +289,7 @@ def assert_graph_equal(lhs, rhs):
     rhs : tvm.relay.Expr
       One of the input Expression.
     """
-    _make._assert_graph_equal(lhs, rhs)
+    _analysis._assert_graph_equal(lhs, rhs)
 
 
 def collect_device_info(expr):

diff --git a/src/printer/relay_text_printer.cc b/src/printer/relay_text_printer.cc
@@ -38,7 +38,7 @@
 #include <tvm/relay/pattern_functor.h>
 #include "doc.h"
 #include "meta_data.h"
-#include "../relay/pass/dependency_graph.h"
+#include "../relay/analysis/dependency_graph.h"
 #include "../ir/attr_functor.h"
 
 namespace tvm {

diff --git a/src/relay/ir/alpha_equal.cc → src/relay/analysis/alpha_equal.cc b/src/relay/ir/alpha_equal.cc → src/relay/analysis/alpha_equal.cc
@@ -18,7 +18,7 @@
  */
 
 /*!
- * \file src/tvm/relay/ir/alpha_equal.cc
+ * \file src/relay/analysis/alpha_equal.cc
  * \brief Alpha equality check by deep comparing two nodes.
  */
 #include <tvm/ir/type_functor.h>
@@ -593,8 +593,7 @@ bool AlphaEqual(const Expr& lhs, const Expr& rhs) {
   return AlphaEqualHandler(false, false).ExprEqual(lhs, rhs);
 }
 
-// TODO(@jroesch): move to correct namespace?
-TVM_REGISTER_GLOBAL("relay._make._alpha_equal")
+TVM_REGISTER_GLOBAL("relay._analysis._alpha_equal")
 .set_body_typed([](ObjectRef a, ObjectRef b) {
   return AlphaEqualHandler(false, false).Equal(a, b);
 });
@@ -604,18 +603,18 @@ TVM_REGISTER_GLOBAL("ir.type_alpha_equal")
   return AlphaEqual(a, b);
 });
 
-TVM_REGISTER_GLOBAL("relay._make._assert_alpha_equal")
+TVM_REGISTER_GLOBAL("relay._analysis._assert_alpha_equal")
 .set_body_typed([](ObjectRef a, ObjectRef b) {
   bool alpha_equal = AlphaEqualHandler(false, true).Equal(a, b);
   CHECK(alpha_equal) << AsText(a, true) << " and " << AsText(b, true) << " are not alpha equal";
 });
 
-TVM_REGISTER_GLOBAL("relay._make._graph_equal")
+TVM_REGISTER_GLOBAL("relay._analysis._graph_equal")
 .set_body_typed([](ObjectRef a, ObjectRef b) {
   return AlphaEqualHandler(true, false).Equal(a, b);
 });
 
-TVM_REGISTER_GLOBAL("relay._make._assert_graph_equal")
+TVM_REGISTER_GLOBAL("relay._analysis._assert_graph_equal")
 .set_body_typed([](ObjectRef a, ObjectRef b) {
   bool graph_equal = AlphaEqualHandler(true, true).Equal(a, b);
   CHECK(graph_equal) << AsText(a, true) << " and " << AsText(b, true) << " are not graph equal";

diff --git a/src/relay/pass/call_graph.cc → src/relay/analysis/call_graph.cc b/src/relay/pass/call_graph.cc → src/relay/analysis/call_graph.cc
@@ -18,7 +18,7 @@
  */
 
 /*!
- * \file tvm/relay/pass/call_graph.cc
+ * \file src/relay/analysis/call_graph.cc
  * \brief Implementation of APIs to handle the call graph of a Relay module.
  */
 

diff --git a/src/relay/pass/call_graph.h → src/relay/analysis/call_graph.h b/src/relay/pass/call_graph.h → src/relay/analysis/call_graph.h
@@ -18,15 +18,15 @@
  */
 
 /*!
- * \file tvm/relay/pass/call_graph.h
+ * \file src/relay/analysis/call_graph.h
  * \brief Define data structures for the call graph of a IRModule. It borrows
  * the idea how LLVM constructs CallGraph.
  *
  * https://llvm.org/doxygen/CallGraph_8h_source.html
  */
 
-#ifndef TVM_RELAY_PASS_CALL_GRAPH_H_
-#define TVM_RELAY_PASS_CALL_GRAPH_H_
+#ifndef TVM_RELAY_ANALYSIS_CALL_GRAPH_H_
+#define TVM_RELAY_ANALYSIS_CALL_GRAPH_H_
 
 #include <tvm/ir/module.h>
 #include <tvm/relay/expr.h>
@@ -510,4 +510,4 @@ class CallGraphEntry {
 
 }  // namespace relay
 }  // namespace tvm
-#endif  // TVM_RELAY_PASS_CALL_GRAPH_H_
+#endif  // TVM_RELAY_ANALYSIS_CALL_GRAPH_H_
diff --git a/src/relay/pass/dependency_graph.cc → src/relay/analysis/dependency_graph.cc b/src/relay/pass/dependency_graph.cc → src/relay/analysis/dependency_graph.cc
@@ -18,8 +18,8 @@
  */
 
 /*!
- * \file tvm/relay/pass/dependency_graph.cc
- * \brief
+ * \file src/relay/analysis/dependency_graph.cc
+ * \brief Implementation of dependency graph APIs.
  */
 #include "dependency_graph.h"
 #include <tvm/relay/expr_functor.h>

diff --git a/src/relay/pass/dependency_graph.h → src/relay/analysis/dependency_graph.h b/src/relay/pass/dependency_graph.h → src/relay/analysis/dependency_graph.h
@@ -18,16 +18,16 @@
  */
 
 /*!
- * \file tvm/relay/pass/dependency_graph.h
+ * \file src/relay/analysis/dependency_graph.h
  * \brief create a dependency graph.
  */
-#ifndef TVM_RELAY_PASS_DEPENDENCY_GRAPH_H_
-#define TVM_RELAY_PASS_DEPENDENCY_GRAPH_H_
+#ifndef TVM_RELAY_ANALYSIS_DEPENDENCY_GRAPH_H_
+#define TVM_RELAY_ANALYSIS_DEPENDENCY_GRAPH_H_
 
 #include <tvm/relay/expr.h>
 #include <unordered_map>
 #include <vector>
-#include "let_list.h"
+#include "../transforms/let_list.h"
 #include "../../support/arena.h"
 
 namespace tvm {
@@ -72,4 +72,4 @@ class DependencyGraph {
 
 }  // namespace relay
 }  // namespace tvm
-#endif  // TVM_RELAY_PASS_DEPENDENCY_GRAPH_H_
+#endif  // TVM_RELAY_ANALYSIS_DEPENDENCY_GRAPH_H_
diff --git a/src/relay/pass/feature.cc → src/relay/analysis/feature.cc b/src/relay/pass/feature.cc → src/relay/analysis/feature.cc
@@ -26,7 +26,7 @@
 #include <tvm/relay/expr.h>
 #include <tvm/relay/expr_functor.h>
 #include <tvm/ir/module.h>
-#include "pass_util.h"
+#include "../transforms/pass_util.h"
 
 namespace tvm {
 namespace relay {

diff --git a/src/relay/pass/kind_check.cc → src/relay/analysis/kind_check.cc b/src/relay/pass/kind_check.cc → src/relay/analysis/kind_check.cc
diff --git a/src/relay/pass/mac_count.cc → src/relay/analysis/mac_count.cc b/src/relay/pass/mac_count.cc → src/relay/analysis/mac_count.cc
@@ -31,7 +31,7 @@
 #include <tvm/relay/expr_functor.h>
 #include <tvm/relay/analysis.h>
 #include <tvm/relay/op_attr_types.h>
-#include "pattern_util.h"
+#include "../transforms/pattern_util.h"
 
 namespace tvm {
 namespace relay {

diff --git a/src/relay/pass/match_exhaustion.cc → src/relay/analysis/match_exhaustion.cc b/src/relay/pass/match_exhaustion.cc → src/relay/analysis/match_exhaustion.cc
diff --git a/src/relay/pass/type_solver.cc → src/relay/analysis/type_solver.cc b/src/relay/pass/type_solver.cc → src/relay/analysis/type_solver.cc
diff --git a/src/relay/pass/type_solver.h → src/relay/analysis/type_solver.h b/src/relay/pass/type_solver.h → src/relay/analysis/type_solver.h
@@ -21,8 +21,8 @@
  * \file type_solver.h
  * \brief Solver logic for type inference.
  */
-#ifndef TVM_RELAY_PASS_TYPE_SOLVER_H_
-#define TVM_RELAY_PASS_TYPE_SOLVER_H_
+#ifndef TVM_RELAY_ANALYSIS_TYPE_SOLVER_H_
+#define TVM_RELAY_ANALYSIS_TYPE_SOLVER_H_
 
 #include <tvm/relay/expr.h>
 #include <tvm/relay/type.h>
@@ -34,7 +34,6 @@
 #include <unordered_set>
 #include "../../support/arena.h"
 
-
 namespace tvm {
 namespace relay {
 
@@ -219,4 +218,4 @@ class TypeSolver {
 
 }  // namespace relay
 }  // namespace tvm
-#endif  // TVM_RELAY_PASS_TYPE_SOLVER_H_
+#endif  // TVM_RELAY_ANALYSIS_TYPE_SOLVER_H_
diff --git a/src/relay/pass/util.cc → src/relay/analysis/util.cc b/src/relay/pass/util.cc → src/relay/analysis/util.cc
@@ -28,7 +28,7 @@
 #include <tvm/relay/expr_functor.h>
 #include <tvm/relay/op.h>
 #include <tvm/relay/pattern_functor.h>
-#include "pass_util.h"
+#include "../transforms/pass_util.h"
 
 namespace tvm {
 namespace relay {

diff --git a/src/relay/pass/well_formed.cc → src/relay/analysis/well_formed.cc b/src/relay/pass/well_formed.cc → src/relay/analysis/well_formed.cc
diff --git a/src/relay/backend/vm/compiler.cc b/src/relay/backend/vm/compiler.cc
@@ -40,7 +40,7 @@
 #include <vector>
 #include "../utils.h"
 #include "../../backend/compile_engine.h"
-#include "../../pass/pass_util.h"
+#include "../../transforms/pass_util.h"
 #include "../../op/op_common.h"
 #include "compiler.h"
 

diff --git a/src/relay/backend/vm/compiler.h b/src/relay/backend/vm/compiler.h
@@ -41,7 +41,7 @@
 #include "../../../runtime/vm/profiler/vm.h"
 #include "../../../runtime/vm/naive_allocator.h"
 #include "../../backend/compile_engine.h"
-#include "../../pass/pass_util.h"
+#include "../../transforms/pass_util.h"
 
 namespace tvm {
 namespace relay {

diff --git a/src/relay/op/annotation/annotation.cc b/src/relay/op/annotation/annotation.cc
@@ -30,7 +30,7 @@
 #include <tvm/relay/op_attr_types.h>
 #include <topi/elemwise.h>
 
-#include "../../pass/infer_layout_util.h"
+#include "../../transforms/infer_layout_util.h"
 #include "../type_relations.h"
 
 namespace tvm {

diff --git a/src/relay/op/device_copy.cc b/src/relay/op/device_copy.cc
@@ -33,7 +33,7 @@
 #include <tvm/relay/op_attr_types.h>
 
 #include "type_relations.h"
-#include "../pass/infer_layout_util.h"
+#include "../transforms/infer_layout_util.h"
 
 namespace tvm {
 namespace relay {

diff --git a/src/relay/op/memory/memory.cc b/src/relay/op/memory/memory.cc
@@ -29,7 +29,7 @@
 #include <tvm/relay/attrs/memory.h>
 
 #include "../op_common.h"
-#include "../../pass/infer_layout_util.h"
+#include "../../transforms/infer_layout_util.h"
 #include "../type_relations.h"
 
 namespace tvm {

diff --git a/src/relay/op/nn/bitserial.cc b/src/relay/op/nn/bitserial.cc
@@ -27,7 +27,7 @@
 #include <tvm/relay/op.h>
 
 #include "../op_common.h"
-#include "../../pass/infer_layout_util.h"
+#include "../../transforms/infer_layout_util.h"
 
 namespace tvm {
 namespace relay {

diff --git a/src/relay/op/nn/convolution.cc b/src/relay/op/nn/convolution.cc
@@ -27,7 +27,7 @@
 #include <tvm/relay/attrs/nn.h>
 #include <vector>
 
-#include "../../pass/infer_layout_util.h"
+#include "../../transforms/infer_layout_util.h"
 #include "../op_common.h"
 #include "convolution.h"
 

diff --git a/src/relay/op/nn/nn.cc b/src/relay/op/nn/nn.cc
@@ -33,7 +33,7 @@
 #include <vector>
 #include <string>
 #include "../type_relations.h"
-#include "../../pass/infer_layout_util.h"
+#include "../../transforms/infer_layout_util.h"
 #include "../op_common.h"
 #include "nn.h"
 

diff --git a/src/relay/op/nn/pooling.cc b/src/relay/op/nn/pooling.cc
@@ -27,7 +27,7 @@
 #include <tvm/relay/attrs/nn.h>
 #include <topi/nn/pooling.h>
 #include <vector>
-#include "../../pass/infer_layout_util.h"
+#include "../../transforms/infer_layout_util.h"
 
 namespace tvm {
 namespace relay {

diff --git a/src/relay/op/nn/sparse.cc b/src/relay/op/nn/sparse.cc
@@ -27,7 +27,7 @@
 #include <tvm/relay/attrs/nn.h>
 #include <vector>
 
-#include "../../pass/infer_layout_util.h"
+#include "../../transforms/infer_layout_util.h"
 
 namespace tvm {
 namespace relay {

diff --git a/src/relay/op/op_common.h b/src/relay/op/op_common.h
@@ -32,7 +32,7 @@
 #include <string>
 #include <unordered_map>
 #include "type_relations.h"
-#include "../pass/infer_layout_util.h"
+#include "../transforms/infer_layout_util.h"
 
 namespace tvm {
 namespace relay {

diff --git a/src/relay/op/tensor/transform.cc b/src/relay/op/tensor/transform.cc
@@ -36,8 +36,8 @@
 #include <vector>
 #include "../op_common.h"
 #include "../../../arith/compute_expr.h"
-#include "../../pass/infer_layout_util.h"
-#include "../../pass/pattern_util.h"
+#include "../../transforms/infer_layout_util.h"
+#include "../../transforms/pattern_util.h"
 #include "transform.h"
 
 namespace tvm {

diff --git a/src/relay/qnn/op/add.cc b/src/relay/qnn/op/add.cc
@@ -24,7 +24,7 @@
 #include <tvm/relay/analysis.h>
 #include <tvm/relay/op_attr_types.h>
 #include <tvm/relay/qnn/attrs.h>
-#include "../../pass/pattern_util.h"
+#include "../../transforms/pattern_util.h"
 #include "../util.h"
 #include "op_common.h"
 

diff --git a/src/relay/qnn/op/concatenate.cc b/src/relay/qnn/op/concatenate.cc
@@ -27,7 +27,7 @@
 #include <tvm/relay/op_attr_types.h>
 #include <tvm/relay/qnn/attrs.h>
 #include "../../op/tensor/transform.h"
-#include "../../pass/pattern_util.h"
+#include "../../transforms/pattern_util.h"
 #include "../util.h"
 
 namespace tvm {

diff --git a/src/relay/qnn/op/convolution.cc b/src/relay/qnn/op/convolution.cc
@@ -28,7 +28,7 @@
 #include <tvm/relay/qnn/attrs.h>
 #include <tvm/relay/transform.h>
 #include "../../op/nn/convolution.h"
-#include "../../pass/pattern_util.h"
+#include "../../transforms/pattern_util.h"
 #include "../util.h"
 
 namespace tvm {

diff --git a/src/relay/qnn/op/dense.cc b/src/relay/qnn/op/dense.cc
@@ -27,7 +27,7 @@
 #include <tvm/relay/op_attr_types.h>
 #include <tvm/relay/qnn/attrs.h>
 #include "../../op/nn/nn.h"
-#include "../../pass/pattern_util.h"
+#include "../../transforms/pattern_util.h"
 #include "../util.h"
 
 namespace tvm {

diff --git a/src/relay/qnn/op/dequantize.cc b/src/relay/qnn/op/dequantize.cc
@@ -26,7 +26,7 @@
 #include <tvm/relay/analysis.h>
 #include <tvm/relay/op_attr_types.h>
 #include <tvm/relay/qnn/attrs.h>
-#include "../../pass/pattern_util.h"
+#include "../../transforms/pattern_util.h"
 #include "../util.h"
 
 namespace tvm {

diff --git a/src/relay/qnn/op/mul.cc b/src/relay/qnn/op/mul.cc
@@ -24,7 +24,7 @@
 #include <tvm/relay/analysis.h>
 #include <tvm/relay/op_attr_types.h>
 #include <tvm/relay/qnn/attrs.h>
-#include "../../pass/pattern_util.h"
+#include "../../transforms/pattern_util.h"
 #include "../util.h"
 #include "op_common.h"