From 9eac4b9e6be8a35fda845424c0635506b75627a3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=A2=85=ED=98=84/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Fri, 23 Aug 2019 14:34:19 +0900 Subject: [PATCH] [locop] Remove symbol lookup helper (#6863) This helper was introduced to reduce code diff during refactoring, and is no longer necessary. Signed-off-by: Jonghyun Park --- compiler/locop/src/CanonicalNodeSummaryBuilder.cpp | 39 +++++++++------------- 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/compiler/locop/src/CanonicalNodeSummaryBuilder.cpp b/compiler/locop/src/CanonicalNodeSummaryBuilder.cpp index 098a9d9..3a16e71 100644 --- a/compiler/locop/src/CanonicalNodeSummaryBuilder.cpp +++ b/compiler/locop/src/CanonicalNodeSummaryBuilder.cpp @@ -35,18 +35,6 @@ using locop::SymbolTable; namespace { -std::string symbol_lookup(const SymbolTable &tbl, const loco::Node *node) -{ - // This helper is now redundant but left to reduce code diffs - // TODO Remove this helper. - return tbl.lookup(node); -}; - -} // namespace - -namespace -{ - // TODO Move this into loco loco::TensorShape tensor_shape(const loco::NodeMixin *m) { @@ -184,7 +172,7 @@ NodeDesc default_node_desc(const SymbolTable &tbl, const loco::Node *node) for (uint32_t n = 0; n < node->arity(); ++n) { - res.arg(std::string{"arg"} + std::to_string(n), symbol_lookup(tbl, node->arg(n))); + res.arg(std::string{"arg"} + std::to_string(n), tbl.lookup(node->arg(n))); } res.state(NodeDesc::State::PartiallyKnown); @@ -199,6 +187,9 @@ public: // DO NOTHING } +private: + std::string nodename(const loco::Node *node) const { return _symtbl->lookup(node); } + public: // TODO Build a node description for each canonical node NodeDesc visit(const loco::Push *node) final @@ -206,7 +197,7 @@ public: NodeDesc res{opname(node)}; res.arg("index", node->indexed() ? pp::fmt(node->index()) : pp::fmt('?')); - res.arg("from", symbol_lookup(*_symtbl, node->from())); + res.arg("from", nodename(node->from())); res.state(NodeDesc::State::Complete); return res; @@ -228,7 +219,7 @@ public: { NodeDesc res{opname(node)}; - res.arg("input", symbol_lookup(*_symtbl, node->input())); + res.arg("input", nodename(node->input())); res.state(NodeDesc::State::Complete); return res; @@ -249,8 +240,8 @@ public: { NodeDesc res{opname(node)}; - res.arg("lhs", symbol_lookup(*_symtbl, node->lhs())); - res.arg("rhs", symbol_lookup(*_symtbl, node->rhs())); + res.arg("lhs", nodename(node->lhs())); + res.arg("rhs", nodename(node->rhs())); res.arg("axis", pp::fmt(node->axis())); res.state(NodeDesc::State::Complete); @@ -261,8 +252,8 @@ public: { NodeDesc res{opname(node)}; - res.arg("lhs", symbol_lookup(*_symtbl, node->lhs())); - res.arg("rhs", symbol_lookup(*_symtbl, node->rhs())); + res.arg("lhs", nodename(node->lhs())); + res.arg("rhs", nodename(node->rhs())); res.state(NodeDesc::State::Complete); return res; @@ -272,8 +263,8 @@ public: { NodeDesc res{opname(node)}; - res.arg("lhs", symbol_lookup(*_symtbl, node->lhs())); - res.arg("rhs", symbol_lookup(*_symtbl, node->rhs())); + res.arg("lhs", nodename(node->lhs())); + res.arg("rhs", nodename(node->rhs())); res.state(NodeDesc::State::Complete); return res; @@ -283,7 +274,7 @@ public: { NodeDesc res{opname(node)}; - res.arg("input", symbol_lookup(*_symtbl, node->input())); + res.arg("input", nodename(node->input())); res.arg("shape", pp::fmt(pretty(tensor_shape(node)))); res.state(NodeDesc::State::Complete); @@ -294,7 +285,7 @@ public: { NodeDesc res{opname(node)}; - res.arg("input", symbol_lookup(*_symtbl, node->input())); + res.arg("input", nodename(node->input())); res.state(NodeDesc::State::Complete); return res; @@ -304,7 +295,7 @@ public: { NodeDesc res{opname(node)}; - res.arg("input", symbol_lookup(*_symtbl, node->input())); + res.arg("input", nodename(node->input())); res.arg("axis", pp::fmt(node->axis())); res.state(NodeDesc::State::Complete); -- 2.7.4