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

intel/compiler: Rename 8_PATCH to MULTI_PATCH

Browse Source 
Make it clearer we are dealing with multiple patches,
works better in constrast with SINGLE_PATCH.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18151>
This commit is contained in:
Caio Oliveira
2022-08-16 11:02:20 -07:00
committed by Marge Bot
parent 7cd06249b9
commit a1b1fdf70d
8 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/iris/iris_draw.c
View File

@@ -87,8 +87,8 @@ iris_update_draw_info(struct iris_context *ice,
ice->state.vertices_per_patch = ice->state.patch_vertices; ice->state.vertices_per_patch = ice->state.patch_vertices;
ice->state.dirty |= IRIS_DIRTY_VF_TOPOLOGY; ice->state.dirty |= IRIS_DIRTY_VF_TOPOLOGY;
/* 8_PATCH TCS needs this for key->input_vertices */ /* MULTI_PATCH TCS needs this for key->input_vertices */
if (compiler->use_tcs_8_patch) if (compiler->use_tcs_multi_patch)
ice->state.stage_dirty |= IRIS_STAGE_DIRTY_UNCOMPILED_TCS; ice->state.stage_dirty |= IRIS_STAGE_DIRTY_UNCOMPILED_TCS;
/* Flag constants dirty for gl_PatchVerticesIn if needed. */ /* Flag constants dirty for gl_PatchVerticesIn if needed. */

6
src/gallium/drivers/iris/iris_program.c
View File

@@ -1611,7 +1611,7 @@ iris_update_compiled_tcs(struct iris_context *ice)
.vue.base.program_string_id = tcs ? tcs->program_id : 0, .vue.base.program_string_id = tcs ? tcs->program_id : 0,
._tes_primitive_mode = tes_info->tess._primitive_mode, ._tes_primitive_mode = tes_info->tess._primitive_mode,
.input_vertices = .input_vertices =
!tcs || compiler->use_tcs_8_patch ? ice->state.vertices_per_patch : 0, !tcs || compiler->use_tcs_multi_patch ? ice->state.vertices_per_patch : 0,
.quads_workaround = devinfo->ver < 9 && .quads_workaround = devinfo->ver < 9 &&
tes_info->tess._primitive_mode == TESS_PRIMITIVE_QUADS && tes_info->tess._primitive_mode == TESS_PRIMITIVE_QUADS &&
tes_info->tess.spacing == TESS_SPACING_EQUAL, tes_info->tess.spacing == TESS_SPACING_EQUAL,
@@ -2620,12 +2620,12 @@ iris_create_shader_state(struct pipe_context *ctx,
.patch_outputs_written = info->patch_outputs_written, .patch_outputs_written = info->patch_outputs_written,
}; };
/* 8_PATCH mode needs the key to contain the input patch dimensionality. /* MULTI_PATCH mode needs the key to contain the input patch dimensionality.
* We don't have that information, so we randomly guess that the input * We don't have that information, so we randomly guess that the input
* and output patches are the same size. This is a bad guess, but we * and output patches are the same size. This is a bad guess, but we
* can't do much better. * can't do much better.
*/ */
if (screen->compiler->use_tcs_8_patch) if (screen->compiler->use_tcs_multi_patch)
key.tcs.input_vertices = info->tess.tcs_vertices_out; key.tcs.input_vertices = info->tess.tcs_vertices_out;
key_size = sizeof(key.tcs); key_size = sizeof(key.tcs);

6
src/intel/compiler/brw_compiler.c
View File

@@ -116,7 +116,7 @@ brw_compiler_create(void *mem_ctx, const struct intel_device_info *devinfo)
compiler->precise_trig = env_var_as_boolean("INTEL_PRECISE_TRIG", false); compiler->precise_trig = env_var_as_boolean("INTEL_PRECISE_TRIG", false);
compiler->use_tcs_8_patch = devinfo->ver >= 12; compiler->use_tcs_multi_patch = devinfo->ver >= 12;
/* Default to the sampler since that's what we've done since forever */ /* Default to the sampler since that's what we've done since forever */
compiler->indirect_ubos_use_sampler = true; compiler->indirect_ubos_use_sampler = true;
@@ -198,8 +198,8 @@ brw_compiler_create(void *mem_ctx, const struct intel_device_info *devinfo)
brw_nir_no_indirect_mask(compiler, i); brw_nir_no_indirect_mask(compiler, i);
nir_options->force_indirect_unrolling_sampler = devinfo->ver < 7; nir_options->force_indirect_unrolling_sampler = devinfo->ver < 7;
if (compiler->use_tcs_8_patch) { if (compiler->use_tcs_multi_patch) {
/* TCS 8_PATCH mode has multiple patches per subgroup */ /* TCS MULTI_PATCH mode has multiple patches per subgroup */
nir_options->divergence_analysis_options &= nir_options->divergence_analysis_options &=
~nir_divergence_single_patch_per_tcs_subgroup; ~nir_divergence_single_patch_per_tcs_subgroup;
} }

