From abd03cfc7ba96462bc5a1ca6f4faa9ca22792158 Mon Sep 17 00:00:00 2001 From: Joel Liang Date: Mon, 8 Jan 2018 15:20:48 +0800 Subject: APPBROWSER-298: Remove the old shader common code Remove token pasting operator support for GLES shader Remove cs_shdaers/helpers.h (The old GLES shader common code) Remove class BufferParam. We don't need to pass the buffer_data_type_shift to GLES shader. Change-Id: Ic4fa6b2fb7647b8f69759f6077ae4a5b483cc04d Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/115448 Tested-by: Jenkins Reviewed-by: Frank Lei Reviewed-by: Anthony Barbier --- .../kernels/GCGEMMMatrixMultiplyKernel.cpp | 33 +++------------------- 1 file changed, 4 insertions(+), 29 deletions(-) (limited to 'src/core/GLES_COMPUTE/kernels/GCGEMMMatrixMultiplyKernel.cpp') diff --git a/src/core/GLES_COMPUTE/kernels/GCGEMMMatrixMultiplyKernel.cpp b/src/core/GLES_COMPUTE/kernels/GCGEMMMatrixMultiplyKernel.cpp index baf1a9b85e..32fbbfeefb 100644 --- a/src/core/GLES_COMPUTE/kernels/GCGEMMMatrixMultiplyKernel.cpp +++ b/src/core/GLES_COMPUTE/kernels/GCGEMMMatrixMultiplyKernel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017, 2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -201,35 +201,10 @@ void GCGEMMMatrixMultiplyKernel::run(const Window &window) } unsigned int idx = 0; - switch(_input0->info()->data_type()) - { - case DataType::F16: -#if defined(MM_PROCESS_4X) - add_2D_tensor_argument(idx, _input0, BufferParam(1, 2), slice); - add_2D_tensor_argument(idx, _input1, BufferParam(2, 3), slice_b); - add_2D_tensor_argument(idx, _output, BufferParam(3, 3), slice); -#elif defined(MM_PROCESS_4X_OPTIMIZED) /* MM_PROCESS_4X */ - add_2D_tensor_argument(idx, _input0, BufferParam(1, 4), slice); - add_2D_tensor_argument(idx, _input1, BufferParam(2, 3), slice_b); - add_2D_tensor_argument(idx, _output, BufferParam(3, 3), slice); -#elif defined(MM_PROCESS_8X) /* MM_PROCESS_4X */ - add_2D_tensor_argument(idx, _input0, BufferParam(1, 4), slice); - add_2D_tensor_argument(idx, _input1, BufferParam(2, 4), slice_b); - add_2D_tensor_argument(idx, _output, BufferParam(3, 4), slice); -#endif /* MM_PROCESS_4X */ - break; - - case DataType::F32: - add_2D_tensor_argument(idx, _input0, BufferParam(1, 2), slice); - add_2D_tensor_argument(idx, _input1, BufferParam(2, 2), slice_b); - add_2D_tensor_argument(idx, _output, BufferParam(3, 2), slice); - break; - - default: - ARM_COMPUTE_ERROR("Current data type is not supported"); - break; - } + add_2D_tensor_argument(idx, _input0, 1, slice); + add_2D_tensor_argument(idx, _input1, 2, slice_b); + add_2D_tensor_argument(idx, _output, 3, slice); _kernel.update_shader_params(); enqueue(*this, slice); } -- cgit v1.2.1