areusch commented on a change in pull request #7785:
URL: https://github.com/apache/tvm/pull/7785#discussion_r623140515
##########
File path: tests/python/relay/aot/aot_test_utils.py
##########
@@ -108,11 +109,18 @@ def create_main(test_name, input_list, output_list,
output_path):
main_file.write("tvm_runtime_run(&network, inputs, outputs);")
for i in range(0, len(output_list)):
+ is_real_dtype = output_list[i].dtype == "float32"
Review comment:
maybe is_float_dtype, wasn't sure what real vs fake dtype was when I
read this :)
##########
File path: src/relay/backend/aot_executor_codegen.cc
##########
@@ -0,0 +1,672 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*!
+ * \file relay/backend/graph_codegen.cc
+ * \brief Graph runtime codegen
+ */
+
+#include <dmlc/any.h>
+#include <tvm/ir/module.h>
+#include <tvm/relay/expr_functor.h>
+#include <tvm/runtime/device_api.h>
+#include <tvm/tir/builtin.h>
+#include <tvm/tir/expr.h>
+#include <tvm/tir/stmt.h>
+
+#include <algorithm>
+#include <list>
+#include <string>
+#include <vector>
+
+#include "compile_engine.h"
+#include "utils.h"
+
+namespace tvm {
+namespace relay {
+namespace backend {
+
+using IntegerArray = Array<Integer>;
+using TargetsMap = std::unordered_map<int, Target>;
+
+class AotReturnSidVisitor : public ExprVisitor {
+ public:
+ explicit AotReturnSidVisitor(Map<Expr, Array<IntegerArray>>
storage_device_map)
+ : storage_device_map_{storage_device_map}, return_sid_{-1} {}
+
+ IntegerArray FindReturnSid(Function func) {
+ VisitExpr(func->body);
+ return return_sid_;
+ }
+
+ protected:
+ void AssignReturnSid(Expr e) {
+ auto iter = storage_device_map_.find(e);
+ if (iter != storage_device_map_.end()) {
+ return_sid_ = (*iter).second[0];
+ }
+ }
+
+ void VisitExpr_(const ConstantNode* cn) override {
+ ExprVisitor::VisitExpr_(cn);
+ AssignReturnSid(GetRef<Expr>(cn));
+ }
+
+ void VisitExpr_(const VarNode* vn) override {
+ ExprVisitor::VisitExpr_(vn);
+ AssignReturnSid(GetRef<Expr>(vn));
+ }
+
+ void VisitExpr_(const CallNode* cn) override {
+ ExprVisitor::VisitExpr_(cn);
+ AssignReturnSid(GetRef<Expr>(cn));
+ }
+
+ void VisitExpr_(const LetNode* op) override { VisitExpr(op->body); }
+
+ void VisitExpr_(const TupleNode* tn) override {
+ ExprVisitor::VisitExpr_(tn);
+ AssignReturnSid(GetRef<Expr>(tn));
+ }
+
+ private:
+ Map<Expr, Array<IntegerArray>> storage_device_map_;
+ IntegerArray return_sid_;
+};
+
+/*! \brief Code generator for AOT executor */
+class AOTExecutorCodegen : public ExprVisitor {
+ protected:
+ /*!
+ * \brief Utility function to allocate a DLTensor or TVMValue
+ * \param type the type of allocation
+ * \param num the number of variable to allocate on the stack
+ * \return PrimExpr representing the allocated object
+ */
+ PrimExpr StackAlloca(std::string type, size_t num) {
+ Array<PrimExpr> args = {tir::StringImm(type), ConstInt32(num)};
+ return tir::Call(DataType::Handle(), tir::builtin::tvm_stack_alloca(),
args);
+ }
+
+ /*!
+ * \brief Utility function to convert a concrete integer to a PrimExpr.
+ * \param num the number to convert
+ * \return PrimExpr representing num
+ */
+ inline PrimExpr ConstInt32(size_t num) {
+ ICHECK_LE(num, std::numeric_limits<int>::max());
+ return tir::make_const(DataType::Int(32), static_cast<int>(num));
+ }
+
+ /*!
+ * \brief Return a vector of variables that represents the sids for the
given Relay Expr
+ */
+ std::vector<tir::Var> PackSid(Expr expr) {
+ Array<IntegerArray> sids = storage_device_map_[expr];
+ std::vector<tir::Var> sid_vars;
+
+ // Note that an expression can have multiple sids associated with it
+ // e.g., returning multiple values from a function
+ for (const auto& sid : sids[0]) {
+ // Determine if an sid is an output buffer
+ int sid_int = static_cast<int>((sid.as<IntImmNode>())->value);
+ auto output_iter = std::find(return_sid_.begin(), return_sid_.end(),
sid_int);
+ if (output_iter != return_sid_.end()) {
+ int output_index = std::distance(return_sid_.begin(), output_iter);
+ sid_vars.push_back(main_signature_[input_vars_.size() + output_index]);
+ continue;
+ }
+ // Pack the sid inside the TVMValue
+ auto sid_array = te::Var(MakeString("sid_", sid, "_value"),
DataType::Handle());
+ auto sid_value = sids_table_[sid];
+ tvm::PrimExpr set_tensor =
+ tvm::tir::Call(DataType::Handle(),
tvm::tir::builtin::tvm_struct_set(),
+ {sid_array, 0, tir::builtin::kArrData, sid_value});
+ stmts_.push_back(tir::LetStmt(sid_array, StackAlloca("array", 1),
tir::Evaluate(set_tensor)));
+ sid_vars.push_back(sid_array);
+ }
+ return sid_vars;
+ }
+
+ /*!
+ * \brief Utility function to return a parameter associated with an
expression
+ * \param expr Relay Expression assicated with the parameter
+ * \return Variable that represents the DLTensor associated with the
parameters
+ */
+ tir::Var PackParam(Expr expr) {
+ // TODO(giuseros): Using call_extern to call into lookup_linked_param.
This is because the
+ // builtin::ret is not supported yet in the c target. Once return is
supported we can use
+ // tvm_call_packed_lowered().
+ int param_sid = param_storage_ids_[params_by_expr_[expr]];
+ auto lookup_linked_param_fn =
tir::StringImm(::tvm::runtime::symbol::tvm_lookup_linked_param);
+ auto param_array = te::Var(MakeString("param_", param_sid, "_array"),
DataType::Handle());
+
+ // Compose the lookup_call using a local stack
+ Array<tir::Stmt> lookup_call;
+ auto param_var = te::Var(MakeString("param_", param_sid, "_value"),
DataType::Handle());
+ auto ret_var = te::Var("ret_value", DataType::Handle());
+ auto ret_code = te::Var("ret_value", DataType::Handle());
+
+ lookup_call.push_back(tir::Evaluate(
+ tvm::tir::Call(DataType::Handle(), tvm::tir::builtin::tvm_struct_set(),
+ {param_var, 0, tir::builtin::kTVMValueContent,
ConstInt32(param_sid)})));
+ lookup_call.push_back(tir::Evaluate(
+ tvm::tir::Call(DataType::Handle(), tir::builtin::call_extern(),
+ {lookup_linked_param_fn, param_var, 0, 0, ret_var,
ret_code, 0})));
+ auto ret_var_handle = tvm::tir::Call(DataType::Handle(),
tvm::tir::builtin::tvm_struct_get(),
+ {ret_var, 0,
tir::builtin::kTVMValueContent});
+
+ // Set the param to the value returned by lookup_call
+ tvm::PrimExpr set_param_array =
+ tvm::tir::Call(DataType::Handle(), tvm::tir::builtin::tvm_struct_set(),
+ {param_array, 0, tir::builtin::kArrData,
ret_var_handle});
+ lookup_call.push_back(tir::Evaluate(set_param_array));
+
+ tir::Stmt lookup_body = tir::SeqStmt(lookup_call);
+
+ // Allocate the DLTensors on the stack
+ lookup_body = tir::LetStmt(param_var, StackAlloca("arg_value", 1),
lookup_body);
+ lookup_body = tir::LetStmt(ret_var, StackAlloca("arg_value", 1),
lookup_body);
+ lookup_body = tir::LetStmt(ret_code, StackAlloca("arg_value", 1),
lookup_body);
+ lookup_body = tir::LetStmt(param_array, StackAlloca("arg_value", 1),
lookup_body);
+ stmts_.push_back(lookup_body);
+ return param_array;
+ }
+
+ /*!
+ * brief Given an expression return the variable(s) associated with that
expression
+ */
+ std::vector<te::Var> FindExpr(Expr arg) {
+ auto input_iter = std::find(input_vars_.begin(), input_vars_.end(), arg);
+ if (input_iter != input_vars_.end()) {
+ // Input variable
+ int main_index = std::distance(input_vars_.begin(), input_iter);
+ return {main_signature_[main_index]};
+ } else if (params_by_expr_.find(arg) != params_by_expr_.end()) {
+ // Parameter of the network
+ return {PackParam(arg)};
+ } else {
+ // Storage identifier (i.e., intermediate memory)
+ return PackSid(arg);
+ }
+ }
+
+ /*!
+ * brief Call a function with a given name
+ */
+ void CreateFuncCall(Call call, std::string func_name) {
+ tvm::Array<PrimExpr> args{tvm::tir::StringImm(func_name)};
+ std::vector<tir::Stmt> CreateFuncCall_stmts;
Review comment:
nit: create_func_call_stmts
https://google.github.io/styleguide/cppguide.html#Variable_Names
##########
File path: tests/crt/aot_memory_test.cc
##########
@@ -28,17 +28,20 @@ TEST(AOTMemory, Allocate) {
tvm_workspace_t tvm_runtime_workspace;
StackMemoryManager_Init(&tvm_runtime_workspace, model_memory, 96);
-
- void* block_one = StackMemoryManager_Allocate(&tvm_runtime_workspace, 1);
+ void* block_one = NULL;
+ StackMemoryManager_Allocate(&tvm_runtime_workspace, 1, &block_one);
Review comment:
can you assert on the return code too?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