4
src/intel/compiler/brw_compiler.h
View File

@@ -84,7 +84,7 @@ struct brw_compiler {
void (*shader_perf_log)(void *, unsigned *id, const char *str, ...) PRINTFLIKE(3, 4); void (*shader_perf_log)(void *, unsigned *id, const char *str, ...) PRINTFLIKE(3, 4);
bool scalar_stage[MESA_ALL_SHADER_STAGES]; bool scalar_stage[MESA_ALL_SHADER_STAGES];
bool use_tcs_8_patch; bool use_tcs_multi_patch;
struct nir_shader_compiler_options *nir_options[MESA_ALL_SHADER_STAGES]; struct nir_shader_compiler_options *nir_options[MESA_ALL_SHADER_STAGES];
/** /**
@@ -1258,7 +1258,7 @@ enum shader_dispatch_mode {
DISPATCH_MODE_SIMD8 = 3, DISPATCH_MODE_SIMD8 = 3,
DISPATCH_MODE_TCS_SINGLE_PATCH = 0, DISPATCH_MODE_TCS_SINGLE_PATCH = 0,
DISPATCH_MODE_TCS_8_PATCH = 2, DISPATCH_MODE_TCS_MULTI_PATCH = 2,
}; };
/** /**

6
src/intel/compiler/brw_fs.cpp
View File

@@ -6674,7 +6674,7 @@ fs_visitor::set_tcs_invocation_id()
invocation_id = bld.vgrf(BRW_REGISTER_TYPE_UD); invocation_id = bld.vgrf(BRW_REGISTER_TYPE_UD);
if (vue_prog_data->dispatch_mode == DISPATCH_MODE_TCS_8_PATCH) { if (vue_prog_data->dispatch_mode == DISPATCH_MODE_TCS_MULTI_PATCH) {
/* gl_InvocationID is just the thread number */ /* gl_InvocationID is just the thread number */
bld.SHR(invocation_id, t, brw_imm_ud(instance_id_shift)); bld.SHR(invocation_id, t, brw_imm_ud(instance_id_shift));
return; return;
@@ -6706,13 +6706,13 @@ fs_visitor::run_tcs()
struct brw_tcs_prog_key *tcs_key = (struct brw_tcs_prog_key *) key; struct brw_tcs_prog_key *tcs_key = (struct brw_tcs_prog_key *) key;
assert(vue_prog_data->dispatch_mode == DISPATCH_MODE_TCS_SINGLE_PATCH || assert(vue_prog_data->dispatch_mode == DISPATCH_MODE_TCS_SINGLE_PATCH ||
vue_prog_data->dispatch_mode == DISPATCH_MODE_TCS_8_PATCH); vue_prog_data->dispatch_mode == DISPATCH_MODE_TCS_MULTI_PATCH);
if (vue_prog_data->dispatch_mode == DISPATCH_MODE_TCS_SINGLE_PATCH) { if (vue_prog_data->dispatch_mode == DISPATCH_MODE_TCS_SINGLE_PATCH) {
/* r1-r4 contain the ICP handles. */ /* r1-r4 contain the ICP handles. */
payload.num_regs = 5; payload.num_regs = 5;
} else { } else {
assert(vue_prog_data->dispatch_mode == DISPATCH_MODE_TCS_8_PATCH); assert(vue_prog_data->dispatch_mode == DISPATCH_MODE_TCS_MULTI_PATCH);
assert(tcs_key->input_vertices > 0); assert(tcs_key->input_vertices > 0);
/* r1 contains output handles, r2 may contain primitive ID, then the /* r1 contains output handles, r2 may contain primitive ID, then the
* ICP handles occupy the next 1-32 registers. * ICP handles occupy the next 1-32 registers.

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

@@ -297,7 +297,7 @@ public:
fs_reg get_indirect_offset(nir_intrinsic_instr *instr); fs_reg get_indirect_offset(nir_intrinsic_instr *instr);
fs_reg get_tcs_single_patch_icp_handle(const brw::fs_builder &bld, fs_reg get_tcs_single_patch_icp_handle(const brw::fs_builder &bld,
nir_intrinsic_instr *instr); nir_intrinsic_instr *instr);
fs_reg get_tcs_eight_patch_icp_handle(const brw::fs_builder &bld, fs_reg get_tcs_multi_patch_icp_handle(const brw::fs_builder &bld,
nir_intrinsic_instr *instr); nir_intrinsic_instr *instr);
struct brw_reg get_tcs_output_urb_handle(); struct brw_reg get_tcs_output_urb_handle();

12
src/intel/compiler/brw_fs_nir.cpp
View File

@@ -2757,7 +2757,7 @@ fs_visitor::get_tcs_single_patch_icp_handle(const fs_builder &bld,
} }
fs_reg fs_reg
fs_visitor::get_tcs_eight_patch_icp_handle(const fs_builder &bld, fs_visitor::get_tcs_multi_patch_icp_handle(const fs_builder &bld,
nir_intrinsic_instr *instr) nir_intrinsic_instr *instr)
{ {
struct brw_tcs_prog_key *tcs_key = (struct brw_tcs_prog_key *) key; struct brw_tcs_prog_key *tcs_key = (struct brw_tcs_prog_key *) key;
@@ -2818,7 +2818,7 @@ fs_visitor::get_tcs_output_urb_handle()
if (vue_prog_data->dispatch_mode == DISPATCH_MODE_TCS_SINGLE_PATCH) { if (vue_prog_data->dispatch_mode == DISPATCH_MODE_TCS_SINGLE_PATCH) {
return retype(brw_vec1_grf(0, 0), BRW_REGISTER_TYPE_UD); return retype(brw_vec1_grf(0, 0), BRW_REGISTER_TYPE_UD);
} else { } else {
assert(vue_prog_data->dispatch_mode == DISPATCH_MODE_TCS_8_PATCH); assert(vue_prog_data->dispatch_mode == DISPATCH_MODE_TCS_MULTI_PATCH);
return retype(brw_vec8_grf(1, 0), BRW_REGISTER_TYPE_UD); return retype(brw_vec8_grf(1, 0), BRW_REGISTER_TYPE_UD);
} }
} }
@@ -2832,8 +2832,8 @@ fs_visitor::nir_emit_tcs_intrinsic(const fs_builder &bld,
struct brw_tcs_prog_data *tcs_prog_data = brw_tcs_prog_data(prog_data); struct brw_tcs_prog_data *tcs_prog_data = brw_tcs_prog_data(prog_data);
struct brw_vue_prog_data *vue_prog_data = &tcs_prog_data->base; struct brw_vue_prog_data *vue_prog_data = &tcs_prog_data->base;
bool eight_patch = bool multi_patch =
vue_prog_data->dispatch_mode == DISPATCH_MODE_TCS_8_PATCH; vue_prog_data->dispatch_mode == DISPATCH_MODE_TCS_MULTI_PATCH;
fs_reg dst; fs_reg dst;
if (nir_intrinsic_infos[instr->intrinsic].has_dest) if (nir_intrinsic_infos[instr->intrinsic].has_dest)
@@ -2841,7 +2841,7 @@ fs_visitor::nir_emit_tcs_intrinsic(const fs_builder &bld,
switch (instr->intrinsic) { switch (instr->intrinsic) {
case nir_intrinsic_load_primitive_id: case nir_intrinsic_load_primitive_id:
bld.MOV(dst, fs_reg(eight_patch ? brw_vec8_grf(2, 0) bld.MOV(dst, fs_reg(multi_patch ? brw_vec8_grf(2, 0)
: brw_vec1_grf(0, 1))); : brw_vec1_grf(0, 1)));
break; break;
case nir_intrinsic_load_invocation_id: case nir_intrinsic_load_invocation_id:
@@ -2906,7 +2906,7 @@ fs_visitor::nir_emit_tcs_intrinsic(const fs_builder &bld,
fs_inst *inst; fs_inst *inst;
fs_reg icp_handle = fs_reg icp_handle =
eight_patch ? get_tcs_eight_patch_icp_handle(bld, instr) multi_patch ? get_tcs_multi_patch_icp_handle(bld, instr)
: get_tcs_single_patch_icp_handle(bld, instr); : get_tcs_single_patch_icp_handle(bld, instr);
/* We can only read two double components with each URB read, so /* We can only read two double components with each URB read, so

6
src/intel/compiler/brw_vec4_tcs.cpp
View File

@@ -320,7 +320,7 @@ vec4_tcs_visitor::nir_emit_intrinsic(nir_intrinsic_instr *instr)
} }
/** /**
* Return the number of patches to accumulate before an 8_PATCH mode thread is * Return the number of patches to accumulate before a MULTI_PATCH mode thread is
* launched. In cases with a large number of input control points and a large * launched. In cases with a large number of input control points and a large
* amount of VS outputs, the VS URB space needed to store an entire 8 patches * amount of VS outputs, the VS URB space needed to store an entire 8 patches
* worth of data can be prohibitive, so it can be beneficial to launch threads * worth of data can be prohibitive, so it can be beneficial to launch threads
@@ -394,8 +394,8 @@ brw_compile_tcs(const struct brw_compiler *compiler,
prog_data->patch_count_threshold = brw::get_patch_count_threshold(key->input_vertices); prog_data->patch_count_threshold = brw::get_patch_count_threshold(key->input_vertices);
if (compiler->use_tcs_8_patch) { if (compiler->use_tcs_multi_patch) {
vue_prog_data->dispatch_mode = DISPATCH_MODE_TCS_8_PATCH; vue_prog_data->dispatch_mode = DISPATCH_MODE_TCS_MULTI_PATCH;
prog_data->instances = nir->info.tess.tcs_vertices_out; prog_data->instances = nir->info.tess.tcs_vertices_out;
prog_data->include_primitive_id = has_primitive_id; prog_data->include_primitive_id = has_primitive_id;
} else { } else {