Skip to content

Commit

Permalink
reduce innerproduct gemm gpu memory usage (#2618)
Browse files Browse the repository at this point in the history
  • Loading branch information
nihui authored Jan 24, 2021
1 parent 4cd1a5c commit db814e1
Show file tree
Hide file tree
Showing 10 changed files with 1,425 additions and 228 deletions.
448 changes: 261 additions & 187 deletions src/layer/vulkan/innerproduct_vulkan.cpp

Large diffs are not rendered by default.

8 changes: 0 additions & 8 deletions src/layer/vulkan/innerproduct_vulkan.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,7 @@ class InnerProduct_vulkan : virtual public InnerProduct
Pipeline* pipeline_innerproduct_pack8to4;
Pipeline* pipeline_innerproduct_pack8to1;

VkMat weight_data_gemm_gpu;
VkMat bias_data_gemm_gpu;

VkImageMat weight_data_gemm_gpu_image;
VkImageMat bias_data_gemm_gpu_image;

Pipeline* pipeline_innerproduct_gemm;
Pipeline* pipeline_innerproduct_gemm_pack4;
Pipeline* pipeline_innerproduct_gemm_pack8;
};

} // namespace ncnn
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ layout (constant_id = shape_constant_id_offset + 9) const int outcstep = 0;

#if NCNN_image_shader
layout (binding = 0) uniform unfp sampler3D bottom_blob;
layout (binding = 1, imfmtc4) writeonly uniform unfp image3D top_blob;
layout (binding = 1, imfmtc1) writeonly uniform unfp image3D top_blob;
layout (binding = 2) uniform unfp sampler3D weight_blob;
layout (binding = 3) uniform unfp sampler3D bias_blob;
#else
layout (binding = 0) readonly buffer bottom_blob { sfpvec4 bottom_blob_data[]; };
layout (binding = 1) writeonly buffer top_blob { sfpvec4 top_blob_data[]; };
layout (binding = 2) readonly buffer weight_blob { sfp weight_data[]; };
layout (binding = 3) readonly buffer bias_blob { sfp bias_data[]; };
layout (binding = 0) readonly buffer bottom_blob { sfp bottom_blob_data[]; };
layout (binding = 1) writeonly buffer top_blob { sfp top_blob_data[]; };
layout (binding = 2) readonly buffer weight_blob { sfpvec4 weight_data[]; };
layout (binding = 3) readonly buffer bias_blob { sfpvec4 bias_data[]; };
#endif

layout (push_constant) uniform parameter
Expand All @@ -72,17 +72,17 @@ void main()
int gy = int(gl_GlobalInvocationID.y);
int gz = int(gl_GlobalInvocationID.z);

if (gx >= psc(outw) || gy >= psc(outh) || gz >= 1)
if (gx * 4 >= psc(outw) || gy >= psc(outh) || gz >= 1)
return;

afpvec4 sum;

if (bias_term == 1)
{
#if NCNN_image_shader
sum = afpvec4(image3d_ld1(bias_blob, ivec3(gx, 0, 0)));
sum = image3d_ld4(bias_blob, ivec3(gx, 0, 0));
#else
sum = afpvec4(buffer_ld1(bias_data, gx));
sum = buffer_ld4(bias_data, gx);
#endif
}
else
Expand All @@ -93,15 +93,23 @@ void main()
#if NCNN_image_shader
for (int i = 0; i < psc(w); i++)
{
sum += image3d_ld1(weight_blob, ivec3(i, gx, 0)) * image3d_ld4(bottom_blob, ivec3(i, gy, 0));
afp v = image3d_ld1(bottom_blob, ivec3(i, gy, 0));

afpvec4 k = image3d_ld4(weight_blob, ivec3(i, gx, 0));

sum += v * k;
}
#else
int v_offset = gy * psc(w);
int w_offset = gx * psc(w);

for (int i = 0; i < psc(w); i++)
{
sum += buffer_ld1(weight_data, w_offset + i) * buffer_ld4(bottom_blob_data, v_offset + i);
afp v = buffer_ld1(bottom_blob_data, v_offset + i);

afpvec4 k = buffer_ld4(weight_data, w_offset + i);

sum += v * k;
}
#endif

Expand Down Expand Up @@ -130,9 +138,15 @@ void main()
}

