Skip to content

[webgl] Rotate performance fix #4784

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

Merged
merged 3 commits into from
Mar 8, 2021
Merged

[webgl] Rotate performance fix #4784

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67407f9
fixed pad unpacked shader failure
pyu10055 Mar 5, 2021
011da7a
use uniform to improve rotate performance to avoid shader recompilati…
pyu10055 Mar 6, 2021
86bf4dd
Merge branch 'master' into rotate_fix
lina128 Mar 8, 2021
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
Prev Previous commit
Next Next commit
use uniform to improve rotate performance to avoid shader recompilati… 
…on due to center and radian change
  • Loading branch information
@pyu10055
pyu10055 committed Mar 6, 2021
commit 011da7a94d728c3fe777f2c5c0652a7ff81f71d5
12 changes: 8 additions & 4 deletions tfjs-backend-webgl/src/kernels/RotateWithOffset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* =============================================================================
*/

import {KernelConfig, Tensor4D} from '@tensorflow/tfjs-core';
import {backend_util, KernelConfig, Tensor4D} from '@tensorflow/tfjs-core';
import {RotateWithOffset, RotateWithOffsetAttrs, RotateWithOffsetInputs} from '@tensorflow/tfjs-core';

import {MathBackendWebGL} from '../backend_webgl';
Expand All @@ -29,9 +29,13 @@ export const rotateWithOffsetConfig: KernelConfig = {
const {radians, fillValue, center} = attrs as {} as RotateWithOffsetAttrs;
const webglBackend = backend as MathBackendWebGL;

const program = new RotateProgram(
(image as Tensor4D).shape, radians, fillValue, center);
const output = webglBackend.runWebGLProgram(program, [image], image.dtype);
const program = new RotateProgram((image as Tensor4D).shape, fillValue);
const [centerX, centerY] =
backend_util.getImageCenter(center, image.shape[1], image.shape[2]);
const customSetup = program.getCustomSetupFunc(
centerX, centerY, Math.sin(radians), Math.cos(radians));
const output = webglBackend.runWebGLProgram(
program, [image], image.dtype, customSetup);
return output;
}
};
42 changes: 23 additions & 19 deletions tfjs-backend-webgl/src/rotate_gpu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,21 @@
* =============================================================================
*/

import {backend_util} from '@tensorflow/tfjs-core';

import {GPGPUContext} from './gpgpu_context';
import {GPGPUProgram} from './gpgpu_math';

export class RotateProgram implements GPGPUProgram {
variableNames = ['Image'];
outputShape: number[] = [];
userCode: string;

paramsLoc: WebGLUniformLocation;
constructor(
imageShape: [number, number, number, number], radians: number,
fillValue: number|[number, number, number],
center: number|[number, number]) {
imageShape: [number, number, number, number],
fillValue: number|[number, number, number]) {
const imageHeight = imageShape[1];
const imageWidth = imageShape[2];
const sinFactor = Math.sin(radians).toFixed(3);
const cosFactor = Math.cos(radians).toFixed(3);
this.outputShape = imageShape;

const [centerX, centerY] =
backend_util.getImageCenter(center, imageHeight, imageWidth);
const centerXString = centerX.toFixed(3);
const centerYString = centerY.toFixed(3);

let fillSnippet = '';
if (typeof fillValue === 'number') {
fillSnippet = `float outputValue = ${fillValue.toFixed(2)};`;
Expand All @@ -49,16 +40,17 @@ export class RotateProgram implements GPGPUProgram {
}

this.userCode = `
uniform vec4 params;
void main() {
ivec4 coords = getOutputCoords();
int x = coords[2];
int y = coords[1];
float coordXFloat = (float(x) - ${centerXString}) * ${
cosFactor} - (float(y) - ${centerYString}) * ${sinFactor};
float coordYFloat = (float(x) - ${centerXString}) * ${
sinFactor} + (float(y) - ${centerYString}) * ${cosFactor};
int coordX = int(round(coordXFloat + ${centerXString}));
int coordY = int(round(coordYFloat + ${centerYString}));
float coordXFloat = (float(x) - params[0]) * params[3] -
(float(y) - params[1]) * params[2];
float coordYFloat = (float(x) - params[0]) * params[2] +
(float(y) - params[1]) * params[3];
int coordX = int(round(coordXFloat + params[0]));
int coordY = int(round(coordYFloat + params[1]));
${fillSnippet}
if(coordX >= 0 && coordX < ${imageWidth} && coordY >= 0 && coordY < ${
imageHeight}) {
Expand All @@ -68,4 +60,16 @@ export class RotateProgram implements GPGPUProgram {
}
`;
}

getCustomSetupFunc(
centerX: number, centerY: number, sinFactor: number, cosFactor: number) {
return (gpgpu: GPGPUContext, webGLProgram: WebGLProgram) => {
if (this.paramsLoc == null) {
this.paramsLoc =
gpgpu.getUniformLocationNoThrow(webGLProgram, 'params');
}
gpgpu.gl.uniform4f(
this.paramsLoc, centerX, centerY, sinFactor, cosFactor);
};
}
}