commit e1651a55c637708347c9adda4a77f1deffacf7d2
author Michalis Spyrou <michalis.spyrou@arm.com> Thu Jul 11 15:00:49 2019 +0100
committer Michalis Spyrou <michalis.spyrou@arm.com> Fri Jul 12 09:29:37 2019 +0000
tree ad58c09a1a9b141b17ad108799b70727df3c1667
parent bffb41e06c1276af00e1605ef934d05fa61f7127

COMPMID-2414 Add add_2D_tensor_argument_if for OpenCL

Change-Id: I8675b4b4face0be9416ae6c7a7023234d50fc0cb
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1524
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

src/core/CL/kernels/CLGEMMLowpOffsetContributionKernel.cpp

diff --git a/src/core/CL/kernels/CLGEMMLowpOffsetContributionKernel.cpp b/src/core/CL/kernels/CLGEMMLowpOffsetContributionKernel.cpp
index d348f2c..b0a3cf6 100644
--- a/src/core/CL/kernels/CLGEMMLowpOffsetContributionKernel.cpp
+++ b/src/core/CL/kernels/CLGEMMLowpOffsetContributionKernel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -243,18 +243,10 @@
     {
         unsigned int idx = 0;
         add_3D_tensor_argument(idx, _mm_result, slice);
-        if(_vector_sum_col != nullptr)
-        {
-            add_2D_tensor_argument(idx, _vector_sum_col, win_vector_sum_col);
-        }
-        if(_vector_sum_row != nullptr)
-        {
-            add_2D_tensor_argument(idx, _vector_sum_row, win_vector_sum_row);
-        }
-        if(_bias != nullptr)
-        {
-            add_1D_tensor_argument(idx, _bias, biases_slice);
-        }
+        add_2D_tensor_argument_if((_vector_sum_col != nullptr), idx, _vector_sum_col, win_vector_sum_col);
+        add_2D_tensor_argument_if((_vector_sum_row != nullptr), idx, _vector_sum_row, win_vector_sum_row);
+        add_1D_tensor_argument_if((_bias != nullptr), idx, _bias, biases_slice);
+
         enqueue(queue, *this, slice, lws_hint());
     }
     while(collapsed.slide_window_slice_3D(slice));