[REFACTOR] Establish tir (#4740)

TIR is the new namespace for low-level IR for tensor-level optimizations and loop transformations. This PR establishes the namespace and files. - lowered_func.h,buffer.h,data_layout.h -> tir/buffer.h,tir/data_layout.h,tir/lowered_func.h - ir.h -> tir/expr.h, tir/stmt.h - ir_functor_ext.h -> tir/expr_functor.h, tir/stmt_functor.h
apache · Jan 19, 2020 · cf59b20 · cf59b20
1 parent 7e39201
commit cf59b20
Show file tree

Hide file tree

Showing 267 changed files with 4,515 additions and 4,324 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -132,12 +132,11 @@ file(GLOB_RECURSE COMPILER_SRCS
     src/top/*.cc
     src/api/*.cc
     src/autotvm/*.cc
-    src/lang/*.cc
-    src/pass/*.cc
+    src/tir/*.cc
     )
 
 file(GLOB CODEGEN_SRCS
-    src/codegen/*.cc
+  src/codegen/*.cc
     )
 
 list(APPEND COMPILER_SRCS ${CODEGEN_SRCS})

diff --git a/apps/extension/src/tvm_ext.cc b/apps/extension/src/tvm_ext.cc
@@ -27,9 +27,10 @@
 #include <tvm/runtime/registry.h>
 #include <tvm/runtime/ndarray.h>
 #include <tvm/runtime/device_api.h>
-#include <tvm/expr_operator.h>
+#include <tvm/tir/op.h>
 
 using namespace tvm;
+using namespace tvm::tir;
 using namespace tvm::runtime;
 
 namespace tvm_ext {

diff --git a/apps/lldb/tvm.py b/apps/lldb/tvm.py
@@ -46,7 +46,7 @@ def __lldb_init_module(debugger, _):
         "tvm::IterVarAttr",
         "tvm::IterVarRelation",
         "tvm::Layout",
-        "tvm::LoweredFunc",
+        "tir::LoweredFunc",
         "tvm::Map",
         "tvm::Map",
         "tvm::MemoryInfo",
@@ -60,7 +60,7 @@ def __lldb_init_module(debugger, _):
         "tvm::TensorIntrin",
         "tvm::TensorIntrinCall",
         "tvm::TypedEnvFunc",
-        "tvm::Var",
+        "tvm::tir::Var",
         "tvm::ir::CommReducer",
         "tvm::ir::FunctionRef",
         "tvm::relay::BaseTensorType",

diff --git a/include/tvm/arith/analyzer.h b/include/tvm/arith/analyzer.h
@@ -50,6 +50,8 @@ namespace arith {
 // Forward declare Analyzer
 class Analyzer;
 
+using tir::Var;
+
 /*!
  * \brief Constant integer up and lower bound(inclusive).
  *  Useful for value bound analysis.

diff --git a/include/tvm/arith/bound.h b/include/tvm/arith/bound.h
@@ -26,7 +26,8 @@
 #include <tvm/node/container.h>
 #include <tvm/ir/expr.h>
 #include <tvm/arith/int_set.h>
-#include <tvm/expr.h>
+#include <tvm/tir/expr.h>
+#include <tvm/tir/stmt.h>
 
 #include <unordered_map>
 
@@ -37,6 +38,11 @@ class Tensor;
 }
 namespace arith {
 
+using tir::Var;
+using tir::VarNode;
+using tir::Domain;
+using tir::Stmt;
+
 /*!
  * \brief Deduce the bound of the target variable in a expression,
  *  give the domain of each variables. Return undefined IntSet to

diff --git a/include/tvm/arith/int_set.h b/include/tvm/arith/int_set.h
@@ -25,12 +25,16 @@
 #define TVM_ARITH_INT_SET_H_
 
 #include <tvm/ir/expr.h>
-#include <tvm/expr.h>
+#include <tvm/tir/expr.h>
 #include <unordered_map>
 
 namespace tvm {
 namespace arith {
 
+using tir::Var;
+using tir::VarNode;
+using tir::IterVar;
+
 //-----------------------------------------------
 // Integer set data structure.
 //
@@ -165,7 +169,7 @@ IntSet EvalSet(PrimExpr e,
  * \return An integer set that can cover all the possible values of e.
  */
 IntSet EvalSet(PrimExpr e,
-               const std::unordered_map<const VarNode*, IntSet>& dom_map);
+               const std::unordered_map<const tir::VarNode*, IntSet>& dom_map);
 
 /*!
  * \brief Find an symbolic integer set that contains is union over

diff --git a/include/tvm/arith/pattern.h b/include/tvm/arith/pattern.h
@@ -26,7 +26,7 @@
 
 #include <tvm/node/container.h>
 #include <tvm/ir/expr.h>
-#include <tvm/expr.h>
+#include <tvm/tir/expr.h>
 
 namespace tvm {
 namespace arith {
@@ -39,7 +39,7 @@ namespace arith {
  * \return [coeff[i]] if it is possible, empty array if it is not.
  */
 Array<PrimExpr> DetectLinearEquation(const PrimExpr& e,
-                                     const Array<Var>& vars);
+                                     const Array<tir::Var>& vars);
 
 /*!
  * \brief Detect if expression corresponds to clip bound of the vars
@@ -50,7 +50,7 @@ Array<PrimExpr> DetectLinearEquation(const PrimExpr& e,
  *          return empty if the e does not match the pattern.
  */
 Array<PrimExpr> DetectClipBound(const PrimExpr& e,
-                                const Array<Var>& vars);
+                                const Array<tir::Var>& vars);
 
 }  // namespace arith
 }  // namespace tvm

