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/GCGEMMMatrixAccumulateBiasesKernel.cpp | 23 +++------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to 'src/core/GLES_COMPUTE/kernels/GCGEMMMatrixAccumulateBiasesKernel.cpp') diff --git a/src/core/GLES_COMPUTE/kernels/GCGEMMMatrixAccumulateBiasesKernel.cpp b/src/core/GLES_COMPUTE/kernels/GCGEMMMatrixAccumulateBiasesKernel.cpp index 944585daff..7ee39346f8 100644 --- a/src/core/GLES_COMPUTE/kernels/GCGEMMMatrixAccumulateBiasesKernel.cpp +++ b/src/core/GLES_COMPUTE/kernels/GCGEMMMatrixAccumulateBiasesKernel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017, 2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -117,26 +117,9 @@ void GCGEMMMatrixAccumulateBiasesKernel::run(const Window &window) { // Set arguments unsigned int idx = 0; - if(_accum->info()->data_type() == DataType::F32) - { - add_2D_tensor_argument(idx, _accum, 1, accum_slice); - add_1D_tensor_argument(idx, _biases, 2, biases_slice); - } - else if(_accum->info()->data_type() == DataType::F16) - { -#if defined(ACCUM_PROCESS_4X) - BufferParam param = { 1, 3 }; - add_2D_tensor_argument(idx, _accum, param, accum_slice); - param.binding_point = 2; - add_1D_tensor_argument(idx, _biases, param, biases_slice); -#elif defined(ACCUM_PROCESS_8X) /* ACCUM_PROCESS_4X */ - BufferParam param = { 1, 4 }; - add_2D_tensor_argument(idx, _accum, param, accum_slice); - param.binding_point = 2; - add_1D_tensor_argument(idx, _biases, param, biases_slice); -#endif /* ACCUM_PROCESS_4X */ - } + add_2D_tensor_argument(idx, _accum, 1, accum_slice); + add_1D_tensor_argument(idx, _biases, 2, biases_slice); _kernel.update_shader_params(); enqueue(*this, accum_slice, _lws); -- cgit v1.2.1