AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pan/mdg: Use nir_lower_helper_writes

Browse Source 
It's now in common code, drop our (buggier) copy.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Italo Nicola <italonicola@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21413>
This commit is contained in:
Alyssa Rosenzweig
2023-02-20 14:17:12 -05:00
parent 586da7b329
commit 1d2c1b8bd6
4 changed files with 4 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/panfrost/midgard/meson.build
-1
View File
@@ -35,7 +35,6 @@ libpanfrost_midgard_files = files(
'mir_promote_uniforms.c',
'mir_squeeze.c',
'midgard_nir_lower_image_bitsize.c',
'midgard_nir_lower_helper_writes.c',
'midgard_opt_copy_prop.c',
'midgard_opt_dce.c',
'midgard_opt_perspective.c',
src/panfrost/midgard/midgard_compile.c
+4 -1
View File
@@ -363,7 +363,10 @@ optimise_nir(nir_shader *nir, unsigned quirks, bool is_blend, bool is_blit)
/* Midgard image ops coordinates are 16-bit instead of 32-bit */
NIR_PASS(progress, nir, midgard_nir_lower_image_bitsize);
NIR_PASS(progress, nir, midgard_nir_lower_helper_writes);
if (nir->info.stage == MESA_SHADER_FRAGMENT)
NIR_PASS(progress, nir, nir_lower_helper_writes, true);
NIR_PASS(progress, nir, pan_lower_helper_invocation);
NIR_PASS(progress, nir, pan_lower_sample_pos);
src/panfrost/midgard/midgard_nir.h
-1
View File
@@ -5,4 +5,3 @@ bool midgard_nir_lower_algebraic_early(nir_shader *shader);
bool midgard_nir_lower_algebraic_late(nir_shader *shader);
bool midgard_nir_cancel_inot(nir_shader *shader);
bool midgard_nir_lower_image_bitsize(nir_shader *shader);
bool midgard_nir_lower_helper_writes(nir_shader *shader);
src/panfrost/midgard/midgard_nir_lower_helper_writes.c
-90
View File
@@ -1,90 +0,0 @@
/*
* Copyright (C) 2020-2021 Collabora, Ltd.
* Copyright © 2020 Valve Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
#include "compiler/nir/nir.h"
#include "compiler/nir/nir_builder.h"
#include "midgard_nir.h"
static bool
pass(nir_builder *b, nir_instr *instr, UNUSED void *data)
{
if (instr->type != nir_instr_type_intrinsic)
return false;
nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
switch (intr->intrinsic) {
case nir_intrinsic_global_atomic_add:
case nir_intrinsic_global_atomic_and:
case nir_intrinsic_global_atomic_comp_swap:
case nir_intrinsic_global_atomic_exchange:
case nir_intrinsic_global_atomic_fadd:
case nir_intrinsic_global_atomic_fcomp_swap:
case nir_intrinsic_global_atomic_fmax:
case nir_intrinsic_global_atomic_fmin:
case nir_intrinsic_global_atomic_imax:
case nir_intrinsic_global_atomic_imin:
case nir_intrinsic_global_atomic_or:
case nir_intrinsic_global_atomic_umax:
case nir_intrinsic_global_atomic_umin:
case nir_intrinsic_global_atomic_xor:
case nir_intrinsic_image_atomic_add:
case nir_intrinsic_image_atomic_and:
case nir_intrinsic_image_atomic_comp_swap:
case nir_intrinsic_image_atomic_dec_wrap:
case nir_intrinsic_image_atomic_exchange:
case nir_intrinsic_image_atomic_fadd:
case nir_intrinsic_image_atomic_imax:
case nir_intrinsic_image_atomic_imin:
case nir_intrinsic_image_atomic_inc_wrap:
case nir_intrinsic_image_atomic_or:
case nir_intrinsic_image_atomic_umax:
case nir_intrinsic_image_atomic_umin:
case nir_intrinsic_image_atomic_xor:
case nir_intrinsic_image_store:
case nir_intrinsic_store_global:
break;
default:
return false;
}
b->cursor = nir_before_instr(instr);
nir_ssa_def *helper = nir_load_helper_invocation(b, 1);
nir_push_if(b, nir_inot(b, helper));
nir_instr_remove(instr);
nir_builder_instr_insert(b, instr);
nir_pop_if(b, NULL);
return true;
}
bool
midgard_nir_lower_helper_writes(nir_shader *shader)
{
if (shader->info.stage != MESA_SHADER_FRAGMENT)
return false;
return nir_shader_instructions_pass(shader, pass, nir_metadata_none, NULL);
}