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

intel: struct bitset is renamed to brw_bitset

Browse Source 
Static struct bitset was renamed to brw_bitset as a struct bitset
is defined in sys/_bitset.h included by pthread_np.h on FreeBSD that
is indirectly included by src/intel/compiler/brw_nir_lower_shader_calls.c

Signed-off-by: Eleni Maria Stea <elene.mst@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11203>
This commit is contained in:
Eleni Maria Stea
2021-06-27 14:31:08 +03:00
parent 91b83dce0a
commit 49e8b77fd9
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/compiler/nir/nir_lower_shader_calls.c
View File

@@ -78,15 +78,19 @@ instr_is_shader_call(nir_instr *instr)
intrin->intrinsic == nir_intrinsic_execute_callable; intrin->intrinsic == nir_intrinsic_execute_callable;
} }
struct bitset { /* Previously named bitset, it had to be renamed as FreeBSD defines a struct
* named bitset in sys/_bitset.h required by pthread_np.h which is included
* from src/util/u_thread.h that is indirectly included by this file.
*/
struct brw_bitset {
BITSET_WORD *set; BITSET_WORD *set;
unsigned size; unsigned size;
}; };
static struct bitset static struct brw_bitset
bitset_create(void *mem_ctx, unsigned size) bitset_create(void *mem_ctx, unsigned size)
{ {
return (struct bitset) { return (struct brw_bitset) {
.set = rzalloc_array(mem_ctx, BITSET_WORD, BITSET_WORDS(size)), .set = rzalloc_array(mem_ctx, BITSET_WORD, BITSET_WORDS(size)),
.size = size, .size = size,
}; };
@@ -95,7 +99,7 @@ bitset_create(void *mem_ctx, unsigned size)
static bool static bool
src_is_in_bitset(nir_src *src, void *_set) src_is_in_bitset(nir_src *src, void *_set)
{ {
struct bitset *set = _set; struct brw_bitset *set = _set;
assert(src->is_ssa); assert(src->is_ssa);
/* Any SSA values which were added after we generated liveness information /* Any SSA values which were added after we generated liveness information
@@ -110,7 +114,7 @@ src_is_in_bitset(nir_src *src, void *_set)
} }
static void static void
add_ssa_def_to_bitset(nir_ssa_def *def, struct bitset *set) add_ssa_def_to_bitset(nir_ssa_def *def, struct brw_bitset *set)
{ {
if (def->index >= set->size) if (def->index >= set->size)
return; return;
@@ -119,7 +123,7 @@ add_ssa_def_to_bitset(nir_ssa_def *def, struct bitset *set)
} }
static bool static bool
can_remat_instr(nir_instr *instr, struct bitset *remat) can_remat_instr(nir_instr *instr, struct brw_bitset *remat)
{ {
/* Set of all values which are trivially re-materializable and we shouldn't /* Set of all values which are trivially re-materializable and we shouldn't
* ever spill them. This includes: * ever spill them. This includes:
@@ -200,7 +204,7 @@ can_remat_instr(nir_instr *instr, struct bitset *remat)
} }
static bool static bool
can_remat_ssa_def(nir_ssa_def *def, struct bitset *remat) can_remat_ssa_def(nir_ssa_def *def, struct brw_bitset *remat)
{ {
return can_remat_instr(def->parent_instr, remat); return can_remat_instr(def->parent_instr, remat);
} }
@@ -320,7 +324,7 @@ spill_ssa_defs_and_lower_shader_calls(nir_shader *shader, uint32_t num_calls,
const unsigned num_ssa_defs = impl->ssa_alloc; const unsigned num_ssa_defs = impl->ssa_alloc;
const unsigned live_words = BITSET_WORDS(num_ssa_defs); const unsigned live_words = BITSET_WORDS(num_ssa_defs);
struct bitset trivial_remat = bitset_create(mem_ctx, num_ssa_defs); struct brw_bitset trivial_remat = bitset_create(mem_ctx, num_ssa_defs);
/* Array of all live SSA defs which are spill candidates */ /* Array of all live SSA defs which are spill candidates */
nir_ssa_def **spill_defs = nir_ssa_def **spill_defs =
@@ -392,7 +396,7 @@ spill_ssa_defs_and_lower_shader_calls(nir_shader *shader, uint32_t num_calls,
/* Make a copy of trivial_remat that we'll update as we crawl through /* Make a copy of trivial_remat that we'll update as we crawl through
* the live SSA defs and unspill them. * the live SSA defs and unspill them.
*/ */
struct bitset remat = bitset_create(mem_ctx, num_ssa_defs); struct brw_bitset remat = bitset_create(mem_ctx, num_ssa_defs);
memcpy(remat.set, trivial_remat.set, live_words * sizeof(BITSET_WORD)); memcpy(remat.set, trivial_remat.set, live_words * sizeof(BITSET_WORD));
/* Before the two builders are always separated by the call /* Before the two builders are always separated by the call
@@ -792,7 +796,7 @@ flatten_resume_if_ladder(nir_function_impl *impl,
struct exec_list *child_list, struct exec_list *child_list,
bool child_list_contains_cursor, bool child_list_contains_cursor,
nir_instr *resume_instr, nir_instr *resume_instr,
struct bitset *remat) struct brw_bitset *remat)
{ {
nir_shader *shader = impl->function->shader; nir_shader *shader = impl->function->shader;
nir_cf_list cf_list; nir_cf_list cf_list;
@@ -979,7 +983,7 @@ lower_resume(nir_shader *shader, int call_idx)
/* Used to track which things may have been assumed to be re-materialized /* Used to track which things may have been assumed to be re-materialized
* by the spilling pass and which we shouldn't delete. * by the spilling pass and which we shouldn't delete.
*/ */
struct bitset remat = bitset_create(mem_ctx, impl->ssa_alloc); struct brw_bitset remat = bitset_create(mem_ctx, impl->ssa_alloc);
/* Create a nop instruction to use as a cursor as we extract and re-insert /* Create a nop instruction to use as a cursor as we extract and re-insert
* stuff into the CFG. * stuff into the CFG.