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/CLSobel7x7Kernel.cpp

diff --git a/src/core/CL/kernels/CLSobel7x7Kernel.cpp b/src/core/CL/kernels/CLSobel7x7Kernel.cpp
index 8c0b6a2..6d65ed9 100644
--- a/src/core/CL/kernels/CLSobel7x7Kernel.cpp
+++ b/src/core/CL/kernels/CLSobel7x7Kernel.cpp
@@ -129,16 +129,8 @@
     {
         unsigned int idx = 0;
         add_2D_tensor_argument(idx, _input, slice);
-
-        if(_run_sobel_x)
-        {
-            add_2D_tensor_argument(idx, _output_x, slice);
-        }
-
-        if(_run_sobel_y)
-        {
-            add_2D_tensor_argument(idx, _output_y, slice);
-        }
+        add_2D_tensor_argument_if((_run_sobel_x), idx, _output_x, slice);
+        add_2D_tensor_argument_if((_run_sobel_y), idx, _output_y, slice);
 
         enqueue(queue, *this, slice, lws_hint());
     }
@@ -241,17 +233,10 @@
     {
         unsigned int idx = 0;
 
-        if(_run_sobel_x)
-        {
-            add_2D_tensor_argument(idx, _input_x, slice);
-            add_2D_tensor_argument(idx, _output_x, slice);
-        }
-
-        if(_run_sobel_y)
-        {
-            add_2D_tensor_argument(idx, _input_y, slice);
-            add_2D_tensor_argument(idx, _output_y, slice);
-        }
+        add_2D_tensor_argument_if((_run_sobel_x), idx, _input_x, slice);
+        add_2D_tensor_argument_if((_run_sobel_x), idx, _output_x, slice);
+        add_2D_tensor_argument_if((_run_sobel_y), idx, _input_y, slice);
+        add_2D_tensor_argument_if((_run_sobel_y), idx, _output_y, slice);
 
         _kernel.setArg(idx++, 0 /*dummy*/);