onnxruntime/js/web/test/data/ops/instance-norm.jsonc

309 lines
8.2 KiB
Text
Raw Normal View History

[js/webgpu] Optimize InstanceNormalization (#17491) ### Description <!-- Describe your changes. --> In previous implementation, there are two loops to iterate H * W elements to calculate the `mean` and `squaredNorm` value in one thread, meanwhile it outputs H * W elements in one thread. That results it's very very slow when H * W is a large value. And usually, H * W does be a large value in a model. For example, in the `candy-8` model, the shapes of [H, W] are [224,224], [112,112], [56,56] for `InstanceNormalization` op. And in my ADL, `[1,224,224,32]` consumes 17 ms. See below: ``` [profiling] kernel "23848328|[InstanceNormalization] 23848328" input[0]: [1,224,224,32] | float32, input[1]: [32] | float32, input[2]: [32] | float32, output[0]: [1,224,224,32] | float32, execution time: 17007914 ns ``` In this PR, it uses workgroup memory to optimize the original algorithm. The advantage is that it can parallelly utilize the 64 (workgroupSize) threads in one workgroup to calculate `mean` and `squaredNorm` value. Meanwhile, it only outputs `H * W / workgroupSize` outputs for one thread, which greatly reduces the overhead for one thread. With this optimization, `[1,224,224,32]` becomes 3 ms and the main overhead is the extra two `transpose`. The `createInstanceNormProgramInfo` only needs `0.64` ms. See below: ``` [profiling] kernel "23003600|[InstanceNormalization] 23003600" input[0]: [1,224,224,32] | float32, output[0]: [1,32,224,224] | float32, execution time: 1543792 ns program-manager.ts:115 [profiling] kernel "23003600|[InstanceNormalization] 23003600" input[0]: [1,32,224,224] | float32, input[1]: [32] | float32, input[2]: [32] | float32, output[0]: [1,32,224,224] | float32, execution time: 642652 ns program-manager.ts:115 [profiling] kernel "23003600|[InstanceNormalization] 23003600" input[0]: [1,32,224,224] | float32, output[0]: [1,224,224,32] | float32, execution time: 991608 ns ``` This PR currently only applies the new algorithm to NCHW format. For NHWC format, one way is to transpose the input so that it can use the new algorithm. But the disadvantage is that 2 extra transpose are added. @dakenf also gives another way to optimize NHWC. Details see [here](https://github.com/microsoft/onnxruntime/blob/d45a96616da9843b037210f2d48d6b4e5bdae5c6/js/web/lib/wasm/jsep/webgpu/ops/instance-norm.ts). I checked @dakenf's method. The perf is similar with transpose + optimized NCHW. But on different GPUs, one is a little better than another or vice versa. So I prefer this PR only does the NCHW part. @dakenf can submit his optimization on NHWC.
2023-09-15 00:03:18 +00:00
[
{
"name": "Simple test with NHWC",
"operator": "InstanceNormalization",
"inputShapeDefinitions": "rankOnly",
"opset": { "domain": "", "version": 17 },
"cases": [
{
"name": "Simple test",
"inputs": [
{
"data": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 9, 8, 7, 6, 5, 4],
"dims": [1, 4, 2, 2],
"type": "float32"
},
{
"data": [1, 2, 3, 4],
"dims": [4],
"type": "float32"
},
{
"data": [4, 5, 6, 7],
"dims": [4],
"type": "float32"
}
],
"outputs": [
{
"data": [
2.6583645343780518, 3.552788257598877, 4.447211742401123, 5.341635704040527, 2.3167295455932617,
4.105576515197754, 5.8944244384765625, 7.683271408081055, 6, 10.242595672607422, 6, 1.7574005126953125,
12.36654281616211, 8.788846969604492, 5.211153030395508, 1.633458137512207
],
"dims": [1, 4, 2, 2],
"type": "float32"
}
]
}
]
},
{
"name": "Simple test with NHWC, components 1",
"operator": "InstanceNormalization",
"inputShapeDefinitions": "rankOnly",
"opset": { "domain": "", "version": 17 },
"cases": [
{
"name": "Simple test",
"inputs": [
{
"data": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 9, 8, 7, 6, 5],
"dims": [1, 5, 3, 1],
"type": "float32"
},
{
"data": [1, 2, 3, 4, 5],
"dims": [5],
"type": "float32"
},
{
"data": [4, 5, 6, 7, 8],
"dims": [5],
"type": "float32"
}
],
"outputs": [
{
"data": [
2.775264263153076, 4, 5.224735260009766, 2.5505285263061523, 5, 7.449470520019531, 2.325794219970703, 6,
9.674205780029297, 11.898944854736328, 7, 2.1010589599609375, 14.123676300048828, 8, 1.876321792602539
],
"dims": [1, 5, 3, 1],
"type": "float32"
}
]
}
]
},
{
"name": "Simple test with NHWC, components 2",
"operator": "InstanceNormalization",
"inputShapeDefinitions": "rankOnly",
"opset": { "domain": "", "version": 17 },
"cases": [
{
"name": "Simple test",
"inputs": [
{
"data": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 9, 8],
"dims": [2, 6, 1, 1],
"type": "float32"
},
{
"data": [1, 2, 3, 4, 5, 6],
"dims": [6],
"type": "float32"
},
{
"data": [4, 5, 6, 7, 8, 9],
"dims": [6],
"type": "float32"
}
],
"outputs": [
{
"data": [4, 5, 6, 7, 8, 9, 4, 5, 6, 7, 8, 9],
"dims": [2, 6, 1, 1],
"type": "float32"
}
]
}
]
},
[js/webgpu] Optimize InstanceNormalization (#17491) ### Description <!-- Describe your changes. --> In previous implementation, there are two loops to iterate H * W elements to calculate the `mean` and `squaredNorm` value in one thread, meanwhile it outputs H * W elements in one thread. That results it's very very slow when H * W is a large value. And usually, H * W does be a large value in a model. For example, in the `candy-8` model, the shapes of [H, W] are [224,224], [112,112], [56,56] for `InstanceNormalization` op. And in my ADL, `[1,224,224,32]` consumes 17 ms. See below: ``` [profiling] kernel "23848328|[InstanceNormalization] 23848328" input[0]: [1,224,224,32] | float32, input[1]: [32] | float32, input[2]: [32] | float32, output[0]: [1,224,224,32] | float32, execution time: 17007914 ns ``` In this PR, it uses workgroup memory to optimize the original algorithm. The advantage is that it can parallelly utilize the 64 (workgroupSize) threads in one workgroup to calculate `mean` and `squaredNorm` value. Meanwhile, it only outputs `H * W / workgroupSize` outputs for one thread, which greatly reduces the overhead for one thread. With this optimization, `[1,224,224,32]` becomes 3 ms and the main overhead is the extra two `transpose`. The `createInstanceNormProgramInfo` only needs `0.64` ms. See below: ``` [profiling] kernel "23003600|[InstanceNormalization] 23003600" input[0]: [1,224,224,32] | float32, output[0]: [1,32,224,224] | float32, execution time: 1543792 ns program-manager.ts:115 [profiling] kernel "23003600|[InstanceNormalization] 23003600" input[0]: [1,32,224,224] | float32, input[1]: [32] | float32, input[2]: [32] | float32, output[0]: [1,32,224,224] | float32, execution time: 642652 ns program-manager.ts:115 [profiling] kernel "23003600|[InstanceNormalization] 23003600" input[0]: [1,32,224,224] | float32, output[0]: [1,224,224,32] | float32, execution time: 991608 ns ``` This PR currently only applies the new algorithm to NCHW format. For NHWC format, one way is to transpose the input so that it can use the new algorithm. But the disadvantage is that 2 extra transpose are added. @dakenf also gives another way to optimize NHWC. Details see [here](https://github.com/microsoft/onnxruntime/blob/d45a96616da9843b037210f2d48d6b4e5bdae5c6/js/web/lib/wasm/jsep/webgpu/ops/instance-norm.ts). I checked @dakenf's method. The perf is similar with transpose + optimized NCHW. But on different GPUs, one is a little better than another or vice versa. So I prefer this PR only does the NCHW part. @dakenf can submit his optimization on NHWC.
2023-09-15 00:03:18 +00:00
{
"name": "Simple test with NCHW",
"operator": "InstanceNormalization",
"opset": { "domain": "", "version": 17 },
"cases": [
{
"name": "Simple test",
"inputs": [
{
"data": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 9, 8, 7, 6, 5, 4],
"dims": [1, 4, 2, 2],
"type": "float32"
},
{
"data": [1, 2, 3, 4],
"dims": [4],
"type": "float32"
},
{
"data": [4, 5, 6, 7],
"dims": [4],
"type": "float32"
}
],
"outputs": [
{
"data": [
2.6583645343780518, 3.552788257598877, 4.447211742401123, 5.341635704040527, 2.3167295455932617,
4.105576515197754, 5.8944244384765625, 7.683271408081055, 6, 10.242595672607422, 6, 1.7574005126953125,
12.36654281616211, 8.788846969604492, 5.211153030395508, 1.633458137512207
],
"dims": [1, 4, 2, 2],
"type": "float32"
}
]
}
]
},
{
"name": "Simple test with NCHW, components 1",
"operator": "InstanceNormalization",
"opset": { "domain": "", "version": 17 },
"cases": [
{
"name": "Simple test",
"inputs": [
{
"data": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 9, 8, 7, 6, 5],
"dims": [1, 5, 3, 1],
"type": "float32"
},
{
"data": [1, 2, 3, 4, 5],
"dims": [5],
"type": "float32"
},
{
"data": [4, 5, 6, 7, 8],
"dims": [5],
"type": "float32"
}
],
"outputs": [
{
"data": [
2.775264263153076, 4, 5.224735260009766, 2.5505285263061523, 5, 7.449470520019531, 2.325794219970703, 6,
9.674205780029297, 11.898944854736328, 7, 2.1010589599609375, 14.123676300048828, 8, 1.876321792602539
],
"dims": [1, 5, 3, 1],
"type": "float32"
}
]
}
]
},
{
"name": "Simple test with NCHW, components 2",
"operator": "InstanceNormalization",
"opset": { "domain": "", "version": 17 },
"cases": [
{
"name": "Simple test",
"inputs": [
{
"data": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 9, 8, 7, 6, 5, 4, 3, 2],
"dims": [1, 3, 6, 1],
"type": "float32"
},
{
"data": [1, 2, 3],
"dims": [3],
"type": "float32"
},
{
"data": [4, 5, 6],
"dims": [3],
"type": "float32"
}
],
"outputs": [
{
"data": [
2.5361523628234863, 3.1216912269592285, 3.70723032951355, 4.292769432067871, 4.878308296203613,
5.4638471603393555, 1.8666191101074219, 3.9555397033691406, 6.044460296630859, 8.133380889892578,
6.044460296630859, 3.9555397033691406, 10.3915433883667, 8.634925842285156, 6.878308296203613,
5.121691703796387, 3.365074634552002, 1.6084575653076172
],
"dims": [1, 3, 6, 1],
"type": "float32"
}
]
}
]
1.17.3 cherry-picks for ORT Web changes (#19926) ### Description This PR is a preview of cherry-picks for ort-web to `rel-1.17.3` based on `rel-1.17.2`. <details> <summary>Changes of ort-web to cherry-pick</summary> The following commits are from main branch. `o` stands for pick, and `x` stands for skip. ``` o 2e0a388c36 [js/webgpu] Add HardSigmoid support (#19215) o d226e40856 [js/webgpu] set query type in onRunStart (#19202) o 61610ff986 [js/webgpu] Add FusedConv clip test case (#18900) o a33b5bd1fa [JS/WebGPU] Added Uniforms to SkipLayerNorm. (#18788) o 591f90c0b9 [js/webgpu] Fix issue of timestamp query (#19258) o 7252c6e747 [WebNN EP] Support WebNN async API with Asyncify (#19145) o 5b06505073 [js/webgpu] Fix Tanh explosion (#19201) o 656ca66186 [js/webgpu] Support uniforms for conv, conv transpose, conv grouped (#18753) o a3f0e2422b [js/webgpu] Support f16 uniform (#19098) o 9e69606360 fix f16 for attention, enable slice and flatten for more types (#19262) o 624b4e2063 [js/webgpu] Remove enableShapesUniforms (#19279) o 90883a366a [js/webgpu] Add hardSigmoid activation for fusedConv (#19233) o 85cef0af8c [js/webgpu] Support capture and replay for jsep (#18989) o d73131cf0f [js/webgpu] Use DataType as uniform cpu type (#19281) o dd1f6ccc45 [js/webgpu] resolve codescan alert (#19343) o 3a2ab1963a [js/webgpu] Refactor createTensorShapeVariables (#18883) o efc17e79de [js/webgpu] Fix the undefined push error (#19366) x 50806a7dd5 [js/web] support external data in npm test (#19377) o ccbe264a39 [js/webgpu] Add LeakyRelu activation for fusedConv (#19369) o 5ff27ef02a [js/webgpu] support customop FastGelu (#19392) x 03be65e064 [js/web] fix types exports in package.json (#19458) o 06269a3952 [js/webgpu] allow uint8 tensors for webgpu (#19545) o dfeda9019c [JS/WebGPU] Add MatMulNBits (#19446) o 1b48054e1b [js/webgpu] Create Split indices helpers by rank, not by shape (#19554) o 3fe2c137ee [js] small fix to workaround formatter (#19400) x 70567a4b3a [js/web] use ApiTensor insteadof onnxjs Tensor in TensorResultValidator (#19358) o 6e04e36e3f [js/common] upgrade tsc in common from 4.9.5 to 5.2.2 (#19317) o 58f4921686 [js] changes to allow Float16Array if any polyfill is available (#19305) o 57d6819212 [js/web] Fix fused-conv is not included in npm test (#19581) o ebd220b073 Misspelling in README.md (#19433) o 38c3432393 Bump ip from 1.1.8 to 1.1.9 in /js/react_native (#19582) o fe82fccf1a [js/webgpu] Fix Conv2DTransposeMatMul f16 compilation failure (#19596) o 76a2a487a1 Bump ip from 1.1.8 to 1.1.9 in /js/react_native/e2e (#19583) o 29b1106033 [node] Switch to setImmediate to avoid starving the Node.js event loop (#19610) o ae3d73c981 [JS/WebGPU] Fix Split and Where to handle corner cases. (#19613) o aec2389ad0 [js/webgpu] allows a ProgramInfo's RunData to use zero sized output (#19614) o bb43a0f133 [js/webgpu] minor fixes to make tinyllama work (#19564) o 0edb035808 [js/web] fix suite test list for zero sized tensor (#19638) o 3cb81cdde2 [js/common] move 'env.wasm.trace' to 'env.trace' (#19617) o e30618d055 [js/webgpu] use Headless for webgpu test by default (#19702) o f06164ef8b [js/web] transfer input buffer back to caller thread (#19677) x a788514027 [js/web] dump debug logs for karma for diagnose purpose (#19785) o 24b72d2613 [JS/WebGPU] Preserve zero size input tensor dims. (#19737) o 4538d31a8b [js/webgpu] expose a few properties in WebGPU API (#19857) o 53de2d8cb0 [js/webgpu] Enable GroupedConvVectorize path (#19791) o ed250b88c3 [JS/WebGPU] Optimize MatMulNBits (#19852) x e771a763c3 [js/test] align web test runner flags with ort.env (#19790) o 79e50aeef3 [js/web] rewrite backend resolve to allow multiple EPs (#19735) o acb0df2280 Fix #19931 broken Get Started link of "ONNX Runtime JavaScript API" page (#19932) o b29849a287 [js/common] fix typedoc warnings (#19933) o afdab62f53 Bump follow-redirects from 1.15.4 to 1.15.6 in /js/web (#19949) o 28ad6c3955 Bump follow-redirects from 1.15.4 to 1.15.6 in /js/node (#19951) o 7e0d424934 accumulate in fp32 for Reduce* (#19868) o 4c6a6a37f7 [js/webgpu] Fix NAN caused by un-initialized buffer in instance-norm (#19387) o 01c7aaf6aa [js/webgpu] allow setting env.webgpu.adapter (#19940) o c45cff60cf [js/webgpu] fix maxpool / fp16 (#19981) ``` </details> <details> <summary>Cherry-pick commandlines</summary> ```sh git cherry-pick 2e0a388c36 git cherry-pick d226e40856 git cherry-pick 61610ff986 git cherry-pick a33b5bd1fa git cherry-pick 591f90c0b9 git cherry-pick 7252c6e747 git cherry-pick 5b06505073 git cherry-pick 656ca66186 git cherry-pick a3f0e2422b git cherry-pick 9e69606360 git cherry-pick 624b4e2063 git cherry-pick 90883a366a git cherry-pick 85cef0af8c #<<<<< Note: conflicts git cherry-pick d73131cf0f git cherry-pick dd1f6ccc45 git cherry-pick 3a2ab1963a git cherry-pick efc17e79de git cherry-pick ccbe264a39 git cherry-pick 5ff27ef02a git cherry-pick 06269a3952 git cherry-pick dfeda9019c git cherry-pick 1b48054e1b git cherry-pick 3fe2c137ee git cherry-pick 6e04e36e3f git cherry-pick 58f4921686 git cherry-pick 57d6819212 git cherry-pick ebd220b073 git cherry-pick 38c3432393 git cherry-pick fe82fccf1a git cherry-pick 76a2a487a1 git cherry-pick 29b1106033 git cherry-pick ae3d73c981 git cherry-pick aec2389ad0 git cherry-pick bb43a0f133 git cherry-pick 0edb035808 git cherry-pick 3cb81cdde2 git cherry-pick e30618d055 git cherry-pick f06164ef8b git cherry-pick 24b72d2613 git cherry-pick 4538d31a8b git cherry-pick 53de2d8cb0 git cherry-pick ed250b88c3 git cherry-pick 79e50aeef3 git cherry-pick acb0df2280 git cherry-pick b29849a287 git cherry-pick afdab62f53 git cherry-pick 28ad6c3955 git cherry-pick 7e0d424934 git cherry-pick 4c6a6a37f7 git cherry-pick 01c7aaf6aa git cherry-pick c45cff60cf ``` </details> <details> <summary>Cherry-pick conflicts</summary> - 85cef0af8c #18989 this change is for enabling graph capture feature for JSEP, and it is done after ROCM EP enabled graph capture feature. However, the ROCM EP graph capture feature is not cherry-picked in rel-1.17.2. </details> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Jiajia Qin <jiajia.qin@intel.com> Co-authored-by: Xu Xing <xing.xu@intel.com> Co-authored-by: satyajandhyala <satya.k.jandhyala@gmail.com> Co-authored-by: Yang Gu <yang.gu@intel.com> Co-authored-by: Wanming Lin <wanming.lin@intel.com> Co-authored-by: Jiajie Hu <jiajie.hu@intel.com> Co-authored-by: Guenther Schmuelling <guschmue@microsoft.com> Co-authored-by: Matttttt <18152455+martholomew@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Segev Finer <segev208@gmail.com> Co-authored-by: Belem Zhang <belem.zhang@intel.com>
2024-03-29 20:13:39 +00:00
},
{
"name": "Simple test with NHWC, components 1, buffer reuse",
"operator": "InstanceNormalization",
"inputShapeDefinitions": "rankOnly",
"opset": {
"domain": "",
"version": 17
},
"cases": [
{
"name": "Simple test",
"inputs": [
{
"data": [1, 2, 3, 4, 5, 6],
"dims": [2, 3, 1, 1],
"type": "float32"
},
{
"data": [1, 2, 3],
"dims": [3],
"type": "float32"
},
{
"data": [4, 5, 6],
"dims": [3],
"type": "float32"
}
],
"outputs": [
{
"data": [4, 5, 6, 4, 5, 6],
"dims": [2, 3, 1, 1],
"type": "float32"
}
]
}
]
},
{
"name": "Simple test with NHWC, components 2, buffer reuse",
"operator": "InstanceNormalization",
"inputShapeDefinitions": "rankOnly",
"opset": {
"domain": "",
"version": 17
},
"cases": [
{
"name": "Simple test",
"inputs": [
{
"data": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 9, 8, 7, 6, 5, 4, 3, 2],
"dims": [1, 6, 1, 3],
"type": "float32"
},
{
"data": [1, 2, 3, 4, 5, 6],
"dims": [6],
"type": "float32"
},
{
"data": [4, 5, 6, 7, 8, 9],
"dims": [6],
"type": "float32"
}
],
"outputs": [
{
"data": [
2.775264263153076, 4, 5.224735260009766, 2.5505285263061523, 5, 7.449470520019531, 2.325794219970703, 6,
9.674205780029297, 11.898944854736328, 7, 2.1010589599609375, 14.123676300048828, 8, 1.876321792602539,
16.348413467407227, 9, 1.6515865325927734
],
"dims": [1, 6, 1, 3],
"type": "float32"
}
]
}
]
[js/webgpu] Optimize InstanceNormalization (#17491) ### Description <!-- Describe your changes. --> In previous implementation, there are two loops to iterate H * W elements to calculate the `mean` and `squaredNorm` value in one thread, meanwhile it outputs H * W elements in one thread. That results it's very very slow when H * W is a large value. And usually, H * W does be a large value in a model. For example, in the `candy-8` model, the shapes of [H, W] are [224,224], [112,112], [56,56] for `InstanceNormalization` op. And in my ADL, `[1,224,224,32]` consumes 17 ms. See below: ``` [profiling] kernel "23848328|[InstanceNormalization] 23848328" input[0]: [1,224,224,32] | float32, input[1]: [32] | float32, input[2]: [32] | float32, output[0]: [1,224,224,32] | float32, execution time: 17007914 ns ``` In this PR, it uses workgroup memory to optimize the original algorithm. The advantage is that it can parallelly utilize the 64 (workgroupSize) threads in one workgroup to calculate `mean` and `squaredNorm` value. Meanwhile, it only outputs `H * W / workgroupSize` outputs for one thread, which greatly reduces the overhead for one thread. With this optimization, `[1,224,224,32]` becomes 3 ms and the main overhead is the extra two `transpose`. The `createInstanceNormProgramInfo` only needs `0.64` ms. See below: ``` [profiling] kernel "23003600|[InstanceNormalization] 23003600" input[0]: [1,224,224,32] | float32, output[0]: [1,32,224,224] | float32, execution time: 1543792 ns program-manager.ts:115 [profiling] kernel "23003600|[InstanceNormalization] 23003600" input[0]: [1,32,224,224] | float32, input[1]: [32] | float32, input[2]: [32] | float32, output[0]: [1,32,224,224] | float32, execution time: 642652 ns program-manager.ts:115 [profiling] kernel "23003600|[InstanceNormalization] 23003600" input[0]: [1,32,224,224] | float32, output[0]: [1,224,224,32] | float32, execution time: 991608 ns ``` This PR currently only applies the new algorithm to NCHW format. For NHWC format, one way is to transpose the input so that it can use the new algorithm. But the disadvantage is that 2 extra transpose are added. @dakenf also gives another way to optimize NHWC. Details see [here](https://github.com/microsoft/onnxruntime/blob/d45a96616da9843b037210f2d48d6b4e5bdae5c6/js/web/lib/wasm/jsep/webgpu/ops/instance-norm.ts). I checked @dakenf's method. The perf is similar with transpose + optimized NCHW. But on different GPUs, one is a little better than another or vice versa. So I prefer this PR only does the NCHW part. @dakenf can submit his optimization on NHWC.
2023-09-15 00:03:18 +00:00
}
]