Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ET-VK] Rearranging code in permute op shader to reduce heavy math ops and improve performance. #7014

Merged
merged 4 commits into from
Nov 26, 2024
Merged

[ET-VK] Rearranging code in permute op shader to reduce heavy math ops and improve performance. #7014

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c4bb212
[ET-VK] Rearranging code in permute op shader to reduce heavy math op…
trivedivivek Nov 21, 2024
8ec2d12
Update on "[ET-VK] Rearranging code in permute op shader to reduce he…
trivedivivek Nov 26, 2024
d9d4ab6
Update on "[ET-VK] Rearranging code in permute op shader to reduce he…
trivedivivek Nov 26, 2024
8c171a0
Update on "[ET-VK] Rearranging code in permute op shader to reduce he…
trivedivivek Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 22 additions & 14 deletions backends/vulkan/runtime/graph/ops/glsl/permute.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ layout(set = 0, binding = 4) uniform PRECISION restrict Block {

layout(local_size_x_id = 0, local_size_y_id = 1, local_size_z_id = 2) in;

#extension GL_EXT_shader_explicit_arithmetic_types_int16 : require

void main() {
const ivec3 pos = ivec3(gl_GlobalInvocationID);
const u16vec3 pos = u16vec3(gl_GlobalInvocationID);

if (any(greaterThanEqual(pos, out_limits))) {
return;
Expand All @@ -46,28 +48,34 @@ void main() {
const int out_channel_4up = int(ch_info.x);
const int in_channel_4up = int(ch_info.y);
const int out_batch = int(sizes[3]);
const int max_dst_index = out_batch * out_channel_4up;
VEC4_T outval = VEC4_T(0.0);
ivec4 v = ivec4(0); // holds b,c,h,w

v[out_ndims[2]] = pos.y;
v[out_ndims[3]] = pos.x;

const int dst_index = pos.z << 2;
int dst_out_index = dst_index / out_channel_4up;
int dst_out_lane = dst_index % out_channel_4up;

for (int j = 0; j < 4; ++j) {
int dst_index = pos.z * 4 + j;
if (dst_index >= max_dst_index) {
for (int j = 0; j < 4; ++j, ++dst_out_lane) {
if (dst_out_index >= out_batch) {
// out of range
break;
}

ivec4 v = ivec4(0); // holds b,c,h,w
v[out_ndims[0]] = dst_index / out_channel_4up;
v[out_ndims[1]] = dst_index % out_channel_4up;
v[out_ndims[2]] = pos.y;
v[out_ndims[3]] = pos.x;
if (dst_out_lane == out_channel_4up) {
dst_out_lane = 0;
dst_out_index++;
}

v[out_ndims[0]] = dst_out_index;
v[out_ndims[1]] = dst_out_lane;

int src_index = v[0] * in_channel_4up + v[1];
int w = v[3];
int h = v[2];

VEC4_T inval = VEC4_T(texelFetch(image_in, ivec3(w, h, src_index / 4), 0));
outval[j] = inval[src_index % 4];
VEC4_T inval = VEC4_T(texelFetch(image_in, u16vec3(v[3], v[2], src_index >> 2), 0));
outval[j] = inval[src_index & 0x3];
}

imageStore(image_out, pos, outval);
Expand Down
Loading