diff --git a/include/tvm/build_module.h b/include/tvm/build_module.h
@@ -24,20 +24,18 @@
 #ifndef TVM_BUILD_MODULE_H_
 #define TVM_BUILD_MODULE_H_
 
+#include <tvm/runtime/packed_func.h>
 #include <tvm/target/target.h>
 #include <tvm/support/with.h>
 #include <tvm/top/schedule_pass.h>
+#include <tvm/tir/lowered_func.h>
 
 #include <string>
 #include <vector>
 #include <utility>
 #include <unordered_map>
 #include <unordered_set>
 
-#include "runtime/packed_func.h"
-
-#include "lowered_func.h"
-
 namespace tvm {
 
 /*!
@@ -174,11 +172,12 @@ class BuildConfig : public ::tvm::ObjectRef {
 * \param config The build configuration.
 * \return The lowered function.
 */
-TVM_DLL Array<LoweredFunc> lower(top::Schedule sch,
-                                 const Array<top::Tensor>& args,
-                                 const std::string& name,
-                                 const std::unordered_map<top::Tensor, Buffer>& binds,
-                                 const BuildConfig& config);
+TVM_DLL Array<tir::LoweredFunc> lower(
+    top::Schedule sch,
+    const Array<top::Tensor>& args,
+    const std::string& name,
+    const std::unordered_map<top::Tensor, tir::Buffer>& binds,
+    const BuildConfig& config);
 /*!
 * \brief Split host/device function and running necessary pass before build
 * \param funcs The functions to be built.
@@ -188,10 +187,11 @@ TVM_DLL Array<LoweredFunc> lower(top::Schedule sch,
 * \return The Array<Array<LoweredFunc>> with 2 elements. First is host function Array,
           second is device function array
 */
-TVM_DLL Array<Array<LoweredFunc> > split_dev_host_funcs(const Array<LoweredFunc>& funcs,
-                                                        const Target& target,
-                                                        const Target& target_host,
-                                                        const BuildConfig& config);
+TVM_DLL Array<Array<tir::LoweredFunc> > split_dev_host_funcs(
+    const Array<tir::LoweredFunc>& funcs,
+    const Target& target,
+    const Target& target_host,
+    const BuildConfig& config);
 
 /*!
 * \brief Build a device and host module for a specific target from an array of lowered functions.
@@ -201,7 +201,7 @@ TVM_DLL Array<Array<LoweredFunc> > split_dev_host_funcs(const Array<LoweredFunc>
 * \param config The build configuration.
 * \return The built module.
 */
-TVM_DLL runtime::Module build(const Array<LoweredFunc>& funcs,
+TVM_DLL runtime::Module build(const Array<tir::LoweredFunc>& funcs,
                               const Target& target,
                               const Target& target_host,
                               const BuildConfig& config);
@@ -216,7 +216,7 @@ TVM_DLL runtime::Module build(const Array<LoweredFunc>& funcs,
  * \param config The build configuration.
  * \return The built module that contains code for different processors.
  */
-TVM_DLL runtime::Module build(const Map<Target, Array<LoweredFunc>>& input,
+TVM_DLL runtime::Module build(const Map<Target, Array<tir::LoweredFunc>>& input,
                               const Target& target_host,
                               const BuildConfig& config);
 
@@ -231,7 +231,7 @@ TVM_DLL runtime::Module build(const Map<Target, Array<LoweredFunc>>& input,
  * \param config The build configuration.
  * \return The built module that contains code for different processors.
  */
-TVM_DLL runtime::Module build(const Map<std::string, Array<LoweredFunc>>& input,
+TVM_DLL runtime::Module build(const Map<std::string, Array<tir::LoweredFunc>>& input,
                               const Target& target_host,
                               const BuildConfig& config);
 

diff --git a/include/tvm/codegen.h b/include/tvm/codegen.h
@@ -24,10 +24,11 @@
 #ifndef TVM_CODEGEN_H_
 #define TVM_CODEGEN_H_
 
+#include <tvm/runtime/packed_func.h>
+#include <tvm/tir/expr.h>
+#include <tvm/tir/lowered_func.h>
 #include <string>
-#include "expr.h"
-#include "lowered_func.h"
-#include "runtime/packed_func.h"
+
 
 namespace tvm {
 /*! \brief namespace for lowlevel IR pass and codegen */
@@ -45,7 +46,7 @@ using runtime::TVMRetValue;
  *
  * \note Calls global API function  "_codegen_build_" + target
  */
-runtime::Module Build(const Array<LoweredFunc>& funcs,
+runtime::Module Build(const Array<tir::LoweredFunc>& funcs,
                       const std::string& target);
 /*!
  * \brief Pack imported device library to a C file.