OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pan/midg: Make sure the constant offset is in range in mir_match_iadd()

Browse Source 
The offset field is an 18-bit signed integer, if the offset is bigger
than that we can get rid of the intermediate iadd.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10332>
This commit is contained in:
Boris Brezillon
2021-04-22 16:02:36 +02:00
committed by Marge Bot
parent c09439721c
commit 54a4e75223
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/panfrost/midgard/midgard_address.c
View File

@@ -85,6 +85,9 @@ mir_match_constant(struct mir_address *address)
/* Matches an iadd when there is a free slot or constant */
/* The offset field is a 18-bit signed integer */
#define MAX_POSITIVE_OFFSET ((1 << 17) - 1)
static void
mir_match_iadd(struct mir_address *address, bool first_free)
{
@@ -101,13 +104,17 @@ mir_match_iadd(struct mir_address *address, bool first_free)
nir_ssa_scalar op1 = nir_ssa_scalar_chase_alu_src(address->B, 0);
nir_ssa_scalar op2 = nir_ssa_scalar_chase_alu_src(address->B, 1);
if (nir_ssa_scalar_is_const(op1)) {
if (nir_ssa_scalar_is_const(op1) &&
nir_ssa_scalar_as_uint(op1) <= MAX_POSITIVE_OFFSET) {
address->bias += nir_ssa_scalar_as_uint(op1);
address->B = op2;
} else if (nir_ssa_scalar_is_const(op2)) {
} else if (nir_ssa_scalar_is_const(op2) &&
nir_ssa_scalar_as_uint(op2) <= MAX_POSITIVE_OFFSET) {
address->bias += nir_ssa_scalar_as_uint(op2);
address->B = op1;
} else if (first_free && !address->A.def) {
} else if (!nir_ssa_scalar_is_const(op1) &&
!nir_ssa_scalar_is_const(op2) &&
first_free && !address->A.def) {
address->A = op1;
address->B = op2;
}