#if NCNN_image_shader
image3d_st4(top_blob, ivec3(gx, gy, 0), sum);
image3d_st1(top_blob, ivec3(gx * 4 + 0, gy, 0), sum.r);
image3d_st1(top_blob, ivec3(gx * 4 + 1, gy, 0), sum.g);
image3d_st1(top_blob, ivec3(gx * 4 + 2, gy, 0), sum.b);
image3d_st1(top_blob, ivec3(gx * 4 + 3, gy, 0), sum.a);
#else
const int gi = gy * psc(outw) + gx;
buffer_st4(top_blob_data, gi, sum);
const int gi = gy * psc(outw) + gx * 4;
buffer_st1(top_blob_data, gi + 0, sum.r);
buffer_st1(top_blob_data, gi + 1, sum.g);
buffer_st1(top_blob_data, gi + 2, sum.b);
buffer_st1(top_blob_data, gi + 3, sum.a);
#endif
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ layout (constant_id = shape_constant_id_offset + 9) const int outcstep = 0;

#if NCNN_image_shader
layout (binding = 0) uniform unfp sampler3D bottom_blob;
layout (binding = 1, imfmtc4) writeonly uniform unfp image3D top_blob;
layout (binding = 1, imfmtc1) writeonly uniform unfp image3D top_blob;
layout (binding = 2) uniform unfp sampler3D weight_blob;
layout (binding = 3) uniform unfp sampler3D bias_blob;
#else
layout (binding = 0) readonly buffer bottom_blob { sfpvec8 bottom_blob_data[]; };
layout (binding = 1) writeonly buffer top_blob { sfpvec8 top_blob_data[]; };
layout (binding = 2) readonly buffer weight_blob { sfp weight_data[]; };
layout (binding = 3) readonly buffer bias_blob { sfp bias_data[]; };
layout (binding = 0) readonly buffer bottom_blob { sfp bottom_blob_data[]; };
layout (binding = 1) writeonly buffer top_blob { sfp top_blob_data[]; };
layout (binding = 2) readonly buffer weight_blob { sfpvec8 weight_data[]; };
layout (binding = 3) readonly buffer bias_blob { sfpvec8 bias_data[]; };
#endif

layout (push_constant) uniform parameter
Expand All @@ -73,19 +73,18 @@ void main()
int gy = int(gl_GlobalInvocationID.y);
int gz = int(gl_GlobalInvocationID.z);

if (gx >= psc(outw) || gy >= psc(outh) || gz >= 1)
if (gx * 8 >= psc(outw) || gy >= psc(outh) || gz >= 1)
return;

afpvec8 sum;

if (bias_term == 1)
{
#if NCNN_image_shader
afp bias = image3d_ld1(bias_blob, ivec3(gx, 0, 0));
sum = image3d_ld8(bias_blob, ivec3(gx, 0, 0));
#else
afp bias = buffer_ld1(bias_data, gx);
sum = buffer_ld8(bias_data, gx);
#endif
sum = afpvec8(afpvec4(bias), afpvec4(bias));
}
else
{
Expand All @@ -95,21 +94,27 @@ void main()
#if NCNN_image_shader
for (int i = 0; i < psc(w); i++)
{
afp k = image3d_ld1(weight_blob, ivec3(i, gx, 0));
afpvec8 v = image3d_ld8(bottom_blob, ivec3(i, gy, 0));
sum[0] += k * v[0];
sum[1] += k * v[1];
afp v = image3d_ld1(bottom_blob, ivec3(i, gy, 0));

afpvec8 k = image3d_ld8(weight_blob, ivec3(i, gx, 0));

// sum += v * k;
sum[0] += v * k[0];
sum[1] += v * k[1];
}
#else
int v_offset = gy * psc(w);
int w_offset = gx * psc(w);

for (int i = 0; i < psc(w); i++)
{
afp k = buffer_ld1(weight_data, w_offset + i);
afpvec8 v = buffer_ld8(bottom_blob_data, v_offset + i);
sum[0] += k * v[0];
sum[1] += k * v[1];
afp v = buffer_ld1(bottom_blob_data, v_offset + i);

afpvec8 k = buffer_ld8(weight_data, w_offset + i);

// sum += v * k;
sum[0] += v * k[0];
sum[1] += v * k[1];
}
#endif

Expand Down Expand Up @@ -143,9 +148,23 @@ void main()
}

