[refactor][relay pass] Separate analysis and transform passes (#5035)

* [refactor][relay pass] Separate analysis and transform passes into different subfolders

* remove pass folder

CMakeLists.txt

@@ -146,7 +146,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

python/tvm/relay/analysis.py

@@ -23,7 +23,6 @@ configuring the passes and scripting them in Python.
 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):

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 {

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";

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.
  */
 

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_

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>

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_

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 {

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 {

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_

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 {

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"
 

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 {

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 {

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 {

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 {

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 {

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"
 

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"
 

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 {

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 {

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 {

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 {

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"
 

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 {

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 {

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 {

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 {

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"
 

src/relay/qnn/op/quantize.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 {

src/relay/qnn/op/requantize.cc

@@ -25,7 +25,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 {

src/relay/qnn/util.cc

@@ -23,7 +23,7 @@
  */
 
 #include "util.h"
-#include "../pass/pattern_util.h"
+#include "../transforms/pattern_util.h"
 
 namespace tvm {
 namespace relay {

src/relay/pass/quantize/partition.cc → src/relay/quantize/partition.cc

@@ -25,7 +25,7 @@
  */
 
 #include <tvm/relay/transform.h>
-#include "../pattern_util.h"
+#include "../transforms/pattern_util.h"
 #include "./quantize.h"
 
 namespace tvm {

src/relay/pass/quantize/quantize.h → src/relay/quantize/quantize.h

@@ -18,16 +18,16 @@
  */
 
 /*!
- * \file tvm/relay/pass/quantize.h
+ * \file tvm/relay/quantize.h
  * \brief Header of definitions for quantization
  */
-#ifndef TVM_RELAY_PASS_QUANTIZE_QUANTIZE_H_
-#define TVM_RELAY_PASS_QUANTIZE_QUANTIZE_H_
+#ifndef TVM_RELAY_QUANTIZE_QUANTIZE_H_
+#define TVM_RELAY_QUANTIZE_QUANTIZE_H_
 
 #include <tvm/relay/op.h>
 #include <tvm/relay/expr.h>
 #include <string>
-#include "../pattern_util.h"
+#include "../transforms/pattern_util.h"
 
 namespace tvm {
 namespace relay {
@@ -163,4 +163,4 @@ struct QConfigContext {
 }  // namespace quantize
 }  // namespace relay
 }  // namespace tvm
-#endif  // TVM_RELAY_PASS_QUANTIZE_QUANTIZE_H_
+#endif  // TVM_RELAY_QUANTIZE_QUANTIZE_H_

src/relay/pass/quantize/realize.cc → src/relay/quantize/realize.cc

@@ -29,8 +29,8 @@
 #include <tvm/relay/analysis.h>
 #include <tvm/relay/attrs/annotation.h>
 #include "./quantize.h"
-#include "../pattern_util.h"
-#include "../../qnn/util.h"
+#include "../transforms/pattern_util.h"
+#include "../qnn/util.h"
 
 namespace tvm {
 namespace relay {

src/relay/pass/annotate_target.cc → src/relay/transforms/annotate_target.cc

@@ -18,7 +18,7 @@
  */
 
 /*!
- * \file src/relay/pass/annotate_target.cc
+ * \file src/relay/transforms/annotate_target.cc
  * \brief Wraps a call with compiler_begin and compiler_end to indicate that
  * the op of this call node will use external compiler.
  */

src/relay/pass/canonicalize_cast.cc → src/relay/transforms/canonicalize_cast.cc

@@ -25,8 +25,8 @@
 #include <tvm/relay/expr_functor.h>
 #include <tvm/relay/attrs/nn.h>
 #include <tvm/relay/transform.h>
-#include "pattern_util.h"
 #include "pass_util.h"
+#include "pattern_util.h"
 
 namespace tvm {
 namespace relay {

src/relay/pass/combine_parallel_conv2d.cc → src/relay/transforms/combine_parallel_conv2d.cc

@@ -41,8 +41,8 @@
 #include <unordered_map>
 #include <unordered_set>
 #include "./expr_subst.h"
-#include "./pattern_util.h"
 #include "./combine_parallel_op.h"
+#include "pattern_util.h"
 
 namespace tvm {
 namespace relay {

src/relay/pass/combine_parallel_dense.cc → src/relay/transforms/combine_parallel_dense.cc

@@ -40,7 +40,7 @@
 #include <unordered_map>
 #include <unordered_set>
 #include "./expr_subst.h"
-#include "./pattern_util.h"
+#include "pattern_util.h"
 #include "./combine_parallel_op_batch.h"
 
 namespace tvm {

src/relay/pass/combine_parallel_op.h → src/relay/transforms/combine_parallel_op.h

@@ -22,8 +22,8 @@
  * \file combine_parallel_op.h
  * \brief Abstract class to combine parallel ops and their successive element-wise ops.
  */
-#ifndef TVM_RELAY_PASS_COMBINE_PARALLEL_OP_H_
-#define TVM_RELAY_PASS_COMBINE_PARALLEL_OP_H_
+#ifndef TVM_RELAY_TRANSFORMS_COMBINE_PARALLEL_OP_H_
+#define TVM_RELAY_TRANSFORMS_COMBINE_PARALLEL_OP_H_
 
 #include <tvm/relay/analysis.h>
 #include <tvm/relay/expr_functor.h>
@@ -36,7 +36,7 @@
 #include <vector>
 #include <string>
 #include "./expr_subst.h"
-#include "./pattern_util.h"
+#include "pattern_util.h"
 
 
 namespace tvm {
@@ -237,4 +237,4 @@ class ParallelOpCombiner {
 
 }  // namespace relay
 }  // namespace tvm
-#endif  // TVM_RELAY_PASS_COMBINE_PARALLEL_OP_H_
+#endif  // TVM_RELAY_TRANSFORMS_COMBINE_PARALLEL_OP_H_

src/relay/pass/combine_parallel_op_batch.cc → src/relay/transforms/combine_parallel_op_batch.cc

@@ -53,9 +53,9 @@
 #include <unordered_map>
 #include <unordered_set>
 #include "./expr_subst.h"
-#include "./pattern_util.h"
 #include "./combine_parallel_op.h"
 #include "./combine_parallel_op_batch.h"
+#include "pattern_util.h"
 
 namespace tvm {
 namespace relay {

src/relay/pass/combine_parallel_op_batch.h → src/relay/transforms/combine_parallel_op_batch.h

@@ -18,11 +18,11 @@
  */
 
 /*!
- * \file combine_parallel_op_batch.cc
+ * \file combine_parallel_op_batch.h
  * \brief Combine parallel ops into a single batch op.
  */
-#ifndef TVM_RELAY_PASS_COMBINE_PARALLEL_OP_BATCH_H_
-#define TVM_RELAY_PASS_COMBINE_PARALLEL_OP_BATCH_H_
+#ifndef TVM_RELAY_TRANSFORMS_COMBINE_PARALLEL_OP_BATCH_H_
+#define TVM_RELAY_TRANSFORMS_COMBINE_PARALLEL_OP_BATCH_H_
 
 #include <tvm/relay/analysis.h>
 #include <tvm/relay/expr_functor.h>
@@ -34,8 +34,8 @@
 #include <unordered_set>
 #include <string>
 #include "./expr_subst.h"
-#include "./pattern_util.h"
 #include "./combine_parallel_op.h"
+#include "pattern_util.h"
 
 namespace tvm {
 namespace relay {
@@ -145,4 +145,4 @@ class ParallelOpBatchCombiner : public ParallelOpCombiner {
 }  // namespace relay
 }  // namespace tvm
 
-#endif  // TVM_RELAY_PASS_COMBINE_PARALLEL_OP_BATCH_H_
+#endif  // TVM_RELAY_TRANSFORMS_COMBINE_PARALLEL_OP_BATCH_H_

src/relay/pass/device_annotation.cc → src/relay/transforms/device_annotation.cc

@@ -563,9 +563,6 @@ Map<Expr, Integer> CollectDeviceAnnotationOps(const Expr& expr) {
 TVM_REGISTER_GLOBAL("relay._analysis.CollectDeviceInfo")
 .set_body_typed(CollectDeviceInfo);
 
-TVM_REGISTER_GLOBAL("relay._analysis.RewriteDeviceAnnotation")
-.set_body_typed(RewriteAnnotatedOps);
-
 TVM_REGISTER_GLOBAL("relay._analysis.CollectDeviceAnnotationOps")
 .set_body_typed(CollectDeviceAnnotationOps);
 
@@ -574,7 +571,7 @@ namespace transform {
 Pass RewriteAnnotatedOps(int fallback_device) {
   runtime::TypedPackedFunc<Function(Function, IRModule, PassContext)> pass_func =
     [=](Function f, IRModule m, PassContext pc) {
-    return Downcast<Function>(RewriteAnnotatedOps(f, fallback_device));
+    return Downcast<Function>(relay::RewriteAnnotatedOps(f, fallback_device));
   };
   return CreateFunctionPass(pass_func, 1, "RewriteAnnotatedOps",
                             {tir::StringImmNode::make("InferType")});

src/relay/pass/eliminate_common_subexpr.cc → src/relay/transforms/eliminate_common_subexpr.cc

@@ -30,7 +30,7 @@
 #include <tvm/relay/expr_functor.h>
 #include <tvm/relay/transform.h>
 #include <unordered_map>
-#include "./pattern_util.h"
+#include "pattern_util.h"
 
 namespace tvm {
 namespace relay {

src/relay/pass/expr_subst.h → src/relay/transforms/expr_subst.h

@@ -21,8 +21,8 @@
  * \file expr_subst.h
  * \brief Utility functions for substituting expressions.
  */
-#ifndef TVM_RELAY_PASS_EXPR_SUBST_H_
-#define TVM_RELAY_PASS_EXPR_SUBST_H_
+#ifndef TVM_RELAY_TRANSFORMS_EXPR_SUBST_H_
+#define TVM_RELAY_TRANSFORMS_EXPR_SUBST_H_
 #include <tvm/relay/expr.h>
 #include <unordered_map>
 
@@ -34,4 +34,4 @@ Expr ExprSubst(const Expr& expr,
 
 }  // namespace relay
 }  // namespace tvm
-#endif  // TVM_RELAY_PASS_EXPR_SUBST_H_
+#endif  // TVM_RELAY_TRANSFORMS_EXPR_SUBST_H_

src/relay/pass/fuse_ops.cc → src/relay/transforms/fuse_ops.cc

@@ -19,7 +19,7 @@
 
 /*!
  *
- * \file src/tvm/relay/pass/fuse_ops.cc
+ * \file src/relay/transforms/fuse_ops.cc
  *
  * \brief This is a backend-aware optimization pass.
  *   Fuse necessary ops into a single one.
@@ -29,10 +29,9 @@
 #include <tvm/relay/expr_functor.h>
 #include <tvm/relay/op_attr_types.h>
 #include <tvm/relay/transform.h>
-#include "./pattern_util.h"
+#include "pattern_util.h"
 #include "../../support/arena.h"
 
-
 namespace tvm {
 namespace relay {
 

src/relay/pass/infer_layout_util.h → src/relay/transforms/infer_layout_util.h

@@ -24,8 +24,8 @@
           custom layouts or other general weight pre-transformation.
  */
 
-#ifndef TVM_RELAY_PASS_INFER_LAYOUT_UTIL_H_
-#define TVM_RELAY_PASS_INFER_LAYOUT_UTIL_H_
+#ifndef TVM_RELAY_TRANSFORMS_INFER_LAYOUT_UTIL_H_
+#define TVM_RELAY_TRANSFORMS_INFER_LAYOUT_UTIL_H_
 
 #include <tvm/tir/data_layout.h>
 #include <tvm/relay/expr.h>
@@ -232,4 +232,4 @@ static inline std::tuple<Array<Layout>, Array<Layout>, bool> InferCorrectLayouts
 }  //  namespace relay
 }  //  namespace tvm
 
-#endif  // TVM_RELAY_PASS_INFER_LAYOUT_UTIL_H_
+#endif  // TVM_RELAY_TRANSFORMS_INFER_LAYOUT_UTIL_H_

src/relay/pass/inline.cc → src/relay/transforms/inline.cc

@@ -18,7 +18,7 @@
  */
 
 /*!
- * \file tvm/relay/pass/inline.cc
+ * \file src/relay/transforms/inline.cc
  * \brief Global function inliner. It contains the following steps:
  *
  *  - Preprocessing: eligibility checking. Only inline the functions that can
@@ -40,7 +40,7 @@
 #include <string>
 #include <unordered_set>
 
-#include "call_graph.h"
+#include "../analysis/call_graph.h"
 
 using namespace tvm::runtime;
 

src/relay/pass/let_list.h → src/relay/transforms/let_list.h

@@ -26,8 +26,8 @@
  *  if one instead write 'b = ll.Push(a + a); c = ll.Push(b + b); d = ll.Get(c + c);',
  *  the AST will contain 2 'a', as b and c are now variables.
  */
-#ifndef TVM_RELAY_PASS_LET_LIST_H_
-#define TVM_RELAY_PASS_LET_LIST_H_
+#ifndef TVM_RELAY_TRANSFORMS_LET_LIST_H_
+#define TVM_RELAY_TRANSFORMS_LET_LIST_H_
 
 #include <tvm/relay/expr.h>
 #include <tvm/relay/analysis.h>
@@ -149,4 +149,4 @@ class LetList {
 
 }  // namespace relay
 }  // namespace tvm
-#endif  // TVM_RELAY_PASS_LET_LIST_H_
+#endif  // TVM_RELAY_TRANSFORMS_LET_LIST_H_

src/relay/pass/merge_composite.cc → src/relay/transforms/merge_composite.cc

@@ -18,7 +18,7 @@
  */
 
 /*!
- * \file src/relay/pass/merge_composite.cc
+ * \file src/relay/transforms/merge_composite.cc
  * \brief Merges expressions matching patterns into functions marked
  * as 'composite'. This is primarily intended to be used alongside the
  * external codegen infrastructure to support the case where multiple

src/relay/pass/partition_graph.cc → src/relay/transforms/partition_graph.cc

@@ -18,7 +18,7 @@
  */
 
 /*
- * \file src/relay/pass/partition_graph.cc
+ * \file src/relay/transforms/partition_graph.cc
  *
  * \brief Partition an input function into multiple functions according based
  * on the inserted annotation nodes (i.e. compiler_begin and compiler_end).

src/relay/pass/pass_util.h → src/relay/transforms/pass_util.h

@@ -19,11 +19,11 @@
 
 /*!
  *
- * \file tvm/relay/pass/pass_util.h
+ * \file tvm/relay/_transforms/pass_util.h
  * \brief Utilities for writing passes
  */
-#ifndef TVM_RELAY_PASS_PASS_UTIL_H_
-#define TVM_RELAY_PASS_PASS_UTIL_H_
+#ifndef TVM_RELAY_TRANSFORMS_PASS_UTIL_H_
+#define TVM_RELAY_TRANSFORMS_PASS_UTIL_H_
 
 #include <tvm/relay/op.h>
 #include <tvm/relay/expr.h>
@@ -167,4 +167,4 @@ struct TreeBranchNode : TreeNode<ConditionObjectPtr> {
 
 }  // namespace relay
 }  // namespace tvm
-#endif  // TVM_RELAY_PASS_PASS_UTIL_H_
+#endif  // TVM_RELAY_TRANSFORMS_PASS_UTIL_H_

src/relay/pass/pattern_util.h → src/relay/transforms/pattern_util.h

@@ -19,12 +19,12 @@
 
 /*!
  *
- * \file tvm/relay/pass/pattern_util.h
+ * \file tvm/relay/_pattern_util.h
  * \brief Header of internal operator functions
  *  These can be used for writing passes.
  */
-#ifndef TVM_RELAY_PASS_PATTERN_UTIL_H_
-#define TVM_RELAY_PASS_PATTERN_UTIL_H_
+#ifndef TVM_RELAY_TRANSFORMS_PATTERN_UTIL_H_
+#define TVM_RELAY_TRANSFORMS_PATTERN_UTIL_H_
 
 #include <builtin_fp16.h>
 #include <tvm/tir/data_layout.h>
@@ -606,4 +606,4 @@ Expr CastHint(Expr data, DataType dtype);
 
 }  // namespace relay
 }  // namespace tvm
-#endif  // TVM_RELAY_PASS_PATTERN_UTIL_H_
+#endif  // TVM_RELAY_TRANSFORMS_PATTERN_UTIL_H_

src/relay/pass/print_ir.cc → src/relay/transforms/print_ir.cc

@@ -19,7 +19,7 @@
 
 /*!
  *
- * \file src/relay/pass/print_ir.cc
+ * \file src/relay/transforms/print_ir.cc
  *
  * \brief Print the module IR to help debugging.
  */

src/relay/pass/simplify_inference.cc → src/relay/transforms/simplify_inference.cc

@@ -25,7 +25,7 @@
 #include <tvm/relay/attrs/nn.h>
 #include <tvm/relay/transform.h>
 #include <tvm/relay/op.h>
-#include "./pattern_util.h"
+#include "pattern_util.h"
 
 namespace tvm {
 namespace relay {

src/relay/pass/to_a_normal_form.cc → src/relay/transforms/to_a_normal_form.cc

@@ -29,9 +29,9 @@
 #include <tvm/relay/expr_functor.h>
 #include <tvm/support/logging.h>
 #include "let_list.h"
-#include "../../support/arena.h"
 #include "pass_util.h"
-#include "dependency_graph.h"
+#include "../../support/arena.h"
+#include "../analysis/dependency_graph.h"
 
 namespace tvm {
 namespace relay {

src/relay/pass/transform_layout.h → src/relay/transforms/transform_layout.h

@@ -23,8 +23,8 @@
  * \brief Common infrastructure for transforming the layouts. This is used for AlterOpLayout and
  *        ConvertLayout pass. */
 
-#ifndef TVM_RELAY_PASS_TRANSFORM_LAYOUT_H_
-#define TVM_RELAY_PASS_TRANSFORM_LAYOUT_H_
+#ifndef TVM_RELAY_TRANSFORMS_TRANSFORM_LAYOUT_H_
+#define TVM_RELAY_TRANSFORMS_TRANSFORM_LAYOUT_H_
 
 #include <tvm/tir/data_layout.h>
 #include <tvm/relay/expr.h>
@@ -367,4 +367,4 @@ Expr LayoutRewriter(const Call& ref_call, const Array<Expr>& new_args, const Obj
 }  //  namespace relay
 }  //  namespace tvm
 
-#endif  // TVM_RELAY_PASS_TRANSFORM_LAYOUT_H_
+#endif  // TVM_RELAY_TRANSFORMS_TRANSFORM_LAYOUT_H_

src/relay/pass/type_infer.cc → src/relay/transforms/type_infer.cc

@@ -43,8 +43,8 @@
 #include <tvm/relay/pattern_functor.h>
 #include <tvm/relay/analysis.h>
 #include <tvm/relay/transform.h>
-#include "./pass_util.h"
-#include "type_solver.h"
+#include "pass_util.h"
+#include "../analysis/type_solver.h"
 
 namespace tvm {
 namespace relay {