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

intel/compiler: Drop brw_nir_lower_scoped_barriers

Browse Source 
Now that we handle scoped barriers with execution scope during
NIR -> Backend IR translation, this lowering is not needed anymore.

Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21634>
This commit is contained in:
Caio Oliveira
2023-03-02 12:59:18 -08:00
committed by Marge Bot
parent dfc34b1a65
commit 07de034791
4 changed files with 0 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/intel/compiler/brw_nir.c
View File

@@ -1422,7 +1422,6 @@ brw_postprocess_nir(nir_shader *nir, const struct brw_compiler *compiler,
OPT(nir_lower_bit_size, lower_bit_size_callback, (void *)compiler);
OPT(brw_nir_lower_scoped_barriers);
OPT(nir_opt_combine_barriers, combine_all_memory_barriers, NULL);
do {

2
src/intel/compiler/brw_nir.h
View File

@@ -128,8 +128,6 @@ void brw_nir_lower_fs_outputs(nir_shader *nir);
bool brw_nir_lower_conversions(nir_shader *nir);
bool brw_nir_lower_scoped_barriers(nir_shader *nir);
bool brw_nir_lower_shading_rate_output(nir_shader *nir);
bool brw_nir_lower_storage_image(nir_shader *nir,

61
src/intel/compiler/brw_nir_lower_scoped_barriers.c
View File

@@ -1,61 +0,0 @@
/*
* Copyright (c) 2020 Intel Corporation
* Copyright (c) 2020 Collabora Ltd
*
* 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.
*/
/*
* Lower scoped barriers embedding a control barrier (execusion_scope != NONE)
* to scoped_barriers-without-control-barrier + control_barrier.
*/
#include "brw_nir.h"
#include "compiler/nir/nir_builder.h"
static bool
lower_instr(nir_builder *b, nir_instr *instr, UNUSED void *cb_data)
{
if (instr->type != nir_instr_type_intrinsic)
return false;
nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
if (intr->intrinsic != nir_intrinsic_scoped_barrier ||
nir_intrinsic_execution_scope(intr) == NIR_SCOPE_NONE)
return false;
if (nir_intrinsic_execution_scope(intr) == NIR_SCOPE_WORKGROUP) {
b->cursor = nir_after_instr(&intr->instr);
nir_control_barrier(b);
}
nir_intrinsic_set_execution_scope(intr, NIR_SCOPE_NONE);
return true;
}
bool
brw_nir_lower_scoped_barriers(nir_shader *nir)
{
return nir_shader_instructions_pass(nir, lower_instr,
nir_metadata_block_index |
nir_metadata_dominance,
NULL);
}

1
src/intel/compiler/meson.build
View File

@@ -93,7 +93,6 @@ libintel_compiler_files = files(
'brw_nir_lower_intersection_shader.c',
'brw_nir_lower_ray_queries.c',
'brw_nir_lower_rt_intrinsics.c',
'brw_nir_lower_scoped_barriers.c',
'brw_nir_lower_shader_calls.c',
'brw_nir_lower_shading_rate_output.c',
'brw_nir_lower_storage_image.c',