#if NCNN_image_shader
image3d_st8(top_blob, ivec3(gx, gy, 0), sum);
image3d_st1(top_blob, ivec3(gx * 8 + 0, gy, 0), sum[0].r);
image3d_st1(top_blob, ivec3(gx * 8 + 1, gy, 0), sum[0].g);
image3d_st1(top_blob, ivec3(gx * 8 + 2, gy, 0), sum[0].b);
image3d_st1(top_blob, ivec3(gx * 8 + 3, gy, 0), sum[0].a);
image3d_st1(top_blob, ivec3(gx * 8 + 4, gy, 0), sum[1].r);
image3d_st1(top_blob, ivec3(gx * 8 + 5, gy, 0), sum[1].g);
image3d_st1(top_blob, ivec3(gx * 8 + 6, gy, 0), sum[1].b);
image3d_st1(top_blob, ivec3(gx * 8 + 7, gy, 0), sum[1].a);
#else
const int gi = gy * psc(outw) + gx;
buffer_st8(top_blob_data, gi, sum);
const int gi = gy * psc(outw) + gx * 8;
buffer_st1(top_blob_data, gi + 0, sum[0].r);
buffer_st1(top_blob_data, gi + 1, sum[0].g);
buffer_st1(top_blob_data, gi + 2, sum[0].b);
buffer_st1(top_blob_data, gi + 3, sum[0].a);
buffer_st1(top_blob_data, gi + 4, sum[1].r);
buffer_st1(top_blob_data, gi + 5, sum[1].g);
buffer_st1(top_blob_data, gi + 6, sum[1].b);
buffer_st1(top_blob_data, gi + 7, sum[1].a);
#endif
}
180 changes: 180 additions & 0 deletions src/layer/vulkan/shader/innerproduct_gemm_wp4.comp
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
// Tencent is pleased to support the open source community by making ncnn available.
//
// Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved.
//
// Licensed under the BSD 3-Clause License (the "License"); you may not use this file except
// in compliance with the License. You may obtain a copy of the License at
//
// https://opensource.org/licenses/BSD-3-Clause
//
// Unless required by applicable law or agreed to in writing, software distributed
// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
// CONDITIONS OF ANY KIND, either express or implied. See the License for the
// specific language governing permissions and limitations under the License.

#version 450

#if NCNN_fp16_storage
#extension GL_EXT_shader_16bit_storage: require
#endif
#if NCNN_fp16_arithmetic
#extension GL_EXT_shader_explicit_arithmetic_types_float16: require
#endif

layout (constant_id = 0) const int bias_term = 0;
layout (constant_id = 1) const int activation_type = 0;
layout (constant_id = 2) const float activation_param_0 = 0;
layout (constant_id = 3) const float activation_param_1 = 0;

#define shape_constant_id_offset 4
layout (constant_id = shape_constant_id_offset + 0) const int dims = 0;
layout (constant_id = shape_constant_id_offset + 1) const int w = 0;
layout (constant_id = shape_constant_id_offset + 2) const int h = 0;
layout (constant_id = shape_constant_id_offset + 3) const int c = 0;
layout (constant_id = shape_constant_id_offset + 4) const int cstep = 0;

layout (constant_id = shape_constant_id_offset + 5) const int outdims = 0;
layout (constant_id = shape_constant_id_offset + 6) const int outw = 0;
layout (constant_id = shape_constant_id_offset + 7) const int outh = 0;
layout (constant_id = shape_constant_id_offset + 8) const int outc = 0;
layout (constant_id = shape_constant_id_offset + 9) const int outcstep = 0;

#if NCNN_image_shader
layout (binding = 0) uniform unfp sampler3D bottom_blob;
layout (binding = 1, imfmtc1) writeonly uniform unfp image3D top_blob;
layout (binding = 2) uniform unfp sampler3D weight_blob;
layout (binding = 3) uniform unfp sampler3D bias_blob;
#else
layout (binding = 0) readonly buffer bottom_blob { sfp bottom_blob_data[]; };
layout (binding = 1) writeonly buffer top_blob { sfp top_blob_data[]; };
#if NCNN_fp16_packed || (NCNN_fp16_storage && !NCNN_fp16_arithmetic)
// GL_EXT_shader_16bit_storage does not define f16mat4 type :(
layout (binding = 2) readonly buffer weight_blob { sfpvec4 weight_data[]; };
#else
layout (binding = 2) readonly buffer weight_blob { sfpmat4 weight_data[]; };
#endif
layout (binding = 3) readonly buffer bias_blob { sfpvec4 bias_data[]; };
#endif

