-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[OpenCL][Textures] Always use SSA for texture loading (#14397)
* [OpenCL][Textures] Always use SSA for texture loading In some cases we must use SSA for textures loading but we didn't do that. Example of such cases: 1. Storing texture (NCHW4c) directly (w/o temporary buffer) to the output buffer (NCHW). In this case we have to use SSA because we need to get only one channel from the pixel. In case of storing to the local buffer the SSA was used because the buffer was allocated in kernel and the logic was written that if the buffer was allocated then we should use SSA. But if we store the same texture directly to the output buffer then SSA wasn't used and this OpenCL code wasn't compiled. 2. Casting texture (NCHW4c) to another data type and then storing it to the buffer (NCHW). The SSA for textures was disabled in case of cast operation. As a result it was necessary to take an channel from the pixel but we got the vector data type (e.g. float4) and then we tried to cast it to scalar data type. This code also wasn't compiled. In this PR SSA form was enabled for all cases when `texture2d_load` is used. The relevant tests cases were added. * Add regression test on injective * Fix lit * Add skip for FP16 test * Add additional test cases * Fix lint * Apply comment * Fix lint --------- Co-authored-by: Andrey Malyshev <[email protected]>
- Loading branch information
Showing
5 changed files
with
469 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
tests/python/relay/opencl_texture/test_injection_texture.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
# Licensed to the Apache Software Foundation (ASF) under one | ||
# or more contributor license agreements. See the NOTICE file | ||
# distributed with this work for additional information | ||
# regarding copyright ownership. The ASF licenses this file | ||
# to you under the Apache License, Version 2.0 (the | ||
# "License"); you may not use this file except in compliance | ||
# with the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# 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. | ||
|
||
import re | ||
import pytest | ||
import tvm | ||
import numpy as np | ||
from tvm import relay | ||
from tvm.relay import testing | ||
from tvm.contrib import utils | ||
from utils.adreno_utils import gpu_preprocess, build_run_compare | ||
|
||
|
||
dtype = tvm.testing.parameter("float32") | ||
|
||
|
||
@tvm.testing.requires_opencl | ||
@tvm.testing.parametrize_targets("opencl -device=adreno") | ||
def test_layout_transform_to_block_nchw4c(remote, target, dtype): | ||
"""Verification of the case NCHW->NCHW4c""" | ||
input_shape = (1, 32, 720, 1280) | ||
A = relay.var("data", shape=input_shape, dtype=dtype) | ||
lt = relay.layout_transform(A, "NCHW", "NCHW4c") | ||
mod = relay.Function([A], lt) | ||
|
||
build_run_compare(remote, mod, {}, {"data": input_shape}, {"data": dtype}, target) | ||
|
||
|
||
@tvm.testing.requires_opencl | ||
@tvm.testing.parametrize_targets("opencl -device=adreno") | ||
def test_layout_transform_to_block_nchw(remote, target, dtype): | ||
"""Verification of the case NCHW4c->NCHW""" | ||
input_shape = (1, 36, 1, 1, 4) | ||
A = relay.var("data", shape=input_shape, dtype=dtype) | ||
lt = relay.layout_transform(A, "NCHW4c", "NCHW") | ||
mod = relay.Function([A], lt) | ||
|
||
build_run_compare(remote, mod, {}, {"data": input_shape}, {"data": dtype}, target) | ||
|
||
|
||
@tvm.testing.requires_opencl | ||
@tvm.testing.parametrize_targets("opencl -device=adreno") | ||
def test_layout_transform_to_block_nhwc4c(remote, target, dtype): | ||
"""Verification of the case NHWC->NHWC4c""" | ||
input_shape = (1, 1, 1, 144) | ||
A = relay.var("data", shape=input_shape, dtype=dtype) | ||
lt = relay.layout_transform(A, "NHWC", "NHWC4c") | ||
mod = relay.Function([A], lt) | ||
|
||
build_run_compare(remote, mod, {}, {"data": input_shape}, {"data": dtype}, target) | ||
|
||
|
||
@pytest.mark.skipif( | ||
tvm.testing.utils.IS_IN_CI, reason="Skip because GPU in CI doesn't support FP16" | ||
) | ||
@tvm.testing.requires_opencl | ||
@tvm.testing.parametrize_targets("opencl -device=adreno") | ||
def test_layout_transform_to_block_nhwc(remote, target, dtype): | ||
"""Verification of the case NHWC4c->NHWC""" | ||
input_shape = (1, 80, 80, 36, 4) | ||
A = relay.var("data", shape=input_shape, dtype=dtype) | ||
mean = relay.mean(A, axis=[1, 2], keepdims=True) | ||
cast = relay.cast(mean, "float16") | ||
lt = relay.layout_transform(cast, "NHWC4c", "NHWC") | ||
mod = relay.Function([A], lt) | ||
|
||
build_run_compare(remote, mod, {}, {"data": input_shape}, {"data": dtype}, target) | ||
|
||
|
||
if __name__ == "__main__": | ||
test_layout_transform_to_block_nhwc(None, "opencl -device=adreno", "float16") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.