From: 남궁석/On-Device Lab(SR)/Engineer/삼성전자 <sk.namkoong@samsung.com>
Date: Wed, 7 Aug 2019 09:14:16 +0000 (+0900)
Subject: [moco-tf] Remove redundant codes in FuseBinaryIntoPreceding (#6319)
X-Git-Tag: submit/tizen/20190809.050447~69
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c78e666f8cd2c2995591bcfcc1a83a3f84b9541;p=platform%2Fcore%2Fml%2Fnnfw.git

[moco-tf] Remove redundant codes in FuseBinaryIntoPreceding (#6319)

* [moco-tf] Remove redundant codes in FuseBinaryIntoPreceding

There are some redundant codes in `FuseBinaryIntoPreceding.cpp`
This commit will remove them.
- Exactly only one of variables(`xc` and `yc`) is `nullptr` because `is_only_one_valid` already checks.
- Then `addparam` and `mulparam` cannot be `nullptr`.
- After removing above condition, there can be only one case that `bchanged` can be returned, that is when `biasadd` is `nullptr`. However when `biasadd` is `nullptr`, bchanged is always `false`.

Signed-off-by: Seok NamKoong <sk.namkoong@samsung.com>

* apply comments

* add missing codes

* fix comments

* apply comments
---

diff --git a/compiler/moco-tf/src/Transforms/FuseBinaryIntoPreceding.cpp b/compiler/moco-tf/src/Transforms/FuseBinaryIntoPreceding.cpp
index b1b1f16..0ff26b2 100644
--- a/compiler/moco-tf/src/Transforms/FuseBinaryIntoPreceding.cpp
+++ b/compiler/moco-tf/src/Transforms/FuseBinaryIntoPreceding.cpp
@@ -305,13 +305,13 @@ bool fuse_to_preceding(loco::Graph *graph, moco::tf::TFMul *node)
     mulparam = xc;
     conv2d = dynamic_cast<moco::tf::TFConv2D *>(node->y());
   }
-  else if (yc != nullptr)
+  else // yc != nullptr
   {
     mulparam = yc;
     conv2d = dynamic_cast<moco::tf::TFConv2D *>(node->x());
   }
 
-  if (mulparam == nullptr || conv2d == nullptr)
+  if (conv2d == nullptr)
     return false;
 
   assert(mulparam->dtype() == loco::DataType::FLOAT32);
@@ -431,7 +431,7 @@ bool fuse_to_preceding(loco::Graph *graph, moco::tf::TFAdd *node)
     conv2d = dynamic_cast<moco::tf::TFConv2D *>(node->y());
     biasadd = dynamic_cast<moco::tf::TFBiasAdd *>(node->y());
   }
-  else if (yc != nullptr)
+  else // yc != nullptr
   {
     addparam = yc;
     conv2d = dynamic_cast<moco::tf::TFConv2D *>(node->x());
@@ -454,18 +454,15 @@ bool fuse_to_preceding(loco::Graph *graph, moco::tf::TFAdd *node)
     return false;
   }
 
-  bool bchanged = false;
-
-  if (conv2d != nullptr && addparam != nullptr)
+  if (conv2d != nullptr)
   {
     biasadd = create_biasadd_node<moco::tf::TFConv2D>(graph, addparam, conv2d);
-    bchanged = true;
   }
 
-  if (biasadd == nullptr || addparam == nullptr)
+  if (biasadd == nullptr)
   {
     // try next turn
-    return bchanged;
+    return false;
   }
 
   // Let's fuse addparam into biasadd bias