ashutosh-arm commented on a change in pull request #9331: URL: https://github.com/apache/tvm/pull/9331#discussion_r733863577
########## File path: src/relay/backend/contrib/cmsisnn/extract_constants.cc ########## @@ -0,0 +1,158 @@ + +/* + * 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. + */ +#include <tvm/relay/attrs/nn.h> +#include <tvm/relay/expr_functor.h> +#include <tvm/relay/transform.h> +#include <tvm/runtime/ndarray.h> + +#include "../../../qnn/utils.h" +#include "../../../transforms/pattern_utils.h" + +namespace tvm { +namespace relay { +namespace contrib { +namespace cmsisnn { + +class ExtractConstantsMutator : public MixedModeMutator { + public: + explicit ExtractConstantsMutator(IRModule& mod) : mod_(mod) {} + + private: + String gen_var_name() { return "tvm_var_extract_const_" + std::to_string(var_count_++); } Review comment: It has crossed my mind, but wanted to see where this pass goes ends up being eventually. ########## File path: src/relay/backend/contrib/cmsisnn/extract_constants.cc ########## @@ -0,0 +1,158 @@ + +/* + * 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. + */ +#include <tvm/relay/attrs/nn.h> +#include <tvm/relay/expr_functor.h> +#include <tvm/relay/transform.h> +#include <tvm/runtime/ndarray.h> + +#include "../../../qnn/utils.h" +#include "../../../transforms/pattern_utils.h" + +namespace tvm { +namespace relay { +namespace contrib { +namespace cmsisnn { + +class ExtractConstantsMutator : public MixedModeMutator { + public: + explicit ExtractConstantsMutator(IRModule& mod) : mod_(mod) {} + + private: + String gen_var_name() { return "tvm_var_extract_const_" + std::to_string(var_count_++); } + + Expr VisitExpr_(const FunctionNode* func) final { + Function final_func = GetRef<Function>(func); + ++func_nesting_level_; + auto new_body = VisitExpr(func->body); + --func_nesting_level_; + if (!new_body.same_as(func->body)) { + final_func = Function(FreeVars(new_body), new_body, func->ret_type, + FreeTypeVars(new_body, mod_), func->attrs); + function_to_constants_.Set(GetRef<Function>(func), constants_within_function_); + constants_within_function_.clear(); + } + return final_func; + } + + Expr Rewrite_(const CallNode* call, const Expr& post) final { + Expr final_call = post; + auto* post_call = post.as<CallNode>(); + if (post_call == nullptr) { + return final_call; + } + + // Replace Constant arguments with Vars for ML Operators + // Perform this for non-main Call Nodes only + if (func_nesting_level_ && call->op.as<OpNode>()) { + Array<Expr> new_args; + for (auto& arg : post_call->args) { + auto* const_arg = arg.as<ConstantNode>(); + if (const_arg && !const_arg->is_scalar()) { + Var var_arg = Var(gen_var_name(), const_arg->tensor_type()); + new_args.push_back(var_arg); + constants_within_function_.push_back(GetRef<Constant>(const_arg)); + } else { + new_args.push_back(arg); + } + } + final_call = Call(call->op, new_args, call->attrs, {}); + } + + // Since the constants are kicked out of partitioned functions + // a new call to global function is needed + if (auto* glob_var_node = post_call->op.as<GlobalVarNode>()) { + auto glob_var = GetRef<GlobalVar>(glob_var_node); + auto glob_func = Downcast<Function>(mod_->Lookup(glob_var)); + auto new_glob_func = VisitExpr(glob_func); + if (!new_glob_func.same_as(glob_func)) { + mod_->Update(glob_var, Downcast<Function>(new_glob_func)); + Array<Expr> new_args = post_call->args; + ICHECK(function_to_constants_.find(glob_func) != function_to_constants_.end()); + for (auto constant : function_to_constants_.at(glob_func)) { + new_args.push_back(constant); + } + final_call = Call(glob_var, new_args); + } + } + + // Since the constants are kicked out of the local partitioned functions Review comment: I don't like the name extract_constant either. Can you suggest something? ########## File path: src/relay/backend/contrib/cmsisnn/generate_constants.cc ########## @@ -0,0 +1,230 @@ + +/* + * 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. + */ +#include <tvm/relay/attrs/nn.h> +#include <tvm/relay/attrs/transform.h> +#include <tvm/relay/expr_functor.h> +#include <tvm/relay/transform.h> +#include <tvm/runtime/ndarray.h> + +#include "../../../qnn/utils.h" +#include "../../../transforms/pattern_utils.h" + +namespace tvm { +namespace relay { +Expr MakeTranspose(Expr data, Array<Integer> axes); Review comment: Didn't know that. Thanks! ########## File path: src/relay/backend/contrib/cmsisnn/relay_to_tir.cc ########## @@ -43,23 +44,153 @@ class RelayToTIRVisitor : public MixedModeVisitor { inline IntImm ToArg(int32_t value) { return IntImm(DataType::Int(32), value); } void CreatePrimFuncForExtern(Array<tir::Var> func_signature, - tvm::Array<PrimExpr> call_extern_args) { + tvm::Array<PrimExpr> call_extern_args, int context_buffer_size = 0) { Map<String, ObjectRef> dict_attrs; dict_attrs.Set("global_symbol", func_name_); dict_attrs.Set("tir.noalias", Bool(true)); tir::Stmt body = tir::Evaluate( tvm::tir::Call(DataType::Int(8), tir::builtin::call_extern(), call_extern_args)); + if (context_buffer_size) { + // TODO(@ashutosh-arm) while supporting MVE, we need to move allocation through TVMBAW Review comment: In this version, I am using scope as "global" instead of "global.workspace". I was hoping this will get resolved in the following PR (for 4a) that fixes the buffer sizes. So, this was just a temporary change to fix the issue of fvp hang where the context buffer is needed. -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
