From 71ecf396bb08e302dc06b2c7ed44001894d3a2ea Mon Sep 17 00:00:00 2001 From: Vidhya Sudhan Loganathan Date: Fri, 31 Aug 2018 16:10:16 +0100 Subject: COMPMID-1266 : support for FP16 in CLWinogradConvolutionLayer Added support for FP16 in CLWinogradConvolutionLayer: 5x5 kernels and 3x3 kernels(COMPMID-937) Change-Id: I0f394cbdc978dd04176416e9f612aca3986b09e6 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/145537 Tested-by: Jenkins Reviewed-by: Giorgio Arena --- .../CL/cl_kernels/winograd_output_transform.cl | 961 +++++++++++---------- 1 file changed, 494 insertions(+), 467 deletions(-) (limited to 'src/core/CL/cl_kernels/winograd_output_transform.cl') diff --git a/src/core/CL/cl_kernels/winograd_output_transform.cl b/src/core/CL/cl_kernels/winograd_output_transform.cl index a1e7b3eb67..9be51f27ec 100644 --- a/src/core/CL/cl_kernels/winograd_output_transform.cl +++ b/src/core/CL/cl_kernels/winograd_output_transform.cl @@ -31,8 +31,9 @@ * @note The height of the output tile must be passed at compile time using -DOUTPUT_TILE_H: e.g. -DOUTPUT_TILE_H=2 * @note If this kernel is used to perform Winograd output transform 3x1, -DWINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL has to be passed at compile time * @note If this kernel is used to perform Winograd output transform 1x3, -DWINOGRAD_OUTPUT_TRANSFORM_VERTICAL has to be passed at compile time + * @note The data type must be passed at compile time using -DDATA_TYPE e.g. -DDATA_TYPE=float. Supported data types: float/half. * - * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32 + * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32/F16 * @param[in] src_stride_x Stride of the source tensor in X dimension (in bytes) * @param[in] src_step_x src_stride_x * number of elements along X processed per workitem(in bytes) * @param[in] src_stride_y Stride of the source tensor in Y dimension (in bytes) @@ -64,49 +65,49 @@ __kernel void winograd_output_transform_2x2_3x3_nchw( const __global uchar *src_addr = tensor3D_offset(&src, 0, 0, 0); // Load the values across the 16 or 4 channels to compose the 4x4 or 4x1 tile - float d00 = *((__global float *)(src_addr + 0 * src_stride_z)); - float d01 = *((__global float *)(src_addr + 1 * src_stride_z)); - float d02 = *((__global float *)(src_addr + 2 * src_stride_z)); - float d03 = *((__global float *)(src_addr + 3 * src_stride_z)); + DATA_TYPE d00 = *((__global DATA_TYPE *)(src_addr + 0 * src_stride_z)); + DATA_TYPE d01 = *((__global DATA_TYPE *)(src_addr + 1 * src_stride_z)); + DATA_TYPE d02 = *((__global DATA_TYPE *)(src_addr + 2 * src_stride_z)); + DATA_TYPE d03 = *((__global DATA_TYPE *)(src_addr + 3 * src_stride_z)); #if defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) || defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) // Compute the 2x1 or 1x2 output tile // out00 = d00 + d01 + d02 // out01 = d01 - d02 - d03 - float out00 = d00 + d01 + d02; - float out01 = d01 - d02 - d03; + DATA_TYPE out00 = d00 + d01 + d02; + DATA_TYPE out01 = d01 - d02 - d03; #else // defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) || defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) - float d10 = *((__global float *)(src_addr + 4 * src_stride_z)); - float d11 = *((__global float *)(src_addr + 5 * src_stride_z)); - float d12 = *((__global float *)(src_addr + 6 * src_stride_z)); - float d13 = *((__global float *)(src_addr + 7 * src_stride_z)); + DATA_TYPE d10 = *((__global DATA_TYPE *)(src_addr + 4 * src_stride_z)); + DATA_TYPE d11 = *((__global DATA_TYPE *)(src_addr + 5 * src_stride_z)); + DATA_TYPE d12 = *((__global DATA_TYPE *)(src_addr + 6 * src_stride_z)); + DATA_TYPE d13 = *((__global DATA_TYPE *)(src_addr + 7 * src_stride_z)); - float d20 = *((__global float *)(src_addr + 8 * src_stride_z)); - float d21 = *((__global float *)(src_addr + 9 * src_stride_z)); - float d22 = *((__global float *)(src_addr + 10 * src_stride_z)); - float d23 = *((__global float *)(src_addr + 11 * src_stride_z)); + DATA_TYPE d20 = *((__global DATA_TYPE *)(src_addr + 8 * src_stride_z)); + DATA_TYPE d21 = *((__global DATA_TYPE *)(src_addr + 9 * src_stride_z)); + DATA_TYPE d22 = *((__global DATA_TYPE *)(src_addr + 10 * src_stride_z)); + DATA_TYPE d23 = *((__global DATA_TYPE *)(src_addr + 11 * src_stride_z)); - float d30 = *((__global float *)(src_addr + 12 * src_stride_z)); - float d31 = *((__global float *)(src_addr + 13 * src_stride_z)); - float d32 = *((__global float *)(src_addr + 14 * src_stride_z)); - float d33 = *((__global float *)(src_addr + 15 * src_stride_z)); + DATA_TYPE d30 = *((__global DATA_TYPE *)(src_addr + 12 * src_stride_z)); + DATA_TYPE d31 = *((__global DATA_TYPE *)(src_addr + 13 * src_stride_z)); + DATA_TYPE d32 = *((__global DATA_TYPE *)(src_addr + 14 * src_stride_z)); + DATA_TYPE d33 = *((__global DATA_TYPE *)(src_addr + 15 * src_stride_z)); // Compute the 2x2 output tile - float k0 = d01 + d11 + d21; - float k1 = d02 + d12 + d22; - float k2 = d11 - d21 - d31; - float k3 = d12 - d22 - d32; + DATA_TYPE k0 = d01 + d11 + d21; + DATA_TYPE k1 = d02 + d12 + d22; + DATA_TYPE k2 = d11 - d21 - d31; + DATA_TYPE k3 = d12 - d22 - d32; // out00 = d00 + d10 + d20 + d01 + d11 + d21 + d02 + d12 + d22 // out01 = d01 + d11 + d21 - (d02 + d12 + d22) - (d03 + d13 + d23) // out10 = d10 - d20 - d30 + (d11 - d21 - d31) + (d12 - d22 - d32) // out11 = d11 - d21 - d31 - (d12 - d22 - d32) - (d13 - d23 - d33) - float out00 = d10; - float out01 = -d13; - float out10 = d10; - float out11 = -d13; + DATA_TYPE out00 = d10; + DATA_TYPE out01 = -d13; + DATA_TYPE out10 = d10; + DATA_TYPE out11 = -d13; out00 += d00 + d20 + k0 + k1; out01 += k0 - k1 - (d03 + d23); @@ -123,31 +124,31 @@ __kernel void winograd_output_transform_2x2_3x3_nchw( // Add bias Vector bias = CONVERT_TO_VECTOR_STRUCT_NO_STEP(bias); - float b = (float) * ((__global float *)(vector_offset(&bias, z_out))); + DATA_TYPE b = (DATA_TYPE) * ((__global DATA_TYPE *)(vector_offset(&bias, z_out))); - out00 += (float)b; - out01 += (float)b; + out00 += (DATA_TYPE)b; + out01 += (DATA_TYPE)b; #endif // defined(HAS_BIAS) // Get output address - __global uchar *dst_addr = dst_ptr + dst_offset_first_element_in_bytes + x_out * sizeof(float) + y_out * dst_stride_y + z_out * dst_stride_z; + __global uchar *dst_addr = dst_ptr + dst_offset_first_element_in_bytes + x_out * sizeof(DATA_TYPE) + y_out * dst_stride_y + z_out * dst_stride_z; // Store the output tile #if defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) - *((__global float *)(dst_addr + 0 * dst_stride_y)) = out00; - *((__global float *)(dst_addr + 1 * dst_stride_y)) = out01; + *((__global DATA_TYPE *)(dst_addr + 0 * dst_stride_y)) = out00; + *((__global DATA_TYPE *)(dst_addr + 1 * dst_stride_y)) = out01; #else // defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) - vstore2((float2)(out00, out01), 0, (__global float *)(dst_addr + 0 * dst_stride_y)); + vstore2((VEC_DATA_TYPE(DATA_TYPE, 2))(out00, out01), 0, (__global DATA_TYPE *)(dst_addr + 0 * dst_stride_y)); #endif // defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) #if !defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) && !defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) #if defined(HAS_BIAS) // Add bias - out10 += (float)b; - out11 += (float)b; + out10 += (DATA_TYPE)b; + out11 += (DATA_TYPE)b; #endif // defined(HAS_BIAS) - vstore2((float2)(out10, out11), 0, (__global float *)(dst_addr + 1 * dst_stride_y)); + vstore2((VEC_DATA_TYPE(DATA_TYPE, 2))(out10, out11), 0, (__global DATA_TYPE *)(dst_addr + 1 * dst_stride_y)); #endif // !defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) && !defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) } @@ -158,8 +159,9 @@ __kernel void winograd_output_transform_2x2_3x3_nchw( * @note The height of the output tile must be passed at compile time using -DOUTPUT_TILE_H: e.g. -DOUTPUT_TILE_H=4 * @note If this kernel is used to perform Winograd output transform 3x1, -DWINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL has to be passed at compile time * @note If this kernel is used to perform Winograd output transform 1x3, -DWINOGRAD_OUTPUT_TRANSFORM_VERTICAL has to be passed at compile time + * @note The data type must be passed at compile time using -DDATA_TYPE e.g. -DDATA_TYPE=float. Supported data types: float/half. * - * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32 + * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32/F16 * @param[in] src_stride_x Stride of the source tensor in X dimension (in bytes) * @param[in] src_step_x src_stride_x * number of elements along X processed per workitem(in bytes) * @param[in] src_stride_y Stride of the source tensor in Y dimension (in bytes) @@ -191,63 +193,63 @@ __kernel void winograd_output_transform_4x4_3x3_nchw( const __global uchar *src_addr = tensor3D_offset(&src, 0, 0, 0); // Load the values across the channels to compose the 6x6 or 6x1 tile - float d00 = *((__global float *)(src_addr + 0 * src_stride_z)); - float d01 = *((__global float *)(src_addr + 1 * src_stride_z)); - float d02 = *((__global float *)(src_addr + 2 * src_stride_z)); - float d03 = *((__global float *)(src_addr + 3 * src_stride_z)); - float d04 = *((__global float *)(src_addr + 4 * src_stride_z)); - float d05 = *((__global float *)(src_addr + 5 * src_stride_z)); + DATA_TYPE d00 = *((__global DATA_TYPE *)(src_addr + 0 * src_stride_z)); + DATA_TYPE d01 = *((__global DATA_TYPE *)(src_addr + 1 * src_stride_z)); + DATA_TYPE d02 = *((__global DATA_TYPE *)(src_addr + 2 * src_stride_z)); + DATA_TYPE d03 = *((__global DATA_TYPE *)(src_addr + 3 * src_stride_z)); + DATA_TYPE d04 = *((__global DATA_TYPE *)(src_addr + 4 * src_stride_z)); + DATA_TYPE d05 = *((__global DATA_TYPE *)(src_addr + 5 * src_stride_z)); #if defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) || defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) // Compute out00, out01, out02 and out03 - float out00 = d00 + d01 + d02 + d03 + d04; - float out01 = d01 - d02 + 2.0f * d03 - 2.0f * d04; - float out02 = d01 + d02 + 4.0f * d03 + 4.0f * d04; - float out03 = d01 - d02 + 8.0f * d03 - 8.0f * d04 + d05; + DATA_TYPE out00 = d00 + d01 + d02 + d03 + d04; + DATA_TYPE out01 = d01 - d02 + 2.0f * d03 - 2.0f * d04; + DATA_TYPE out02 = d01 + d02 + 4.0f * d03 + 4.0f * d04; + DATA_TYPE out03 = d01 - d02 + 8.0f * d03 - 8.0f * d04 + d05; #else // defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) || defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) - float d10 = *((__global float *)(src_addr + 6 * src_stride_z)); - float d11 = *((__global float *)(src_addr + 7 * src_stride_z)); - float d12 = *((__global float *)(src_addr + 8 * src_stride_z)); - float d13 = *((__global float *)(src_addr + 9 * src_stride_z)); - float d14 = *((__global float *)(src_addr + 10 * src_stride_z)); - float d15 = *((__global float *)(src_addr + 11 * src_stride_z)); - - float d20 = *((__global float *)(src_addr + 12 * src_stride_z)); - float d21 = *((__global float *)(src_addr + 13 * src_stride_z)); - float d22 = *((__global float *)(src_addr + 14 * src_stride_z)); - float d23 = *((__global float *)(src_addr + 15 * src_stride_z)); - float d24 = *((__global float *)(src_addr + 16 * src_stride_z)); - float d25 = *((__global float *)(src_addr + 17 * src_stride_z)); - - float d30 = *((__global float *)(src_addr + 18 * src_stride_z)); - float d31 = *((__global float *)(src_addr + 19 * src_stride_z)); - float d32 = *((__global float *)(src_addr + 20 * src_stride_z)); - float d33 = *((__global float *)(src_addr + 21 * src_stride_z)); - float d34 = *((__global float *)(src_addr + 22 * src_stride_z)); - float d35 = *((__global float *)(src_addr + 23 * src_stride_z)); - - float d40 = *((__global float *)(src_addr + 24 * src_stride_z)); - float d41 = *((__global float *)(src_addr + 25 * src_stride_z)); - float d42 = *((__global float *)(src_addr + 26 * src_stride_z)); - float d43 = *((__global float *)(src_addr + 27 * src_stride_z)); - float d44 = *((__global float *)(src_addr + 28 * src_stride_z)); - float d45 = *((__global float *)(src_addr + 29 * src_stride_z)); - - float d50 = *((__global float *)(src_addr + 30 * src_stride_z)); - float d51 = *((__global float *)(src_addr + 31 * src_stride_z)); - float d52 = *((__global float *)(src_addr + 32 * src_stride_z)); - float d53 = *((__global float *)(src_addr + 33 * src_stride_z)); - float d54 = *((__global float *)(src_addr + 34 * src_stride_z)); - float d55 = *((__global float *)(src_addr + 35 * src_stride_z)); + DATA_TYPE d10 = *((__global DATA_TYPE *)(src_addr + 6 * src_stride_z)); + DATA_TYPE d11 = *((__global DATA_TYPE *)(src_addr + 7 * src_stride_z)); + DATA_TYPE d12 = *((__global DATA_TYPE *)(src_addr + 8 * src_stride_z)); + DATA_TYPE d13 = *((__global DATA_TYPE *)(src_addr + 9 * src_stride_z)); + DATA_TYPE d14 = *((__global DATA_TYPE *)(src_addr + 10 * src_stride_z)); + DATA_TYPE d15 = *((__global DATA_TYPE *)(src_addr + 11 * src_stride_z)); + + DATA_TYPE d20 = *((__global DATA_TYPE *)(src_addr + 12 * src_stride_z)); + DATA_TYPE d21 = *((__global DATA_TYPE *)(src_addr + 13 * src_stride_z)); + DATA_TYPE d22 = *((__global DATA_TYPE *)(src_addr + 14 * src_stride_z)); + DATA_TYPE d23 = *((__global DATA_TYPE *)(src_addr + 15 * src_stride_z)); + DATA_TYPE d24 = *((__global DATA_TYPE *)(src_addr + 16 * src_stride_z)); + DATA_TYPE d25 = *((__global DATA_TYPE *)(src_addr + 17 * src_stride_z)); + + DATA_TYPE d30 = *((__global DATA_TYPE *)(src_addr + 18 * src_stride_z)); + DATA_TYPE d31 = *((__global DATA_TYPE *)(src_addr + 19 * src_stride_z)); + DATA_TYPE d32 = *((__global DATA_TYPE *)(src_addr + 20 * src_stride_z)); + DATA_TYPE d33 = *((__global DATA_TYPE *)(src_addr + 21 * src_stride_z)); + DATA_TYPE d34 = *((__global DATA_TYPE *)(src_addr + 22 * src_stride_z)); + DATA_TYPE d35 = *((__global DATA_TYPE *)(src_addr + 23 * src_stride_z)); + + DATA_TYPE d40 = *((__global DATA_TYPE *)(src_addr + 24 * src_stride_z)); + DATA_TYPE d41 = *((__global DATA_TYPE *)(src_addr + 25 * src_stride_z)); + DATA_TYPE d42 = *((__global DATA_TYPE *)(src_addr + 26 * src_stride_z)); + DATA_TYPE d43 = *((__global DATA_TYPE *)(src_addr + 27 * src_stride_z)); + DATA_TYPE d44 = *((__global DATA_TYPE *)(src_addr + 28 * src_stride_z)); + DATA_TYPE d45 = *((__global DATA_TYPE *)(src_addr + 29 * src_stride_z)); + + DATA_TYPE d50 = *((__global DATA_TYPE *)(src_addr + 30 * src_stride_z)); + DATA_TYPE d51 = *((__global DATA_TYPE *)(src_addr + 31 * src_stride_z)); + DATA_TYPE d52 = *((__global DATA_TYPE *)(src_addr + 32 * src_stride_z)); + DATA_TYPE d53 = *((__global DATA_TYPE *)(src_addr + 33 * src_stride_z)); + DATA_TYPE d54 = *((__global DATA_TYPE *)(src_addr + 34 * src_stride_z)); + DATA_TYPE d55 = *((__global DATA_TYPE *)(src_addr + 35 * src_stride_z)); // Compute out00, out01, out02 and out03 - float out00 = d01 + d21 + d41 + d11 + d31; - float out01 = d01 + d21 + d41 + d11 + d31; - float out02 = d01 + d21 + d41 + d11 + d31; - float out03 = d01 + d21 + d41 + d11 + d31; + DATA_TYPE out00 = d01 + d21 + d41 + d11 + d31; + DATA_TYPE out01 = d01 + d21 + d41 + d11 + d31; + DATA_TYPE out02 = d01 + d21 + d41 + d11 + d31; + DATA_TYPE out03 = d01 + d21 + d41 + d11 + d31; - float k0 = d03 + d04 + d13 + d14 + d23 + d24 + d33 + d34 + d43 + d44; - float k1 = 2.0f * d03 - 2.0f * d04 + 2.0f * d13 - 2.0f * d14 + 2.0f * d23 - 2.0f * d24 + 2.0f * d33 - 2.0f * d34 + 2.0f * d43 - 2.0f * d44; + DATA_TYPE k0 = d03 + d04 + d13 + d14 + d23 + d24 + d33 + d34 + d43 + d44; + DATA_TYPE k1 = 2.0f * d03 - 2.0f * d04 + 2.0f * d13 - 2.0f * d14 + 2.0f * d23 - 2.0f * d24 + 2.0f * d33 - 2.0f * d34 + 2.0f * d43 - 2.0f * d44; out00 += k0 + d00 + d02 + d10 + d12 + d20 + d22 + d30 + d32 + d40 + d42; out01 += k1 - d02 - d12 - d22 - d32 - d42; @@ -255,10 +257,10 @@ __kernel void winograd_output_transform_4x4_3x3_nchw( out03 += 4.0f * k1 - d02 - d12 - d22 - d32 - d42 + d05 + d15 + d25 + d35 + d45; // Compute out10, out11, out12 and out13 - float out10 = d11 - d21 + 2.0f * d31 - 2.0f * d41; - float out11 = d11 - d21 + 2.0f * d31 - 2.0f * d41; - float out12 = d11 - d21 + 2.0f * d31 - 2.0f * d41; - float out13 = d11 - d21 + 2.0f * d31 - 2.0f * d41; + DATA_TYPE out10 = d11 - d21 + 2.0f * d31 - 2.0f * d41; + DATA_TYPE out11 = d11 - d21 + 2.0f * d31 - 2.0f * d41; + DATA_TYPE out12 = d11 - d21 + 2.0f * d31 - 2.0f * d41; + DATA_TYPE out13 = d11 - d21 + 2.0f * d31 - 2.0f * d41; k0 = d13 + d14 - d23 - d24 + 2.0f * d33 + 2.0f * d34 - 2.0f * d43 - 2.0f * d44; k1 = 2.0f * d13 - 2.0f * d14 - 2.0f * d23 + 2.0f * d24 + 4.0f * d33 - 4.0f * d34 - 4.0f * d43 + 4.0f * d44; @@ -269,10 +271,10 @@ __kernel void winograd_output_transform_4x4_3x3_nchw( out13 += 4.0f * k1 - d12 + d15 + d22 - d25 - 2.0f * d32 + 2.0f * d35 + 2.0f * d42 - 2.0f * d45; // Compute out20, out21, out22 and out23 - float out20 = d11 + d21 + 4.0f * d31 + 4.0f * d41; - float out21 = d11 + d21 + 4.0f * d31 + 4.0f * d41; - float out22 = d11 + d21 + 4.0f * d31 + 4.0f * d41; - float out23 = d11 + d21 + 4.0f * d31 + 4.0f * d41; + DATA_TYPE out20 = d11 + d21 + 4.0f * d31 + 4.0f * d41; + DATA_TYPE out21 = d11 + d21 + 4.0f * d31 + 4.0f * d41; + DATA_TYPE out22 = d11 + d21 + 4.0f * d31 + 4.0f * d41; + DATA_TYPE out23 = d11 + d21 + 4.0f * d31 + 4.0f * d41; k0 = d13 + d14 + d23 + d24 + 4.0f * d33 + 4.0f * d34 + 4.0f * d43 + 4.0f * d44; k1 = 2.0f * d13 - 2.0f * d14 + 2.0f * d23 - 2.0f * d24 + 8.0f * d33 - 8.0f * d34 + 8.0f * d43 - 8.0f * d44; @@ -283,10 +285,10 @@ __kernel void winograd_output_transform_4x4_3x3_nchw( out23 += 4.0f * k1 - d12 + d15 - d22 + d25 - 4.0f * d32 + 4.0f * d35 - 4.0f * d42 + 4.0f * d45; // Compute out30, out31, out32 and out33 - float out30 = d11 - d21 + 8.0f * d31 - 8.0f * d41 + d51; - float out31 = d11 - d21 + 8.0f * d31 - 8.0f * d41 + d51; - float out32 = d11 - d21 + 8.0f * d31 - 8.0f * d41 + d51; - float out33 = d11 - d21 + 8.0f * d31 - 8.0f * d41 + d51; + DATA_TYPE out30 = d11 - d21 + 8.0f * d31 - 8.0f * d41 + d51; + DATA_TYPE out31 = d11 - d21 + 8.0f * d31 - 8.0f * d41 + d51; + DATA_TYPE out32 = d11 - d21 + 8.0f * d31 - 8.0f * d41 + d51; + DATA_TYPE out33 = d11 - d21 + 8.0f * d31 - 8.0f * d41 + d51; k0 = d13 + d14 - d23 - d24 + 8.0f * d33 + 8.0f * d34 - 8.0f * d43 - 8.0f * d44 + d53 + d54; k1 = 2.0f * d13 - 2.0f * d14 - 2.0f * d23 + 2.0f * d24 + 16.0f * d33 - 16.0f * d34 - 16.0f * d43 + 16.0f * d44 + 2.0f * d53 - 2.0f * d54; @@ -306,48 +308,48 @@ __kernel void winograd_output_transform_4x4_3x3_nchw( // Add bias Vector bias = CONVERT_TO_VECTOR_STRUCT_NO_STEP(bias); - float b = (float) * ((__global float *)(vector_offset(&bias, z_out))); + DATA_TYPE b = (DATA_TYPE) * ((__global DATA_TYPE *)(vector_offset(&bias, z_out))); - out00 += (float)b; - out01 += (float)b; - out02 += (float)b; - out03 += (float)b; + out00 += (DATA_TYPE)b; + out01 += (DATA_TYPE)b; + out02 += (DATA_TYPE)b; + out03 += (DATA_TYPE)b; #endif // defined(HAS_BIAS) // Get output address - __global uchar *dst_addr = dst_ptr + dst_offset_first_element_in_bytes + x_out * sizeof(float) + y_out * dst_stride_y + z_out * dst_stride_z; + __global uchar *dst_addr = dst_ptr + dst_offset_first_element_in_bytes + x_out * sizeof(DATA_TYPE) + y_out * dst_stride_y + z_out * dst_stride_z; // Store the output tile #if defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) - *((__global float *)(dst_addr + 0 * dst_stride_y)) = out00; - *((__global float *)(dst_addr + 1 * dst_stride_y)) = out01; - *((__global float *)(dst_addr + 2 * dst_stride_y)) = out02; - *((__global float *)(dst_addr + 3 * dst_stride_y)) = out03; + *((__global DATA_TYPE *)(dst_addr + 0 * dst_stride_y)) = out00; + *((__global DATA_TYPE *)(dst_addr + 1 * dst_stride_y)) = out01; + *((__global DATA_TYPE *)(dst_addr + 2 * dst_stride_y)) = out02; + *((__global DATA_TYPE *)(dst_addr + 3 * dst_stride_y)) = out03; #else // defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) - vstore4((float4)(out00, out01, out02, out03), 0, (__global float *)(dst_addr + 0 * dst_stride_y)); + vstore4((VEC_DATA_TYPE(DATA_TYPE, 4))(out00, out01, out02, out03), 0, (__global DATA_TYPE *)(dst_addr + 0 * dst_stride_y)); #endif // defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) #if !defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) && !defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) #if defined(HAS_BIAS) // Add bias - out10 += (float)b; - out11 += (float)b; - out12 += (float)b; - out13 += (float)b; - - out20 += (float)b; - out21 += (float)b; - out22 += (float)b; - out23 += (float)b; - - out30 += (float)b; - out31 += (float)b; - out32 += (float)b; - out33 += (float)b; + out10 += (DATA_TYPE)b; + out11 += (DATA_TYPE)b; + out12 += (DATA_TYPE)b; + out13 += (DATA_TYPE)b; + + out20 += (DATA_TYPE)b; + out21 += (DATA_TYPE)b; + out22 += (DATA_TYPE)b; + out23 += (DATA_TYPE)b; + + out30 += (DATA_TYPE)b; + out31 += (DATA_TYPE)b; + out32 += (DATA_TYPE)b; + out33 += (DATA_TYPE)b; #endif // defined(HAS_BIAS) - vstore4((float4)(out10, out11, out12, out13), 0, (__global float *)(dst_addr + 1 * dst_stride_y)); - vstore4((float4)(out20, out21, out22, out23), 0, (__global float *)(dst_addr + 2 * dst_stride_y)); - vstore4((float4)(out30, out31, out32, out33), 0, (__global float *)(dst_addr + 3 * dst_stride_y)); + vstore4((VEC_DATA_TYPE(DATA_TYPE, 4))(out10, out11, out12, out13), 0, (__global DATA_TYPE *)(dst_addr + 1 * dst_stride_y)); + vstore4((VEC_DATA_TYPE(DATA_TYPE, 4))(out20, out21, out22, out23), 0, (__global DATA_TYPE *)(dst_addr + 2 * dst_stride_y)); + vstore4((VEC_DATA_TYPE(DATA_TYPE, 4))(out30, out31, out32, out33), 0, (__global DATA_TYPE *)(dst_addr + 3 * dst_stride_y)); #endif // !defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) && !defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) } @@ -358,8 +360,9 @@ __kernel void winograd_output_transform_4x4_3x3_nchw( * @note The height of the output tile must be passed at compile time using -DOUTPUT_TILE_H: e.g. -DOUTPUT_TILE_H=4 * @note If this kernel is used to perform Winograd output transform 3x1, -DWINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL has to be passed at compile time * @note If this kernel is used to perform Winograd output transform 1x3, -DWINOGRAD_OUTPUT_TRANSFORM_VERTICAL has to be passed at compile time + * @note The data type must be passed at compile time using -DDATA_TYPE e.g. -DDATA_TYPE=float. Supported data types: float/half. * - * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32 + * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32/F16 * @param[in] src_stride_x Stride of the source tensor in X dimension (in bytes) * @param[in] src_step_x src_stride_x * number of elements along X processed per workitem(in bytes) * @param[in] src_stride_y Stride of the source tensor in Y dimension (in bytes) @@ -391,64 +394,64 @@ __kernel void winograd_output_transform_4x4_3x3_nhwc( const __global uchar *src_addr = tensor3D_offset(&src, 0, 0, 0); // Load the values across the 36 channels to compose the 6x6 or 6x1 tile - float d00 = *((__global float *)(src_addr + 0 * src_stride_z)); - float d01 = *((__global float *)(src_addr + 1 * src_stride_z)); - float d02 = *((__global float *)(src_addr + 2 * src_stride_z)); - float d03 = *((__global float *)(src_addr + 3 * src_stride_z)); - float d04 = *((__global float *)(src_addr + 4 * src_stride_z)); - float d05 = *((__global float *)(src_addr + 5 * src_stride_z)); + DATA_TYPE d00 = *((__global DATA_TYPE *)(src_addr + 0 * src_stride_z)); + DATA_TYPE d01 = *((__global DATA_TYPE *)(src_addr + 1 * src_stride_z)); + DATA_TYPE d02 = *((__global DATA_TYPE *)(src_addr + 2 * src_stride_z)); + DATA_TYPE d03 = *((__global DATA_TYPE *)(src_addr + 3 * src_stride_z)); + DATA_TYPE d04 = *((__global DATA_TYPE *)(src_addr + 4 * src_stride_z)); + DATA_TYPE d05 = *((__global DATA_TYPE *)(src_addr + 5 * src_stride_z)); #if defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) || defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) // Compute out00, out01, out02 and out03 - float out00 = d00 + d01 + d02 + d03 + d04; - float out01 = d01 - d02 + 2.0f * d03 - 2.0f * d04; - float out02 = d01 + d02 + 4.0f * d03 + 4.0f * d04; - float out03 = d01 - d02 + 8.0f * d03 - 8.0f * d04 + d05; + DATA_TYPE out00 = d00 + d01 + d02 + d03 + d04; + DATA_TYPE out01 = d01 - d02 + 2.0f * d03 - 2.0f * d04; + DATA_TYPE out02 = d01 + d02 + 4.0f * d03 + 4.0f * d04; + DATA_TYPE out03 = d01 - d02 + 8.0f * d03 - 8.0f * d04 + d05; #else // defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) || defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) - float d10 = *((__global float *)(src_addr + 6 * src_stride_z)); - float d11 = *((__global float *)(src_addr + 7 * src_stride_z)); - float d12 = *((__global float *)(src_addr + 8 * src_stride_z)); - float d13 = *((__global float *)(src_addr + 9 * src_stride_z)); - float d14 = *((__global float *)(src_addr + 10 * src_stride_z)); - float d15 = *((__global float *)(src_addr + 11 * src_stride_z)); - - float d20 = *((__global float *)(src_addr + 12 * src_stride_z)); - float d21 = *((__global float *)(src_addr + 13 * src_stride_z)); - float d22 = *((__global float *)(src_addr + 14 * src_stride_z)); - float d23 = *((__global float *)(src_addr + 15 * src_stride_z)); - float d24 = *((__global float *)(src_addr + 16 * src_stride_z)); - float d25 = *((__global float *)(src_addr + 17 * src_stride_z)); - - float d30 = *((__global float *)(src_addr + 18 * src_stride_z)); - float d31 = *((__global float *)(src_addr + 19 * src_stride_z)); - float d32 = *((__global float *)(src_addr + 20 * src_stride_z)); - float d33 = *((__global float *)(src_addr + 21 * src_stride_z)); - float d34 = *((__global float *)(src_addr + 22 * src_stride_z)); - float d35 = *((__global float *)(src_addr + 23 * src_stride_z)); - - float d40 = *((__global float *)(src_addr + 24 * src_stride_z)); - float d41 = *((__global float *)(src_addr + 25 * src_stride_z)); - float d42 = *((__global float *)(src_addr + 26 * src_stride_z)); - float d43 = *((__global float *)(src_addr + 27 * src_stride_z)); - float d44 = *((__global float *)(src_addr + 28 * src_stride_z)); - float d45 = *((__global float *)(src_addr + 29 * src_stride_z)); - - float d50 = *((__global float *)(src_addr + 30 * src_stride_z)); - float d51 = *((__global float *)(src_addr + 31 * src_stride_z)); - float d52 = *((__global float *)(src_addr + 32 * src_stride_z)); - float d53 = *((__global float *)(src_addr + 33 * src_stride_z)); - float d54 = *((__global float *)(src_addr + 34 * src_stride_z)); - float d55 = *((__global float *)(src_addr + 35 * src_stride_z)); + DATA_TYPE d10 = *((__global DATA_TYPE *)(src_addr + 6 * src_stride_z)); + DATA_TYPE d11 = *((__global DATA_TYPE *)(src_addr + 7 * src_stride_z)); + DATA_TYPE d12 = *((__global DATA_TYPE *)(src_addr + 8 * src_stride_z)); + DATA_TYPE d13 = *((__global DATA_TYPE *)(src_addr + 9 * src_stride_z)); + DATA_TYPE d14 = *((__global DATA_TYPE *)(src_addr + 10 * src_stride_z)); + DATA_TYPE d15 = *((__global DATA_TYPE *)(src_addr + 11 * src_stride_z)); + + DATA_TYPE d20 = *((__global DATA_TYPE *)(src_addr + 12 * src_stride_z)); + DATA_TYPE d21 = *((__global DATA_TYPE *)(src_addr + 13 * src_stride_z)); + DATA_TYPE d22 = *((__global DATA_TYPE *)(src_addr + 14 * src_stride_z)); + DATA_TYPE d23 = *((__global DATA_TYPE *)(src_addr + 15 * src_stride_z)); + DATA_TYPE d24 = *((__global DATA_TYPE *)(src_addr + 16 * src_stride_z)); + DATA_TYPE d25 = *((__global DATA_TYPE *)(src_addr + 17 * src_stride_z)); + + DATA_TYPE d30 = *((__global DATA_TYPE *)(src_addr + 18 * src_stride_z)); + DATA_TYPE d31 = *((__global DATA_TYPE *)(src_addr + 19 * src_stride_z)); + DATA_TYPE d32 = *((__global DATA_TYPE *)(src_addr + 20 * src_stride_z)); + DATA_TYPE d33 = *((__global DATA_TYPE *)(src_addr + 21 * src_stride_z)); + DATA_TYPE d34 = *((__global DATA_TYPE *)(src_addr + 22 * src_stride_z)); + DATA_TYPE d35 = *((__global DATA_TYPE *)(src_addr + 23 * src_stride_z)); + + DATA_TYPE d40 = *((__global DATA_TYPE *)(src_addr + 24 * src_stride_z)); + DATA_TYPE d41 = *((__global DATA_TYPE *)(src_addr + 25 * src_stride_z)); + DATA_TYPE d42 = *((__global DATA_TYPE *)(src_addr + 26 * src_stride_z)); + DATA_TYPE d43 = *((__global DATA_TYPE *)(src_addr + 27 * src_stride_z)); + DATA_TYPE d44 = *((__global DATA_TYPE *)(src_addr + 28 * src_stride_z)); + DATA_TYPE d45 = *((__global DATA_TYPE *)(src_addr + 29 * src_stride_z)); + + DATA_TYPE d50 = *((__global DATA_TYPE *)(src_addr + 30 * src_stride_z)); + DATA_TYPE d51 = *((__global DATA_TYPE *)(src_addr + 31 * src_stride_z)); + DATA_TYPE d52 = *((__global DATA_TYPE *)(src_addr + 32 * src_stride_z)); + DATA_TYPE d53 = *((__global DATA_TYPE *)(src_addr + 33 * src_stride_z)); + DATA_TYPE d54 = *((__global DATA_TYPE *)(src_addr + 34 * src_stride_z)); + DATA_TYPE d55 = *((__global DATA_TYPE *)(src_addr + 35 * src_stride_z)); // Compute out00, out01, out02 and out03 - float out00 = d01 + d21 + d41 + d11 + d31; - float out01 = d01 + d21 + d41 + d11 + d31; - float out02 = d01 + d21 + d41 + d11 + d31; - float out03 = d01 + d21 + d41 + d11 + d31; + DATA_TYPE out00 = d01 + d21 + d41 + d11 + d31; + DATA_TYPE out01 = d01 + d21 + d41 + d11 + d31; + DATA_TYPE out02 = d01 + d21 + d41 + d11 + d31; + DATA_TYPE out03 = d01 + d21 + d41 + d11 + d31; - float k0 = d03 + d04 + d13 + d14 + d23 + d24 + d33 + d34 + d43 + d44; - float k1 = 2.0f * d03 - 2.0f * d04 + 2.0f * d13 - 2.0f * d14 + 2.0f * d23 - 2.0f * d24 + 2.0f * d33 - 2.0f * d34 + 2.0f * d43 - 2.0f * d44; + DATA_TYPE k0 = d03 + d04 + d13 + d14 + d23 + d24 + d33 + d34 + d43 + d44; + DATA_TYPE k1 = 2.0f * d03 - 2.0f * d04 + 2.0f * d13 - 2.0f * d14 + 2.0f * d23 - 2.0f * d24 + 2.0f * d33 - 2.0f * d34 + 2.0f * d43 - 2.0f * d44; out00 += k0 + d00 + d02 + d10 + d12 + d20 + d22 + d30 + d32 + d40 + d42; out01 += k1 - d02 - d12 - d22 - d32 - d42; @@ -456,10 +459,10 @@ __kernel void winograd_output_transform_4x4_3x3_nhwc( out03 += 4.0f * k1 - d02 - d12 - d22 - d32 - d42 + d05 + d15 + d25 + d35 + d45; // Compute out10, out11, out12 and out13 - float out10 = d11 - d21 + 2.0f * d31 - 2.0f * d41; - float out11 = d11 - d21 + 2.0f * d31 - 2.0f * d41; - float out12 = d11 - d21 + 2.0f * d31 - 2.0f * d41; - float out13 = d11 - d21 + 2.0f * d31 - 2.0f * d41; + DATA_TYPE out10 = d11 - d21 + 2.0f * d31 - 2.0f * d41; + DATA_TYPE out11 = d11 - d21 + 2.0f * d31 - 2.0f * d41; + DATA_TYPE out12 = d11 - d21 + 2.0f * d31 - 2.0f * d41; + DATA_TYPE out13 = d11 - d21 + 2.0f * d31 - 2.0f * d41; k0 = d13 + d14 - d23 - d24 + 2.0f * d33 + 2.0f * d34 - 2.0f * d43 - 2.0f * d44; k1 = 2.0f * d13 - 2.0f * d14 - 2.0f * d23 + 2.0f * d24 + 4.0f * d33 - 4.0f * d34 - 4.0f * d43 + 4.0f * d44; @@ -470,10 +473,10 @@ __kernel void winograd_output_transform_4x4_3x3_nhwc( out13 += 4.0f * k1 - d12 + d15 + d22 - d25 - 2.0f * d32 + 2.0f * d35 + 2.0f * d42 - 2.0f * d45; // Compute out20, out21, out22 and out23 - float out20 = d11 + d21 + 4.0f * d31 + 4.0f * d41; - float out21 = d11 + d21 + 4.0f * d31 + 4.0f * d41; - float out22 = d11 + d21 + 4.0f * d31 + 4.0f * d41; - float out23 = d11 + d21 + 4.0f * d31 + 4.0f * d41; + DATA_TYPE out20 = d11 + d21 + 4.0f * d31 + 4.0f * d41; + DATA_TYPE out21 = d11 + d21 + 4.0f * d31 + 4.0f * d41; + DATA_TYPE out22 = d11 + d21 + 4.0f * d31 + 4.0f * d41; + DATA_TYPE out23 = d11 + d21 + 4.0f * d31 + 4.0f * d41; k0 = d13 + d14 + d23 + d24 + 4.0f * d33 + 4.0f * d34 + 4.0f * d43 + 4.0f * d44; k1 = 2.0f * d13 - 2.0f * d14 + 2.0f * d23 - 2.0f * d24 + 8.0f * d33 - 8.0f * d34 + 8.0f * d43 - 8.0f * d44; @@ -484,10 +487,10 @@ __kernel void winograd_output_transform_4x4_3x3_nhwc( out23 += 4.0f * k1 - d12 + d15 - d22 + d25 - 4.0f * d32 + 4.0f * d35 - 4.0f * d42 + 4.0f * d45; // Compute out30, out31, out32 and out33 - float out30 = d11 - d21 + 8.0f * d31 - 8.0f * d41 + d51; - float out31 = d11 - d21 + 8.0f * d31 - 8.0f * d41 + d51; - float out32 = d11 - d21 + 8.0f * d31 - 8.0f * d41 + d51; - float out33 = d11 - d21 + 8.0f * d31 - 8.0f * d41 + d51; + DATA_TYPE out30 = d11 - d21 + 8.0f * d31 - 8.0f * d41 + d51; + DATA_TYPE out31 = d11 - d21 + 8.0f * d31 - 8.0f * d41 + d51; + DATA_TYPE out32 = d11 - d21 + 8.0f * d31 - 8.0f * d41 + d51; + DATA_TYPE out33 = d11 - d21 + 8.0f * d31 - 8.0f * d41 + d51; k0 = d13 + d14 - d23 - d24 + 8.0f * d33 + 8.0f * d34 - 8.0f * d43 - 8.0f * d44 + d53 + d54; k1 = 2.0f * d13 - 2.0f * d14 - 2.0f * d23 + 2.0f * d24 + 16.0f * d33 - 16.0f * d34 - 16.0f * d43 + 16.0f * d44 + 2.0f * d53 - 2.0f * d54; @@ -507,72 +510,72 @@ __kernel void winograd_output_transform_4x4_3x3_nhwc( // Add bias Vector bias = CONVERT_TO_VECTOR_STRUCT_NO_STEP(bias); - float b = (float) * ((__global float *)(vector_offset(&bias, x_out))); + DATA_TYPE b = (DATA_TYPE) * ((__global DATA_TYPE *)(vector_offset(&bias, x_out))); - out00 += (float)b; - out01 += (float)b; - out02 += (float)b; - out03 += (float)b; + out00 += (DATA_TYPE)b; + out01 += (DATA_TYPE)b; + out02 += (DATA_TYPE)b; + out03 += (DATA_TYPE)b; #if !defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) & !defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) - out10 += (float)b; - out11 += (float)b; - out12 += (float)b; - out13 += (float)b; - - out20 += (float)b; - out21 += (float)b; - out22 += (float)b; - out23 += (float)b; - - out30 += (float)b; - out31 += (float)b; - out32 += (float)b; - out33 += (float)b; + out10 += (DATA_TYPE)b; + out11 += (DATA_TYPE)b; + out12 += (DATA_TYPE)b; + out13 += (DATA_TYPE)b; + + out20 += (DATA_TYPE)b; + out21 += (DATA_TYPE)b; + out22 += (DATA_TYPE)b; + out23 += (DATA_TYPE)b; + + out30 += (DATA_TYPE)b; + out31 += (DATA_TYPE)b; + out32 += (DATA_TYPE)b; + out33 += (DATA_TYPE)b; #endif // !defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) & !defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) #endif // defined(HAS_BIAS) #if defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) - int4 offset = (int4)(dst_offset_first_element_in_bytes + x_out * sizeof(float) + y_out * dst_stride_y + z_out * dst_stride_z); + int4 offset = (int4)(dst_offset_first_element_in_bytes + x_out * sizeof(DATA_TYPE) + y_out * dst_stride_y + z_out * dst_stride_z); offset = min(offset + (int4)(0, 1, 2, 3) * (int4)dst_stride_z, (int4)dst_size); // If address is beyond the last plane, clamp it to dst_size (which points to the last padding). // Store the 1x4 output tile - *((__global float *)(dst_ptr + offset.s0)) = out00; - *((__global float *)(dst_ptr + offset.s1)) = out01; - *((__global float *)(dst_ptr + offset.s2)) = out02; - *((__global float *)(dst_ptr + offset.s3)) = out03; + *((__global DATA_TYPE *)(dst_ptr + offset.s0)) = out00; + *((__global DATA_TYPE *)(dst_ptr + offset.s1)) = out01; + *((__global DATA_TYPE *)(dst_ptr + offset.s2)) = out02; + *((__global DATA_TYPE *)(dst_ptr + offset.s3)) = out03; #elif defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) // Store the 4x1 output tile - int offset = dst_offset_first_element_in_bytes + x_out * sizeof(float) + y_out * dst_stride_y + z_out * dst_stride_z; + int offset = dst_offset_first_element_in_bytes + x_out * sizeof(DATA_TYPE) + y_out * dst_stride_y + z_out * dst_stride_z; int mult_y = min(dst_size - offset, 1); - *((__global float *)(dst_ptr + mult_y * 0 * dst_stride_y + offset)) = out00; - *((__global float *)(dst_ptr + mult_y * 1 * dst_stride_y + offset)) = out01; - *((__global float *)(dst_ptr + mult_y * 2 * dst_stride_y + offset)) = out02; - *((__global float *)(dst_ptr + mult_y * 3 * dst_stride_y + offset)) = out03; + *((__global DATA_TYPE *)(dst_ptr + mult_y * 0 * dst_stride_y + offset)) = out00; + *((__global DATA_TYPE *)(dst_ptr + mult_y * 1 * dst_stride_y + offset)) = out01; + *((__global DATA_TYPE *)(dst_ptr + mult_y * 2 * dst_stride_y + offset)) = out02; + *((__global DATA_TYPE *)(dst_ptr + mult_y * 3 * dst_stride_y + offset)) = out03; #else // defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) // Get output address - int4 offset = (int4)(dst_offset_first_element_in_bytes + x_out * sizeof(float) + y_out * dst_stride_y + z_out * dst_stride_z); + int4 offset = (int4)(dst_offset_first_element_in_bytes + x_out * sizeof(DATA_TYPE) + y_out * dst_stride_y + z_out * dst_stride_z); offset = min(offset + (int4)(0, 1, 2, 3) * (int4)dst_stride_z, (int4)dst_size); // If address is beyond the last plane, clamp it to dst_size (which points to the last padding). - int4 mult_y = min((int4)dst_size - offset, (int4)1); // If out of bound, we don't want to increase dst_stride_y, so we set the multiplier to 0. It will be 1 otherwise. + int4 mult_y = min((int4)dst_size - offset, (int4)1); // If out of bound, we don't want to increase dst_stride_y, so we set the multiplier to 0. It will be 1 otherwise. // Store the 4x4 output tile - *((__global float *)(dst_ptr + mult_y.s0 * 0 * dst_stride_y + offset.s0)) = out00; - *((__global float *)(dst_ptr + mult_y.s0 * 1 * dst_stride_y + offset.s0)) = out01; - *((__global float *)(dst_ptr + mult_y.s0 * 2 * dst_stride_y + offset.s0)) = out02; - *((__global float *)(dst_ptr + mult_y.s0 * 3 * dst_stride_y + offset.s0)) = out03; - *((__global float *)(dst_ptr + mult_y.s1 * 0 * dst_stride_y + offset.s1)) = out10; - *((__global float *)(dst_ptr + mult_y.s1 * 1 * dst_stride_y + offset.s1)) = out11; - *((__global float *)(dst_ptr + mult_y.s1 * 2 * dst_stride_y + offset.s1)) = out12; - *((__global float *)(dst_ptr + mult_y.s1 * 3 * dst_stride_y + offset.s1)) = out13; - *((__global float *)(dst_ptr + mult_y.s2 * 0 * dst_stride_y + offset.s2)) = out20; - *((__global float *)(dst_ptr + mult_y.s2 * 1 * dst_stride_y + offset.s2)) = out21; - *((__global float *)(dst_ptr + mult_y.s2 * 2 * dst_stride_y + offset.s2)) = out22; - *((__global float *)(dst_ptr + mult_y.s2 * 3 * dst_stride_y + offset.s2)) = out23; - *((__global float *)(dst_ptr + mult_y.s3 * 0 * dst_stride_y + offset.s3)) = out30; - *((__global float *)(dst_ptr + mult_y.s3 * 1 * dst_stride_y + offset.s3)) = out31; - *((__global float *)(dst_ptr + mult_y.s3 * 2 * dst_stride_y + offset.s3)) = out32; - *((__global float *)(dst_ptr + mult_y.s3 * 3 * dst_stride_y + offset.s3)) = out33; + *((__global DATA_TYPE *)(dst_ptr + mult_y.s0 * 0 * dst_stride_y + offset.s0)) = out00; + *((__global DATA_TYPE *)(dst_ptr + mult_y.s0 * 1 * dst_stride_y + offset.s0)) = out01; + *((__global DATA_TYPE *)(dst_ptr + mult_y.s0 * 2 * dst_stride_y + offset.s0)) = out02; + *((__global DATA_TYPE *)(dst_ptr + mult_y.s0 * 3 * dst_stride_y + offset.s0)) = out03; + *((__global DATA_TYPE *)(dst_ptr + mult_y.s1 * 0 * dst_stride_y + offset.s1)) = out10; + *((__global DATA_TYPE *)(dst_ptr + mult_y.s1 * 1 * dst_stride_y + offset.s1)) = out11; + *((__global DATA_TYPE *)(dst_ptr + mult_y.s1 * 2 * dst_stride_y + offset.s1)) = out12; + *((__global DATA_TYPE *)(dst_ptr + mult_y.s1 * 3 * dst_stride_y + offset.s1)) = out13; + *((__global DATA_TYPE *)(dst_ptr + mult_y.s2 * 0 * dst_stride_y + offset.s2)) = out20; + *((__global DATA_TYPE *)(dst_ptr + mult_y.s2 * 1 * dst_stride_y + offset.s2)) = out21; + *((__global DATA_TYPE *)(dst_ptr + mult_y.s2 * 2 * dst_stride_y + offset.s2)) = out22; + *((__global DATA_TYPE *)(dst_ptr + mult_y.s2 * 3 * dst_stride_y + offset.s2)) = out23; + *((__global DATA_TYPE *)(dst_ptr + mult_y.s3 * 0 * dst_stride_y + offset.s3)) = out30; + *((__global DATA_TYPE *)(dst_ptr + mult_y.s3 * 1 * dst_stride_y + offset.s3)) = out31; + *((__global DATA_TYPE *)(dst_ptr + mult_y.s3 * 2 * dst_stride_y + offset.s3)) = out32; + *((__global DATA_TYPE *)(dst_ptr + mult_y.s3 * 3 * dst_stride_y + offset.s3)) = out33; #endif // defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) } @@ -601,8 +604,9 @@ __kernel void winograd_output_transform_4x4_3x3_nhwc( * @note The height of the output tile must be passed at compile time using -DOUTPUT_TILE_H: e.g. -DOUTPUT_TILE_H=4 * @note If this kernel is used to perform Winograd output transform 3x1, -DWINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL has to be passed at compile time * @note If this kernel is used to perform Winograd output transform 1x3, -DWINOGRAD_OUTPUT_TRANSFORM_VERTICAL has to be passed at compile time + * @note The data type must be passed at compile time using -DDATA_TYPE e.g. -DDATA_TYPE=float. Supported data types: float/half. * - * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32 + * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32/F16 * @param[in] src_stride_x Stride of the source tensor in X dimension (in bytes) * @param[in] src_step_x src_stride_x * number of elements along X processed per workitem(in bytes) * @param[in] src_stride_y Stride of the source tensor in Y dimension (in bytes) @@ -639,114 +643,116 @@ __kernel void winograd_output_transform_4x4_5x5_nchw( int y_out = (y_in / NUM_TILES_X) * OUTPUT_TILE_H; int z_out = get_global_id(0); - __global uchar *dst_addr = dst_ptr + dst_offset_first_element_in_bytes + x_out * sizeof(float) + y_out * dst_stride_y + z_out * dst_stride_z; + __global uchar *dst_addr = dst_ptr + dst_offset_first_element_in_bytes + x_out * sizeof(DATA_TYPE) + y_out * dst_stride_y + z_out * dst_stride_z; // Load the values across the channels to compose the input tile - float d00 = *((__global float *)(src_addr + 0 * src_stride_z)); - float d01 = *((__global float *)(src_addr + 1 * src_stride_z)); - float d02 = *((__global float *)(src_addr + 2 * src_stride_z)); - float d03 = *((__global float *)(src_addr + 3 * src_stride_z)); - float d04 = *((__global float *)(src_addr + 4 * src_stride_z)); - float d05 = *((__global float *)(src_addr + 5 * src_stride_z)); - float d06 = *((__global float *)(src_addr + 6 * src_stride_z)); - float d07 = *((__global float *)(src_addr + 7 * src_stride_z)); + DATA_TYPE d00 = *((__global DATA_TYPE *)(src_addr + 0 * src_stride_z)); + DATA_TYPE d01 = *((__global DATA_TYPE *)(src_addr + 1 * src_stride_z)); + DATA_TYPE d02 = *((__global DATA_TYPE *)(src_addr + 2 * src_stride_z)); + DATA_TYPE d03 = *((__global DATA_TYPE *)(src_addr + 3 * src_stride_z)); + DATA_TYPE d04 = *((__global DATA_TYPE *)(src_addr + 4 * src_stride_z)); + DATA_TYPE d05 = *((__global DATA_TYPE *)(src_addr + 5 * src_stride_z)); + DATA_TYPE d06 = *((__global DATA_TYPE *)(src_addr + 6 * src_stride_z)); + DATA_TYPE d07 = *((__global DATA_TYPE *)(src_addr + 7 * src_stride_z)); #if defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) || defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) // Compute out00, out01, out02 and out03 - float out00 = d00 + d01 + d02 + d03 + d04 + 8.0f * d05 + 8.0f * d06; - float out01 = d01 - d02 + 2.0f * d03 - 2.0f * d04 + 4.0f * d05 - 4.0f * d06; - float out02 = d01 + d02 + 4.0f * d03 + 4.0f * d04 + 2.0f * d05 + 2.0f * d06; - float out03 = d01 - d02 + 8.0f * d03 - 8.0f * d04 + d05 - d06 + d07; + DATA_TYPE out00 = d00 + d01 + d02 + d03 + d04 + 8.0f * d05 + 8.0f * d06; + DATA_TYPE out01 = d01 - d02 + 2.0f * d03 - 2.0f * d04 + 4.0f * d05 - 4.0f * d06; + DATA_TYPE out02 = d01 + d02 + 4.0f * d03 + 4.0f * d04 + 2.0f * d05 + 2.0f * d06; + DATA_TYPE out03 = d01 - d02 + 8.0f * d03 - 8.0f * d04 + d05 - d06 + d07; #if defined(HAS_BIAS) // Add bias Vector bias = CONVERT_TO_VECTOR_STRUCT_NO_STEP(bias); - float b = (float) * ((__global float *)(vector_offset(&bias, z_out))); + DATA_TYPE b = (DATA_TYPE) * ((__global DATA_TYPE *)(vector_offset(&bias, z_out))); - out00 += (float)b; - out01 += (float)b; - out02 += (float)b; - out03 += (float)b; + out00 += (DATA_TYPE)b; + out01 += (DATA_TYPE)b; + out02 += (DATA_TYPE)b; + out03 += (DATA_TYPE)b; #endif // defined(HAS_BIAS) // Store the output tile #if defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) - *((__global float *)(dst_addr + 0 * dst_stride_y)) = out00; - *((__global float *)(dst_addr + 1 * dst_stride_y)) = out01; - *((__global float *)(dst_addr + 2 * dst_stride_y)) = out02; - *((__global float *)(dst_addr + 3 * dst_stride_y)) = out03; + *((__global DATA_TYPE *)(dst_addr + 0 * dst_stride_y)) = out00; + *((__global DATA_TYPE *)(dst_addr + 1 * dst_stride_y)) = out01; + *((__global DATA_TYPE *)(dst_addr + 2 * dst_stride_y)) = out02; + *((__global DATA_TYPE *)(dst_addr + 3 * dst_stride_y)) = out03; #else // defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) - vstore4((float4)(out00, out01, out02, out03), 0, (__global float *)(dst_addr)); + vstore4((VEC_DATA_TYPE(DATA_TYPE, 4))(out00, out01, out02, out03), 0, (__global DATA_TYPE *)(dst_addr)); #endif // defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) #else // defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) || defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) - float d10 = *((__global float *)(src_addr + 8 * src_stride_z)); - float d11 = *((__global float *)(src_addr + 9 * src_stride_z)); - float d12 = *((__global float *)(src_addr + 10 * src_stride_z)); - float d13 = *((__global float *)(src_addr + 11 * src_stride_z)); - float d14 = *((__global float *)(src_addr + 12 * src_stride_z)); - float d15 = *((__global float *)(src_addr + 13 * src_stride_z)); - float d16 = *((__global float *)(src_addr + 14 * src_stride_z)); - float d17 = *((__global float *)(src_addr + 15 * src_stride_z)); - - float d20 = *((__global float *)(src_addr + 16 * src_stride_z)); - float d21 = *((__global float *)(src_addr + 17 * src_stride_z)); - float d22 = *((__global float *)(src_addr + 18 * src_stride_z)); - float d23 = *((__global float *)(src_addr + 19 * src_stride_z)); - float d24 = *((__global float *)(src_addr + 20 * src_stride_z)); - float d25 = *((__global float *)(src_addr + 21 * src_stride_z)); - float d26 = *((__global float *)(src_addr + 22 * src_stride_z)); - float d27 = *((__global float *)(src_addr + 23 * src_stride_z)); - - float d30 = *((__global float *)(src_addr + 24 * src_stride_z)); - float d31 = *((__global float *)(src_addr + 25 * src_stride_z)); - float d32 = *((__global float *)(src_addr + 26 * src_stride_z)); - float d33 = *((__global float *)(src_addr + 27 * src_stride_z)); - float d34 = *((__global float *)(src_addr + 28 * src_stride_z)); - float d35 = *((__global float *)(src_addr + 29 * src_stride_z)); - float d36 = *((__global float *)(src_addr + 30 * src_stride_z)); - float d37 = *((__global float *)(src_addr + 31 * src_stride_z)); - - float d40 = *((__global float *)(src_addr + 32 * src_stride_z)); - float d41 = *((__global float *)(src_addr + 33 * src_stride_z)); - float d42 = *((__global float *)(src_addr + 34 * src_stride_z)); - float d43 = *((__global float *)(src_addr + 35 * src_stride_z)); - float d44 = *((__global float *)(src_addr + 36 * src_stride_z)); - float d45 = *((__global float *)(src_addr + 37 * src_stride_z)); - float d46 = *((__global float *)(src_addr + 38 * src_stride_z)); - float d47 = *((__global float *)(src_addr + 39 * src_stride_z)); - - float d50 = *((__global float *)(src_addr + 40 * src_stride_z)); - float d51 = *((__global float *)(src_addr + 41 * src_stride_z)); - float d52 = *((__global float *)(src_addr + 42 * src_stride_z)); - float d53 = *((__global float *)(src_addr + 43 * src_stride_z)); - float d54 = *((__global float *)(src_addr + 44 * src_stride_z)); - float d55 = *((__global float *)(src_addr + 45 * src_stride_z)); - float d56 = *((__global float *)(src_addr + 46 * src_stride_z)); - float d57 = *((__global float *)(src_addr + 47 * src_stride_z)); - - float d60 = *((__global float *)(src_addr + 48 * src_stride_z)); - float d61 = *((__global float *)(src_addr + 49 * src_stride_z)); - float d62 = *((__global float *)(src_addr + 50 * src_stride_z)); - float d63 = *((__global float *)(src_addr + 51 * src_stride_z)); - float d64 = *((__global float *)(src_addr + 52 * src_stride_z)); - float d65 = *((__global float *)(src_addr + 53 * src_stride_z)); - float d66 = *((__global float *)(src_addr + 54 * src_stride_z)); - float d67 = *((__global float *)(src_addr + 55 * src_stride_z)); - - float d70 = *((__global float *)(src_addr + 56 * src_stride_z)); - float d71 = *((__global float *)(src_addr + 57 * src_stride_z)); - float d72 = *((__global float *)(src_addr + 58 * src_stride_z)); - float d73 = *((__global float *)(src_addr + 59 * src_stride_z)); - float d74 = *((__global float *)(src_addr + 60 * src_stride_z)); - float d75 = *((__global float *)(src_addr + 61 * src_stride_z)); - float d76 = *((__global float *)(src_addr + 62 * src_stride_z)); - float d77 = *((__global float *)(src_addr + 63 * src_stride_z)); + DATA_TYPE d10 = *((__global DATA_TYPE *)(src_addr + 8 * src_stride_z)); + DATA_TYPE d11 = *((__global DATA_TYPE *)(src_addr + 9 * src_stride_z)); + DATA_TYPE d12 = *((__global DATA_TYPE *)(src_addr + 10 * src_stride_z)); + DATA_TYPE d13 = *((__global DATA_TYPE *)(src_addr + 11 * src_stride_z)); + DATA_TYPE d14 = *((__global DATA_TYPE *)(src_addr + 12 * src_stride_z)); + DATA_TYPE d15 = *((__global DATA_TYPE *)(src_addr + 13 * src_stride_z)); + DATA_TYPE d16 = *((__global DATA_TYPE *)(src_addr + 14 * src_stride_z)); + DATA_TYPE d17 = *((__global DATA_TYPE *)(src_addr + 15 * src_stride_z)); + + DATA_TYPE d20 = *((__global DATA_TYPE *)(src_addr + 16 * src_stride_z)); + DATA_TYPE d21 = *((__global DATA_TYPE *)(src_addr + 17 * src_stride_z)); + DATA_TYPE d22 = *((__global DATA_TYPE *)(src_addr + 18 * src_stride_z)); + DATA_TYPE d23 = *((__global DATA_TYPE *)(src_addr + 19 * src_stride_z)); + DATA_TYPE d24 = *((__global DATA_TYPE *)(src_addr + 20 * src_stride_z)); + DATA_TYPE d25 = *((__global DATA_TYPE *)(src_addr + 21 * src_stride_z)); + DATA_TYPE d26 = *((__global DATA_TYPE *)(src_addr + 22 * src_stride_z)); + DATA_TYPE d27 = *((__global DATA_TYPE *)(src_addr + 23 * src_stride_z)); + + DATA_TYPE d30 = *((__global DATA_TYPE *)(src_addr + 24 * src_stride_z)); + DATA_TYPE d31 = *((__global DATA_TYPE *)(src_addr + 25 * src_stride_z)); + DATA_TYPE d32 = *((__global DATA_TYPE *)(src_addr + 26 * src_stride_z)); + DATA_TYPE d33 = *((__global DATA_TYPE *)(src_addr + 27 * src_stride_z)); + DATA_TYPE d34 = *((__global DATA_TYPE *)(src_addr + 28 * src_stride_z)); + DATA_TYPE d35 = *((__global DATA_TYPE *)(src_addr + 29 * src_stride_z)); + DATA_TYPE d36 = *((__global DATA_TYPE *)(src_addr + 30 * src_stride_z)); + DATA_TYPE d37 = *((__global DATA_TYPE *)(src_addr + 31 * src_stride_z)); + + DATA_TYPE d40 = *((__global DATA_TYPE *)(src_addr + 32 * src_stride_z)); + DATA_TYPE d41 = *((__global DATA_TYPE *)(src_addr + 33 * src_stride_z)); + DATA_TYPE d42 = *((__global DATA_TYPE *)(src_addr + 34 * src_stride_z)); + DATA_TYPE d43 = *((__global DATA_TYPE *)(src_addr + 35 * src_stride_z)); + DATA_TYPE d44 = *((__global DATA_TYPE *)(src_addr + 36 * src_stride_z)); + DATA_TYPE d45 = *((__global DATA_TYPE *)(src_addr + 37 * src_stride_z)); + DATA_TYPE d46 = *((__global DATA_TYPE *)(src_addr + 38 * src_stride_z)); + DATA_TYPE d47 = *((__global DATA_TYPE *)(src_addr + 39 * src_stride_z)); + + DATA_TYPE d50 = *((__global DATA_TYPE *)(src_addr + 40 * src_stride_z)); + DATA_TYPE d51 = *((__global DATA_TYPE *)(src_addr + 41 * src_stride_z)); + DATA_TYPE d52 = *((__global DATA_TYPE *)(src_addr + 42 * src_stride_z)); + DATA_TYPE d53 = *((__global DATA_TYPE *)(src_addr + 43 * src_stride_z)); + DATA_TYPE d54 = *((__global DATA_TYPE *)(src_addr + 44 * src_stride_z)); + DATA_TYPE d55 = *((__global DATA_TYPE *)(src_addr + 45 * src_stride_z)); + DATA_TYPE d56 = *((__global DATA_TYPE *)(src_addr + 46 * src_stride_z)); + DATA_TYPE d57 = *((__global DATA_TYPE *)(src_addr + 47 * src_stride_z)); + + DATA_TYPE d60 = *((__global DATA_TYPE *)(src_addr + 48 * src_stride_z)); + DATA_TYPE d61 = *((__global DATA_TYPE *)(src_addr + 49 * src_stride_z)); + DATA_TYPE d62 = *((__global DATA_TYPE *)(src_addr + 50 * src_stride_z)); + DATA_TYPE d63 = *((__global DATA_TYPE *)(src_addr + 51 * src_stride_z)); + DATA_TYPE d64 = *((__global DATA_TYPE *)(src_addr + 52 * src_stride_z)); + DATA_TYPE d65 = *((__global DATA_TYPE *)(src_addr + 53 * src_stride_z)); + DATA_TYPE d66 = *((__global DATA_TYPE *)(src_addr + 54 * src_stride_z)); + DATA_TYPE d67 = *((__global DATA_TYPE *)(src_addr + 55 * src_stride_z)); + + DATA_TYPE d70 = *((__global DATA_TYPE *)(src_addr + 56 * src_stride_z)); + DATA_TYPE d71 = *((__global DATA_TYPE *)(src_addr + 57 * src_stride_z)); + DATA_TYPE d72 = *((__global DATA_TYPE *)(src_addr + 58 * src_stride_z)); + DATA_TYPE d73 = *((__global DATA_TYPE *)(src_addr + 59 * src_stride_z)); + DATA_TYPE d74 = *((__global DATA_TYPE *)(src_addr + 60 * src_stride_z)); + DATA_TYPE d75 = *((__global DATA_TYPE *)(src_addr + 61 * src_stride_z)); + DATA_TYPE d76 = *((__global DATA_TYPE *)(src_addr + 62 * src_stride_z)); + DATA_TYPE d77 = *((__global DATA_TYPE *)(src_addr + 63 * src_stride_z)); // Compute the 8x4 intermediate tensor - float4 comm_fact0, comm_fact1, comm_fact2; - float4 tmp_col0, tmp_col1, tmp_col2, tmp_col3, tmp_col4, tmp_col5, tmp_col6, tmp_col7; + VEC_DATA_TYPE(DATA_TYPE, 4) + comm_fact0, comm_fact1, comm_fact2; + VEC_DATA_TYPE(DATA_TYPE, 4) + tmp_col0, tmp_col1, tmp_col2, tmp_col3, tmp_col4, tmp_col5, tmp_col6, tmp_col7; COMPUTE_TMP_COL(tmp_col0, d00, d10, d20, d30, d40, d50, d60, d70, comm_fact0); COMPUTE_TMP_COL(tmp_col1, d01, d11, d21, d31, d41, d51, d61, d71, comm_fact0); @@ -762,33 +768,37 @@ __kernel void winograd_output_transform_4x4_5x5_nchw( comm_fact1 = tmp_col3 + tmp_col4; comm_fact2 = tmp_col5 + tmp_col6; - float4 out_col0 = comm_fact0 + comm_fact1 + 8.f * comm_fact2 + tmp_col0; - float4 out_col2 = comm_fact0 + 4.f * comm_fact1 + 2.f * comm_fact2; + VEC_DATA_TYPE(DATA_TYPE, 4) + out_col0 = comm_fact0 + comm_fact1 + (DATA_TYPE)8.f * comm_fact2 + tmp_col0; + VEC_DATA_TYPE(DATA_TYPE, 4) + out_col2 = comm_fact0 + (DATA_TYPE)4.f * comm_fact1 + (DATA_TYPE)2.f * comm_fact2; comm_fact0 = tmp_col1 - tmp_col2; comm_fact1 = tmp_col3 - tmp_col4; comm_fact2 = tmp_col5 - tmp_col6; - float4 out_col1 = comm_fact0 + 2.f * comm_fact1 + 4.f * comm_fact2; - float4 out_col3 = comm_fact0 + 8.f * comm_fact1 + comm_fact2 + tmp_col7; + VEC_DATA_TYPE(DATA_TYPE, 4) + out_col1 = comm_fact0 + (DATA_TYPE)2.f * comm_fact1 + (DATA_TYPE)4.f * comm_fact2; + VEC_DATA_TYPE(DATA_TYPE, 4) + out_col3 = comm_fact0 + (DATA_TYPE)8.f * comm_fact1 + comm_fact2 + tmp_col7; #if defined(HAS_BIAS) // Add bias Vector bias = CONVERT_TO_VECTOR_STRUCT_NO_STEP(bias); - float b = (float) * ((__global float *)(vector_offset(&bias, z_out))); + DATA_TYPE b = (DATA_TYPE) * ((__global DATA_TYPE *)(vector_offset(&bias, z_out))); - out_col0 += (float4)b; - out_col1 += (float4)b; - out_col2 += (float4)b; - out_col3 += (float4)b; + out_col0 += (VEC_DATA_TYPE(DATA_TYPE, 4))b; + out_col1 += (VEC_DATA_TYPE(DATA_TYPE, 4))b; + out_col2 += (VEC_DATA_TYPE(DATA_TYPE, 4))b; + out_col3 += (VEC_DATA_TYPE(DATA_TYPE, 4))b; #endif // defined(HAS_BIAS) // Store the output tile - vstore4((float4)(out_col0.s0, out_col1.s0, out_col2.s0, out_col3.s0), 0, (__global float *)(dst_addr + 0 * dst_stride_y)); - vstore4((float4)(out_col0.s1, out_col1.s1, out_col2.s1, out_col3.s1), 0, (__global float *)(dst_addr + 1 * dst_stride_y)); - vstore4((float4)(out_col0.s2, out_col1.s2, out_col2.s2, out_col3.s2), 0, (__global float *)(dst_addr + 2 * dst_stride_y)); - vstore4((float4)(out_col0.s3, out_col1.s3, out_col2.s3, out_col3.s3), 0, (__global float *)(dst_addr + 3 * dst_stride_y)); + vstore4((VEC_DATA_TYPE(DATA_TYPE, 4))(out_col0.s0, out_col1.s0, out_col2.s0, out_col3.s0), 0, (__global DATA_TYPE *)(dst_addr + 0 * dst_stride_y)); + vstore4((VEC_DATA_TYPE(DATA_TYPE, 4))(out_col0.s1, out_col1.s1, out_col2.s1, out_col3.s1), 0, (__global DATA_TYPE *)(dst_addr + 1 * dst_stride_y)); + vstore4((VEC_DATA_TYPE(DATA_TYPE, 4))(out_col0.s2, out_col1.s2, out_col2.s2, out_col3.s2), 0, (__global DATA_TYPE *)(dst_addr + 2 * dst_stride_y)); + vstore4((VEC_DATA_TYPE(DATA_TYPE, 4))(out_col0.s3, out_col1.s3, out_col2.s3, out_col3.s3), 0, (__global DATA_TYPE *)(dst_addr + 3 * dst_stride_y)); #endif // !defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) && !defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) } @@ -799,8 +809,9 @@ __kernel void winograd_output_transform_4x4_5x5_nchw( * @note The height of the output tile must be passed at compile time using -DOUTPUT_TILE_H: e.g. -DOUTPUT_TILE_H=4 * @note If this kernel is used to perform Winograd output transform 5x1, -DWINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL has to be passed at compile time * @note If this kernel is used to perform Winograd output transform 1x5, -DWINOGRAD_OUTPUT_TRANSFORM_VERTICAL has to be passed at compile time + * @note The data type must be passed at compile time using -DDATA_TYPE e.g. -DDATA_TYPE=float. Supported data types: float/half. * - * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32 + * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32/F16 * @param[in] src_stride_x Stride of the source tensor in X dimension (in bytes) * @param[in] src_step_x src_stride_x * number of elements along X processed per workitem(in bytes) * @param[in] src_stride_y Stride of the source tensor in Y dimension (in bytes) @@ -836,122 +847,124 @@ __kernel void winograd_output_transform_4x4_5x5_nhwc( int z_out = (y_in / NUM_TILES_X) * OUTPUT_TILE_H; // Load the values across the channels to compose the input tile - float d00 = *((__global float *)(src_addr + 0 * src_stride_z)); - float d01 = *((__global float *)(src_addr + 1 * src_stride_z)); - float d02 = *((__global float *)(src_addr + 2 * src_stride_z)); - float d03 = *((__global float *)(src_addr + 3 * src_stride_z)); - float d04 = *((__global float *)(src_addr + 4 * src_stride_z)); - float d05 = *((__global float *)(src_addr + 5 * src_stride_z)); - float d06 = *((__global float *)(src_addr + 6 * src_stride_z)); - float d07 = *((__global float *)(src_addr + 7 * src_stride_z)); + DATA_TYPE d00 = *((__global DATA_TYPE *)(src_addr + 0 * src_stride_z)); + DATA_TYPE d01 = *((__global DATA_TYPE *)(src_addr + 1 * src_stride_z)); + DATA_TYPE d02 = *((__global DATA_TYPE *)(src_addr + 2 * src_stride_z)); + DATA_TYPE d03 = *((__global DATA_TYPE *)(src_addr + 3 * src_stride_z)); + DATA_TYPE d04 = *((__global DATA_TYPE *)(src_addr + 4 * src_stride_z)); + DATA_TYPE d05 = *((__global DATA_TYPE *)(src_addr + 5 * src_stride_z)); + DATA_TYPE d06 = *((__global DATA_TYPE *)(src_addr + 6 * src_stride_z)); + DATA_TYPE d07 = *((__global DATA_TYPE *)(src_addr + 7 * src_stride_z)); #if defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) || defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) // Compute out00, out01, out02 and out03 - float out00 = d00 + d01 + d02 + d03 + d04 + 8.0f * d05 + 8.0f * d06; - float out01 = d01 - d02 + 2.0f * d03 - 2.0f * d04 + 4.0f * d05 - 4.0f * d06; - float out02 = d01 + d02 + 4.0f * d03 + 4.0f * d04 + 2.0f * d05 + 2.0f * d06; - float out03 = d01 - d02 + 8.0f * d03 - 8.0f * d04 + d05 - d06 + d07; + DATA_TYPE out00 = d00 + d01 + d02 + d03 + d04 + 8.0f * d05 + 8.0f * d06; + DATA_TYPE out01 = d01 - d02 + 2.0f * d03 - 2.0f * d04 + 4.0f * d05 - 4.0f * d06; + DATA_TYPE out02 = d01 + d02 + 4.0f * d03 + 4.0f * d04 + 2.0f * d05 + 2.0f * d06; + DATA_TYPE out03 = d01 - d02 + 8.0f * d03 - 8.0f * d04 + d05 - d06 + d07; #if defined(HAS_BIAS) // Add bias Vector bias = CONVERT_TO_VECTOR_STRUCT_NO_STEP(bias); - float b = (float) * ((__global float *)(vector_offset(&bias, x_out))); + DATA_TYPE b = (DATA_TYPE) * ((__global DATA_TYPE *)(vector_offset(&bias, x_out))); - out00 += (float)b; - out01 += (float)b; - out02 += (float)b; - out03 += (float)b; + out00 += (DATA_TYPE)b; + out01 += (DATA_TYPE)b; + out02 += (DATA_TYPE)b; + out03 += (DATA_TYPE)b; #endif // defined(HAS_BIAS) // Store the output tile #if defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) // Get output address - int4 offset = (int4)(dst_offset_first_element_in_bytes + x_out * sizeof(float) + y_out * dst_stride_y + z_out * dst_stride_z); + int4 offset = (int4)(dst_offset_first_element_in_bytes + x_out * sizeof(DATA_TYPE) + y_out * dst_stride_y + z_out * dst_stride_z); offset = min(offset + (int4)(0, 1, 2, 3) * (int4)dst_stride_z, (int4)dst_size); // If address is beyond the last plane, clamp it to dst_size (which points to the last padding). - *(__global float *)(dst_ptr + offset.s0) = out00; - *(__global float *)(dst_ptr + offset.s1) = out01; - *(__global float *)(dst_ptr + offset.s2) = out02; - *(__global float *)(dst_ptr + offset.s3) = out03; + *(__global DATA_TYPE *)(dst_ptr + offset.s0) = out00; + *(__global DATA_TYPE *)(dst_ptr + offset.s1) = out01; + *(__global DATA_TYPE *)(dst_ptr + offset.s2) = out02; + *(__global DATA_TYPE *)(dst_ptr + offset.s3) = out03; #else // defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) // Get output address - int offset = dst_offset_first_element_in_bytes + x_out * sizeof(float) + y_out * dst_stride_y + z_out * dst_stride_z; + int offset = dst_offset_first_element_in_bytes + x_out * sizeof(DATA_TYPE) + y_out * dst_stride_y + z_out * dst_stride_z; - *(__global float *)(dst_ptr + 0 * dst_stride_y + offset) = out00; - *(__global float *)(dst_ptr + 1 * dst_stride_y + offset) = out01; - *(__global float *)(dst_ptr + 2 * dst_stride_y + offset) = out02; - *(__global float *)(dst_ptr + 3 * dst_stride_y + offset) = out03; + *(__global DATA_TYPE *)(dst_ptr + 0 * dst_stride_y + offset) = out00; + *(__global DATA_TYPE *)(dst_ptr + 1 * dst_stride_y + offset) = out01; + *(__global DATA_TYPE *)(dst_ptr + 2 * dst_stride_y + offset) = out02; + *(__global DATA_TYPE *)(dst_ptr + 3 * dst_stride_y + offset) = out03; #endif // defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) #else // defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) || defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) - float d10 = *((__global float *)(src_addr + 8 * src_stride_z)); - float d11 = *((__global float *)(src_addr + 9 * src_stride_z)); - float d12 = *((__global float *)(src_addr + 10 * src_stride_z)); - float d13 = *((__global float *)(src_addr + 11 * src_stride_z)); - float d14 = *((__global float *)(src_addr + 12 * src_stride_z)); - float d15 = *((__global float *)(src_addr + 13 * src_stride_z)); - float d16 = *((__global float *)(src_addr + 14 * src_stride_z)); - float d17 = *((__global float *)(src_addr + 15 * src_stride_z)); - - float d20 = *((__global float *)(src_addr + 16 * src_stride_z)); - float d21 = *((__global float *)(src_addr + 17 * src_stride_z)); - float d22 = *((__global float *)(src_addr + 18 * src_stride_z)); - float d23 = *((__global float *)(src_addr + 19 * src_stride_z)); - float d24 = *((__global float *)(src_addr + 20 * src_stride_z)); - float d25 = *((__global float *)(src_addr + 21 * src_stride_z)); - float d26 = *((__global float *)(src_addr + 22 * src_stride_z)); - float d27 = *((__global float *)(src_addr + 23 * src_stride_z)); - - float d30 = *((__global float *)(src_addr + 24 * src_stride_z)); - float d31 = *((__global float *)(src_addr + 25 * src_stride_z)); - float d32 = *((__global float *)(src_addr + 26 * src_stride_z)); - float d33 = *((__global float *)(src_addr + 27 * src_stride_z)); - float d34 = *((__global float *)(src_addr + 28 * src_stride_z)); - float d35 = *((__global float *)(src_addr + 29 * src_stride_z)); - float d36 = *((__global float *)(src_addr + 30 * src_stride_z)); - float d37 = *((__global float *)(src_addr + 31 * src_stride_z)); - - float d40 = *((__global float *)(src_addr + 32 * src_stride_z)); - float d41 = *((__global float *)(src_addr + 33 * src_stride_z)); - float d42 = *((__global float *)(src_addr + 34 * src_stride_z)); - float d43 = *((__global float *)(src_addr + 35 * src_stride_z)); - float d44 = *((__global float *)(src_addr + 36 * src_stride_z)); - float d45 = *((__global float *)(src_addr + 37 * src_stride_z)); - float d46 = *((__global float *)(src_addr + 38 * src_stride_z)); - float d47 = *((__global float *)(src_addr + 39 * src_stride_z)); - - float d50 = *((__global float *)(src_addr + 40 * src_stride_z)); - float d51 = *((__global float *)(src_addr + 41 * src_stride_z)); - float d52 = *((__global float *)(src_addr + 42 * src_stride_z)); - float d53 = *((__global float *)(src_addr + 43 * src_stride_z)); - float d54 = *((__global float *)(src_addr + 44 * src_stride_z)); - float d55 = *((__global float *)(src_addr + 45 * src_stride_z)); - float d56 = *((__global float *)(src_addr + 46 * src_stride_z)); - float d57 = *((__global float *)(src_addr + 47 * src_stride_z)); - - float d60 = *((__global float *)(src_addr + 48 * src_stride_z)); - float d61 = *((__global float *)(src_addr + 49 * src_stride_z)); - float d62 = *((__global float *)(src_addr + 50 * src_stride_z)); - float d63 = *((__global float *)(src_addr + 51 * src_stride_z)); - float d64 = *((__global float *)(src_addr + 52 * src_stride_z)); - float d65 = *((__global float *)(src_addr + 53 * src_stride_z)); - float d66 = *((__global float *)(src_addr + 54 * src_stride_z)); - float d67 = *((__global float *)(src_addr + 55 * src_stride_z)); - - float d70 = *((__global float *)(src_addr + 56 * src_stride_z)); - float d71 = *((__global float *)(src_addr + 57 * src_stride_z)); - float d72 = *((__global float *)(src_addr + 58 * src_stride_z)); - float d73 = *((__global float *)(src_addr + 59 * src_stride_z)); - float d74 = *((__global float *)(src_addr + 60 * src_stride_z)); - float d75 = *((__global float *)(src_addr + 61 * src_stride_z)); - float d76 = *((__global float *)(src_addr + 62 * src_stride_z)); - float d77 = *((__global float *)(src_addr + 63 * src_stride_z)); + DATA_TYPE d10 = *((__global DATA_TYPE *)(src_addr + 8 * src_stride_z)); + DATA_TYPE d11 = *((__global DATA_TYPE *)(src_addr + 9 * src_stride_z)); + DATA_TYPE d12 = *((__global DATA_TYPE *)(src_addr + 10 * src_stride_z)); + DATA_TYPE d13 = *((__global DATA_TYPE *)(src_addr + 11 * src_stride_z)); + DATA_TYPE d14 = *((__global DATA_TYPE *)(src_addr + 12 * src_stride_z)); + DATA_TYPE d15 = *((__global DATA_TYPE *)(src_addr + 13 * src_stride_z)); + DATA_TYPE d16 = *((__global DATA_TYPE *)(src_addr + 14 * src_stride_z)); + DATA_TYPE d17 = *((__global DATA_TYPE *)(src_addr + 15 * src_stride_z)); + + DATA_TYPE d20 = *((__global DATA_TYPE *)(src_addr + 16 * src_stride_z)); + DATA_TYPE d21 = *((__global DATA_TYPE *)(src_addr + 17 * src_stride_z)); + DATA_TYPE d22 = *((__global DATA_TYPE *)(src_addr + 18 * src_stride_z)); + DATA_TYPE d23 = *((__global DATA_TYPE *)(src_addr + 19 * src_stride_z)); + DATA_TYPE d24 = *((__global DATA_TYPE *)(src_addr + 20 * src_stride_z)); + DATA_TYPE d25 = *((__global DATA_TYPE *)(src_addr + 21 * src_stride_z)); + DATA_TYPE d26 = *((__global DATA_TYPE *)(src_addr + 22 * src_stride_z)); + DATA_TYPE d27 = *((__global DATA_TYPE *)(src_addr + 23 * src_stride_z)); + + DATA_TYPE d30 = *((__global DATA_TYPE *)(src_addr + 24 * src_stride_z)); + DATA_TYPE d31 = *((__global DATA_TYPE *)(src_addr + 25 * src_stride_z)); + DATA_TYPE d32 = *((__global DATA_TYPE *)(src_addr + 26 * src_stride_z)); + DATA_TYPE d33 = *((__global DATA_TYPE *)(src_addr + 27 * src_stride_z)); + DATA_TYPE d34 = *((__global DATA_TYPE *)(src_addr + 28 * src_stride_z)); + DATA_TYPE d35 = *((__global DATA_TYPE *)(src_addr + 29 * src_stride_z)); + DATA_TYPE d36 = *((__global DATA_TYPE *)(src_addr + 30 * src_stride_z)); + DATA_TYPE d37 = *((__global DATA_TYPE *)(src_addr + 31 * src_stride_z)); + + DATA_TYPE d40 = *((__global DATA_TYPE *)(src_addr + 32 * src_stride_z)); + DATA_TYPE d41 = *((__global DATA_TYPE *)(src_addr + 33 * src_stride_z)); + DATA_TYPE d42 = *((__global DATA_TYPE *)(src_addr + 34 * src_stride_z)); + DATA_TYPE d43 = *((__global DATA_TYPE *)(src_addr + 35 * src_stride_z)); + DATA_TYPE d44 = *((__global DATA_TYPE *)(src_addr + 36 * src_stride_z)); + DATA_TYPE d45 = *((__global DATA_TYPE *)(src_addr + 37 * src_stride_z)); + DATA_TYPE d46 = *((__global DATA_TYPE *)(src_addr + 38 * src_stride_z)); + DATA_TYPE d47 = *((__global DATA_TYPE *)(src_addr + 39 * src_stride_z)); + + DATA_TYPE d50 = *((__global DATA_TYPE *)(src_addr + 40 * src_stride_z)); + DATA_TYPE d51 = *((__global DATA_TYPE *)(src_addr + 41 * src_stride_z)); + DATA_TYPE d52 = *((__global DATA_TYPE *)(src_addr + 42 * src_stride_z)); + DATA_TYPE d53 = *((__global DATA_TYPE *)(src_addr + 43 * src_stride_z)); + DATA_TYPE d54 = *((__global DATA_TYPE *)(src_addr + 44 * src_stride_z)); + DATA_TYPE d55 = *((__global DATA_TYPE *)(src_addr + 45 * src_stride_z)); + DATA_TYPE d56 = *((__global DATA_TYPE *)(src_addr + 46 * src_stride_z)); + DATA_TYPE d57 = *((__global DATA_TYPE *)(src_addr + 47 * src_stride_z)); + + DATA_TYPE d60 = *((__global DATA_TYPE *)(src_addr + 48 * src_stride_z)); + DATA_TYPE d61 = *((__global DATA_TYPE *)(src_addr + 49 * src_stride_z)); + DATA_TYPE d62 = *((__global DATA_TYPE *)(src_addr + 50 * src_stride_z)); + DATA_TYPE d63 = *((__global DATA_TYPE *)(src_addr + 51 * src_stride_z)); + DATA_TYPE d64 = *((__global DATA_TYPE *)(src_addr + 52 * src_stride_z)); + DATA_TYPE d65 = *((__global DATA_TYPE *)(src_addr + 53 * src_stride_z)); + DATA_TYPE d66 = *((__global DATA_TYPE *)(src_addr + 54 * src_stride_z)); + DATA_TYPE d67 = *((__global DATA_TYPE *)(src_addr + 55 * src_stride_z)); + + DATA_TYPE d70 = *((__global DATA_TYPE *)(src_addr + 56 * src_stride_z)); + DATA_TYPE d71 = *((__global DATA_TYPE *)(src_addr + 57 * src_stride_z)); + DATA_TYPE d72 = *((__global DATA_TYPE *)(src_addr + 58 * src_stride_z)); + DATA_TYPE d73 = *((__global DATA_TYPE *)(src_addr + 59 * src_stride_z)); + DATA_TYPE d74 = *((__global DATA_TYPE *)(src_addr + 60 * src_stride_z)); + DATA_TYPE d75 = *((__global DATA_TYPE *)(src_addr + 61 * src_stride_z)); + DATA_TYPE d76 = *((__global DATA_TYPE *)(src_addr + 62 * src_stride_z)); + DATA_TYPE d77 = *((__global DATA_TYPE *)(src_addr + 63 * src_stride_z)); // Compute the 8x4 intermediate tensor - float4 comm_fact0, comm_fact1, comm_fact2; - float4 tmp_col0, tmp_col1, tmp_col2, tmp_col3, tmp_col4, tmp_col5, tmp_col6, tmp_col7; + VEC_DATA_TYPE(DATA_TYPE, 4) + comm_fact0, comm_fact1, comm_fact2; + VEC_DATA_TYPE(DATA_TYPE, 4) + tmp_col0, tmp_col1, tmp_col2, tmp_col3, tmp_col4, tmp_col5, tmp_col6, tmp_col7; COMPUTE_TMP_COL(tmp_col0, d00, d10, d20, d30, d40, d50, d60, d70, comm_fact0); COMPUTE_TMP_COL(tmp_col1, d01, d11, d21, d31, d41, d51, d61, d71, comm_fact0); @@ -967,49 +980,53 @@ __kernel void winograd_output_transform_4x4_5x5_nhwc( comm_fact1 = tmp_col3 + tmp_col4; comm_fact2 = tmp_col5 + tmp_col6; - float4 out_col0 = comm_fact0 + comm_fact1 + 8.f * comm_fact2 + tmp_col0; - float4 out_col2 = comm_fact0 + 4.f * comm_fact1 + 2.f * comm_fact2; + VEC_DATA_TYPE(DATA_TYPE, 4) + out_col0 = comm_fact0 + comm_fact1 + (DATA_TYPE)8.f * comm_fact2 + tmp_col0; + VEC_DATA_TYPE(DATA_TYPE, 4) + out_col2 = comm_fact0 + (DATA_TYPE)4.f * comm_fact1 + (DATA_TYPE)2.f * comm_fact2; comm_fact0 = tmp_col1 - tmp_col2; comm_fact1 = tmp_col3 - tmp_col4; comm_fact2 = tmp_col5 - tmp_col6; - float4 out_col1 = comm_fact0 + 2.f * comm_fact1 + 4.f * comm_fact2; - float4 out_col3 = comm_fact0 + 8.f * comm_fact1 + comm_fact2 + tmp_col7; + VEC_DATA_TYPE(DATA_TYPE, 4) + out_col1 = comm_fact0 + (DATA_TYPE)2.f * comm_fact1 + (DATA_TYPE)4.f * comm_fact2; + VEC_DATA_TYPE(DATA_TYPE, 4) + out_col3 = comm_fact0 + (DATA_TYPE)8.f * comm_fact1 + comm_fact2 + tmp_col7; #if defined(HAS_BIAS) // Add bias Vector bias = CONVERT_TO_VECTOR_STRUCT_NO_STEP(bias); - float b = (float) * ((__global float *)(vector_offset(&bias, x_out))); + DATA_TYPE b = (DATA_TYPE) * ((__global DATA_TYPE *)(vector_offset(&bias, x_out))); - out_col0 += (float4)b; - out_col1 += (float4)b; - out_col2 += (float4)b; - out_col3 += (float4)b; + out_col0 += (VEC_DATA_TYPE(DATA_TYPE, 4))b; + out_col1 += (VEC_DATA_TYPE(DATA_TYPE, 4))b; + out_col2 += (VEC_DATA_TYPE(DATA_TYPE, 4))b; + out_col3 += (VEC_DATA_TYPE(DATA_TYPE, 4))b; #endif // defined(HAS_BIAS) // Get output address - int4 offset = (int4)(dst_offset_first_element_in_bytes + x_out * sizeof(float) + y_out * dst_stride_y + z_out * dst_stride_z); + int4 offset = (int4)(dst_offset_first_element_in_bytes + x_out * sizeof(DATA_TYPE) + y_out * dst_stride_y + z_out * dst_stride_z); offset = min(offset + (int4)(0, 1, 2, 3) * (int4)dst_stride_z, (int4)dst_size); // If address is beyond the last plane, clamp it to dst_size (which points to the last padding). int4 mult_y = min((int4)dst_size - offset, (int4)1); // If out of bound, we don't want to increase dst_stride_y, so we set the multiplier to 0. It will be 1 otherwise. // Store the output tile - *(__global float *)(dst_ptr + mult_y.s0 * 0 * (int)dst_stride_y + offset.s0) = out_col0.s0; - *(__global float *)(dst_ptr + mult_y.s0 * 1 * (int)dst_stride_y + offset.s0) = out_col1.s0; - *(__global float *)(dst_ptr + mult_y.s0 * 2 * (int)dst_stride_y + offset.s0) = out_col2.s0; - *(__global float *)(dst_ptr + mult_y.s0 * 3 * (int)dst_stride_y + offset.s0) = out_col3.s0; - *(__global float *)(dst_ptr + mult_y.s1 * 0 * (int)dst_stride_y + offset.s1) = out_col0.s1; - *(__global float *)(dst_ptr + mult_y.s1 * 1 * (int)dst_stride_y + offset.s1) = out_col1.s1; - *(__global float *)(dst_ptr + mult_y.s1 * 2 * (int)dst_stride_y + offset.s1) = out_col2.s1; - *(__global float *)(dst_ptr + mult_y.s1 * 3 * (int)dst_stride_y + offset.s1) = out_col3.s1; - *(__global float *)(dst_ptr + mult_y.s2 * 0 * (int)dst_stride_y + offset.s2) = out_col0.s2; - *(__global float *)(dst_ptr + mult_y.s2 * 1 * (int)dst_stride_y + offset.s2) = out_col1.s2; - *(__global float *)(dst_ptr + mult_y.s2 * 2 * (int)dst_stride_y + offset.s2) = out_col2.s2; - *(__global float *)(dst_ptr + mult_y.s2 * 3 * (int)dst_stride_y + offset.s2) = out_col3.s2; - *(__global float *)(dst_ptr + mult_y.s3 * 0 * (int)dst_stride_y + offset.s3) = out_col0.s3; - *(__global float *)(dst_ptr + mult_y.s3 * 1 * (int)dst_stride_y + offset.s3) = out_col1.s3; - *(__global float *)(dst_ptr + mult_y.s3 * 2 * (int)dst_stride_y + offset.s3) = out_col2.s3; - *(__global float *)(dst_ptr + mult_y.s3 * 3 * (int)dst_stride_y + offset.s3) = out_col3.s3; + *(__global DATA_TYPE *)(dst_ptr + mult_y.s0 * 0 * (int)dst_stride_y + offset.s0) = out_col0.s0; + *(__global DATA_TYPE *)(dst_ptr + mult_y.s0 * 1 * (int)dst_stride_y + offset.s0) = out_col1.s0; + *(__global DATA_TYPE *)(dst_ptr + mult_y.s0 * 2 * (int)dst_stride_y + offset.s0) = out_col2.s0; + *(__global DATA_TYPE *)(dst_ptr + mult_y.s0 * 3 * (int)dst_stride_y + offset.s0) = out_col3.s0; + *(__global DATA_TYPE *)(dst_ptr + mult_y.s1 * 0 * (int)dst_stride_y + offset.s1) = out_col0.s1; + *(__global DATA_TYPE *)(dst_ptr + mult_y.s1 * 1 * (int)dst_stride_y + offset.s1) = out_col1.s1; + *(__global DATA_TYPE *)(dst_ptr + mult_y.s1 * 2 * (int)dst_stride_y + offset.s1) = out_col2.s1; + *(__global DATA_TYPE *)(dst_ptr + mult_y.s1 * 3 * (int)dst_stride_y + offset.s1) = out_col3.s1; + *(__global DATA_TYPE *)(dst_ptr + mult_y.s2 * 0 * (int)dst_stride_y + offset.s2) = out_col0.s2; + *(__global DATA_TYPE *)(dst_ptr + mult_y.s2 * 1 * (int)dst_stride_y + offset.s2) = out_col1.s2; + *(__global DATA_TYPE *)(dst_ptr + mult_y.s2 * 2 * (int)dst_stride_y + offset.s2) = out_col2.s2; + *(__global DATA_TYPE *)(dst_ptr + mult_y.s2 * 3 * (int)dst_stride_y + offset.s2) = out_col3.s2; + *(__global DATA_TYPE *)(dst_ptr + mult_y.s3 * 0 * (int)dst_stride_y + offset.s3) = out_col0.s3; + *(__global DATA_TYPE *)(dst_ptr + mult_y.s3 * 1 * (int)dst_stride_y + offset.s3) = out_col1.s3; + *(__global DATA_TYPE *)(dst_ptr + mult_y.s3 * 2 * (int)dst_stride_y + offset.s3) = out_col2.s3; + *(__global DATA_TYPE *)(dst_ptr + mult_y.s3 * 3 * (int)dst_stride_y + offset.s3) = out_col3.s3; #endif // defined(WINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL) || defined(WINOGRAD_OUTPUT_TRANSFORM_VERTICAL) } @@ -1020,8 +1037,9 @@ __kernel void winograd_output_transform_4x4_5x5_nhwc( * @note The width of the output tile must be passed at compile time using -DOUTPUT_TILE_W: e.g. -DOUTPUT_TILE_W=2 * @note The height of the output tile must be passed at compile time using -DOUTPUT_TILE_H: e.g. -DOUTPUT_TILE_H=1 * @note -DWINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL has to be passed at compile time + * @note The data type must be passed at compile time using -DDATA_TYPE e.g. -DDATA_TYPE=float. Supported data types: float/half. * - * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32 + * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32/F16 * @param[in] src_stride_x Stride of the source tensor in X dimension (in bytes) * @param[in] src_step_x src_stride_x * number of elements along X processed per workitem(in bytes) * @param[in] src_stride_y Stride of the source tensor in Y dimension (in bytes) @@ -1079,8 +1097,9 @@ __kernel void winograd_output_transform_2x1_3x1_nchw( * @note The width of the output tile must be passed at compile time using -DOUTPUT_TILE_W: e.g. -DOUTPUT_TILE_W=4 * @note The height of the output tile must be passed at compile time using -DOUTPUT_TILE_H: e.g. -DOUTPUT_TILE_H=1 * @note -DWINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL has to be passed at compile time + * @note The data type must be passed at compile time using -DDATA_TYPE e.g. -DDATA_TYPE=float. Supported data types: float/half. * - * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32 + * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32/F16 * @param[in] src_stride_x Stride of the source tensor in X dimension (in bytes) * @param[in] src_step_x src_stride_x * number of elements along X processed per workitem(in bytes) * @param[in] src_stride_y Stride of the source tensor in Y dimension (in bytes) @@ -1138,8 +1157,9 @@ __kernel void winograd_output_transform_4x1_3x1_nchw( * @note The width of the output tile must be passed at compile time using -DOUTPUT_TILE_W: e.g. -DOUTPUT_TILE_W=4 * @note The height of the output tile must be passed at compile time using -DOUTPUT_TILE_H: e.g. -DOUTPUT_TILE_H=1 * @note -DWINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL has to be passed at compile time + * @note The data type must be passed at compile time using -DDATA_TYPE e.g. -DDATA_TYPE=float. Supported data types: float/half. * - * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32 + * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32/F16 * @param[in] src_stride_x Stride of the source tensor in X dimension (in bytes) * @param[in] src_step_x src_stride_x * number of elements along X processed per workitem(in bytes) * @param[in] src_stride_y Stride of the source tensor in Y dimension (in bytes) @@ -1197,8 +1217,9 @@ __kernel void winograd_output_transform_4x1_5x1_nchw( * @note The width of the output tile must be passed at compile time using -DOUTPUT_TILE_W: e.g. -DOUTPUT_TILE_W=4 * @note The height of the output tile must be passed at compile time using -DOUTPUT_TILE_H: e.g. -DOUTPUT_TILE_H=1 * @note -DWINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL has to be passed at compile time + * @note The data type must be passed at compile time using -DDATA_TYPE e.g. -DDATA_TYPE=float. Supported data types: float/half. * - * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32 + * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32/F16 * @param[in] src_stride_x Stride of the source tensor in X dimension (in bytes) * @param[in] src_step_x src_stride_x * number of elements along X processed per workitem(in bytes) * @param[in] src_stride_y Stride of the source tensor in Y dimension (in bytes) @@ -1254,8 +1275,9 @@ __kernel void winograd_output_transform_4x1_3x1_nhwc( * @note The width of the output tile must be passed at compile time using -DOUTPUT_TILE_W: e.g. -DOUTPUT_TILE_W=4 * @note The height of the output tile must be passed at compile time using -DOUTPUT_TILE_H: e.g. -DOUTPUT_TILE_H=1 * @note -DWINOGRAD_OUTPUT_TRANSFORM_HORIZONTAL has to be passed at compile time + * @note The data type must be passed at compile time using -DDATA_TYPE e.g. -DDATA_TYPE=float. Supported data types: float/half. * - * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32 + * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32/F16 * @param[in] src_stride_x Stride of the source tensor in X dimension (in bytes) * @param[in] src_step_x src_stride_x * number of elements along X processed per workitem(in bytes) * @param[in] src_stride_y Stride of the source tensor in Y dimension (in bytes) @@ -1313,8 +1335,9 @@ __kernel void winograd_output_transform_4x1_5x1_nhwc( * @note The width of the output tile must be passed at compile time using -DOUTPUT_TILE_W: e.g. -DOUTPUT_TILE_W=1 * @note The height of the output tile must be passed at compile time using -DOUTPUT_TILE_H: e.g. -DOUTPUT_TILE_H=2 * @note -DWINOGRAD_OUTPUT_TRANSFORM_VERTICAL has to be passed at compile time + * @note The data type must be passed at compile time using -DDATA_TYPE e.g. -DDATA_TYPE=float. Supported data types: float/half. * - * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32 + * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32/F16 * @param[in] src_stride_x Stride of the source tensor in X dimension (in bytes) * @param[in] src_step_x src_stride_x * number of elements along X processed per workitem(in bytes) * @param[in] src_stride_y Stride of the source tensor in Y dimension (in bytes) @@ -1372,8 +1395,9 @@ __kernel void winograd_output_transform_1x2_1x3_nchw( * @note The width of the output tile must be passed at compile time using -DOUTPUT_TILE_W: e.g. -DOUTPUT_TILE_W=1 * @note The height of the output tile must be passed at compile time using -DOUTPUT_TILE_H: e.g. -DOUTPUT_TILE_H=4 * @note -DWINOGRAD_OUTPUT_TRANSFORM_VERTICAL has to be passed at compile time + * @note The data type must be passed at compile time using -DDATA_TYPE e.g. -DDATA_TYPE=float. Supported data types: float/half. * - * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32 + * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32/F16 * @param[in] src_stride_x Stride of the source tensor in X dimension (in bytes) * @param[in] src_step_x src_stride_x * number of elements along X processed per workitem(in bytes) * @param[in] src_stride_y Stride of the source tensor in Y dimension (in bytes) @@ -1431,8 +1455,9 @@ __kernel void winograd_output_transform_1x4_1x3_nchw( * @note The width of the output tile must be passed at compile time using -DOUTPUT_TILE_W: e.g. -DOUTPUT_TILE_W=1 * @note The height of the output tile must be passed at compile time using -DOUTPUT_TILE_H: e.g. -DOUTPUT_TILE_H=4 * @note -DWINOGRAD_OUTPUT_TRANSFORM_VERTICAL has to be passed at compile time + * @note The data type must be passed at compile time using -DDATA_TYPE e.g. -DDATA_TYPE=float. Supported data types: float/half. * - * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32 + * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32/F16 * @param[in] src_stride_x Stride of the source tensor in X dimension (in bytes) * @param[in] src_step_x src_stride_x * number of elements along X processed per workitem(in bytes) * @param[in] src_stride_y Stride of the source tensor in Y dimension (in bytes) @@ -1490,8 +1515,9 @@ __kernel void winograd_output_transform_1x4_1x5_nchw( * @note The width of the output tile must be passed at compile time using -DOUTPUT_TILE_W: e.g. -DOUTPUT_TILE_W=1 * @note The height of the output tile must be passed at compile time using -DOUTPUT_TILE_H: e.g. -DOUTPUT_TILE_H=4 * @note -DWINOGRAD_OUTPUT_TRANSFORM_VERTICAL has to be passed at compile time + * @note The data type must be passed at compile time using -DDATA_TYPE e.g. -DDATA_TYPE=float. Supported data types: float/half. * - * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32 + * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32/F16 * @param[in] src_stride_x Stride of the source tensor in X dimension (in bytes) * @param[in] src_step_x src_stride_x * number of elements along X processed per workitem(in bytes) * @param[in] src_stride_y Stride of the source tensor in Y dimension (in bytes) @@ -1547,8 +1573,9 @@ __kernel void winograd_output_transform_1x4_1x3_nhwc( * @note The width of the output tile must be passed at compile time using -DOUTPUT_TILE_W: e.g. -DOUTPUT_TILE_W=1 * @note The height of the output tile must be passed at compile time using -DOUTPUT_TILE_H: e.g. -DOUTPUT_TILE_H=4 * @note -DWINOGRAD_OUTPUT_TRANSFORM_VERTICAL has to be passed at compile time + * @note The data type must be passed at compile time using -DDATA_TYPE e.g. -DDATA_TYPE=float. Supported data types: float/half. * - * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32 + * @param[in] src_ptr Pointer to the source tensor. Supported data types: F32/F16 * @param[in] src_stride_x Stride of the source tensor in X dimension (in bytes) * @param[in] src_step_x src_stride_x * number of elements along X processed per workitem(in bytes) * @param[in] src_stride_y Stride of the source tensor in Y dimension (in bytes) -- cgit v1.2.1