layout (push_constant) uniform parameter
{
int dims;
int w;
int h;
int c;
int cstep;

int outdims;
int outw;
int outh;
int outc;
int outcstep;
} p;

void main()
{
int gx = int(gl_GlobalInvocationID.x);
int gy = int(gl_GlobalInvocationID.y);
int gz = int(gl_GlobalInvocationID.z);

if (gx * 4 >= psc(outw) || gy >= psc(outh) || gz >= 1)
return;

afpvec4 sum;

if (bias_term == 1)
{
#if NCNN_image_shader
sum = image3d_ld4(bias_blob, ivec3(gx, 0, 0));
#else
sum = buffer_ld4(bias_data, gx);
#endif
}
else
{
sum = afpvec4(0.f);
}

#if NCNN_image_shader
for (int i = 0; i < psc(w) / 4; i++)
{
afpvec4 v;
v.r = image3d_ld1(bottom_blob, ivec3(i * 4 + 0, gy, 0));
v.g = image3d_ld1(bottom_blob, ivec3(i * 4 + 1, gy, 0));
v.b = image3d_ld1(bottom_blob, ivec3(i * 4 + 2, gy, 0));
v.a = image3d_ld1(bottom_blob, ivec3(i * 4 + 3, gy, 0));

afpmat4 k = afpmat4(
image3d_ld4(weight_blob, ivec3(i * 4 + 0, gx, 0)),
image3d_ld4(weight_blob, ivec3(i * 4 + 1, gx, 0)),
image3d_ld4(weight_blob, ivec3(i * 4 + 2, gx, 0)),
image3d_ld4(weight_blob, ivec3(i * 4 + 3, gx, 0))
);

sum += v * k;
}
#else
int v_offset = gy * psc(w);
int w_offset = gx * psc(w) / 4;

for (int i = 0; i < psc(w) / 4; i++)
{
afpvec4 v;
v.r = buffer_ld1(bottom_blob_data, v_offset + i * 4 + 0);
v.g = buffer_ld1(bottom_blob_data, v_offset + i * 4 + 1);
v.b = buffer_ld1(bottom_blob_data, v_offset + i * 4 + 2);
v.a = buffer_ld1(bottom_blob_data, v_offset + i * 4 + 3);

#if NCNN_fp16_packed || (NCNN_fp16_storage && !NCNN_fp16_arithmetic)
// GL_EXT_shader_16bit_storage does not define f16mat4 type :(
afpmat4 k = afpmat4(
buffer_ld4(weight_data, (w_offset + i) * 4 + 0),
buffer_ld4(weight_data, (w_offset + i) * 4 + 1),
buffer_ld4(weight_data, (w_offset + i) * 4 + 2),
buffer_ld4(weight_data, (w_offset + i) * 4 + 3)
);
#else
afpmat4 k = afpmat4(weight_data[w_offset + i]);
#endif

sum += v * k;
}
#endif

if (activation_type == 1)
{
sum = max(sum, afp(0.f));
}
if (activation_type == 2)
{
const afp slope = afp(activation_param_0);
sum = mix(sum, sum * afp(slope), lessThan(sum, afpvec4(0.f)));
}
if (activation_type == 3)
{
const afp const_min = afp(activation_param_0);
const afp const_max = afp(activation_param_1);
sum = clamp(sum, const_min, const_max);
}
if (activation_type == 4)
{
sum = afp(1.f) / (afp(1.f) + exp(-sum));
}
if (activation_type == 5)
{
sum = sum * tanh(log(exp(sum) + afp(1.f)));
}

#if NCNN_image_shader
image3d_st1(top_blob, ivec3(gx * 4 + 0, gy, 0), sum.r);
image3d_st1(top_blob, ivec3(gx * 4 + 1, gy, 0), sum.g);
image3d_st1(top_blob, ivec3(gx * 4 + 2, gy, 0), sum.b);
image3d_st1(top_blob, ivec3(gx * 4 + 3, gy, 0), sum.a);
#else
const int gi = gy * psc(outw) + gx * 4;
buffer_st1(top_blob_data, gi + 0, sum.r);
buffer_st1(top_blob_data, gi + 1, sum.g);
buffer_st1(top_blob_data, gi + 2, sum.b);
buffer_st1(top_blob_data, gi + 3, sum.a);
#endif
}
Loading

0 comments on commit db814e1

Please sign in to comment.