MarisaKirisame commented on a change in pull request #6152: URL: https://github.com/apache/incubator-tvm/pull/6152#discussion_r464178815
########## File path: tests/python/relay/test_analysis_basic_block_normal_form.py ########## @@ -0,0 +1,153 @@ +# 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. + +import tvm +from tvm import relay +from tvm.relay.analysis import check_basic_block_normal_form + +def test_one_block(): + x = relay.var('x') + y = relay.add(x, x) + z = relay.add(x, y) + assert check_basic_block_normal_form(z) + +def test_let(): + x = relay.var('x') + y = relay.var('y') + body = relay.Let(y, x, y) + assert check_basic_block_normal_form(body) + +def test_if(): + cond = relay.var('cond', dtype='bool', shape=()) + shared = relay.var('shared') + true_branch = shared + false_branch = relay.add(shared, shared) + body = relay.If(cond, true_branch, false_branch) + """ + The program below violates basic block normal form, as the scope of %shared + is ambiguous and should not be in that of true branch. + + free_var %cond: bool + if (%cond) { + free_var %shared + %shared + } else { + add(%shared, %shared) + } + """ + print(body) + assert not check_basic_block_normal_form(body) Review comment: is_basic_block_normal_form test if something is or is not in bbnf. check_basic_block_normal_form should assert it, and perhaps give more useful error message ########## File path: src/relay/transforms/to_basic_block_normal_form.cc ########## @@ -0,0 +1,259 @@ +/* + * 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 to_basic_block_normal_form.cc + * + * \brief Turn an expression to the basic normal form. + */ +#include <tvm/relay/analysis.h> +#include <tvm/relay/expr_functor.h> +#include <tvm/relay/transform.h> +#include <tvm/support/logging.h> + +#include "../../support/arena.h" +#include "../analysis/dependency_graph.h" +#include "let_list.h" +#include "pass_util.h" + +namespace tvm { +namespace relay { + +/* Fill expressions based on each scope's let list. Different from FillANF, + * only expressions with lifted scope will be pushed to the let list. + */ +class FillBasicBlock : ExprFunctor<Expr(const Expr&, const Var&)> { Review comment: can you reuse the Fill in to_anf? the code is almost identically the same, and duplicating it will make maintenance significantly harder. ---------------------------------------------------------------- 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
