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

r600/nir: clone shader before first query to shader key

Browse Source 
Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8563>
This commit is contained in:
Gert Wollny
2021-01-19 21:04:00 +01:00
committed by Marge Bot
parent 6d587f754c
commit 4f88668f4a
1 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/gallium/drivers/r600/sfn/sfn_nir.cpp
View File

@@ -993,49 +993,50 @@ int r600_shader_from_nir(struct r600_context *rctx,
NIR_PASS_V(sel->nir, r600_lower_fs_out_to_vector); NIR_PASS_V(sel->nir, r600_lower_fs_out_to_vector);
} }
if (sel->nir->info.stage == MESA_SHADER_TESS_CTRL || auto sh = nir_shader_clone(sel->nir, sel->nir);
sel->nir->info.stage == MESA_SHADER_TESS_EVAL ||
(sel->nir->info.stage == MESA_SHADER_VERTEX && key->vs.as_ls)) { if (sh->info.stage == MESA_SHADER_TESS_CTRL ||
auto prim_type = sel->nir->info.stage == MESA_SHADER_TESS_EVAL ? sh->info.stage == MESA_SHADER_TESS_EVAL ||
sel->nir->info.tess.primitive_mode: key->tcs.prim_mode; (sh->info.stage == MESA_SHADER_VERTEX && key->vs.as_ls)) {
NIR_PASS_V(sel->nir, r600_lower_tess_io, static_cast<pipe_prim_type>(prim_type)); auto prim_type = sh->info.stage == MESA_SHADER_TESS_EVAL ?
sh->info.tess.primitive_mode: key->tcs.prim_mode;
NIR_PASS_V(sh, r600_lower_tess_io, static_cast<pipe_prim_type>(prim_type));
} }
if (sel->nir->info.stage == MESA_SHADER_TESS_CTRL) if (sh->info.stage == MESA_SHADER_TESS_CTRL)
NIR_PASS_V(sel->nir, r600_append_tcs_TF_emission, NIR_PASS_V(sh, r600_append_tcs_TF_emission,
(pipe_prim_type)key->tcs.prim_mode); (pipe_prim_type)key->tcs.prim_mode);
NIR_PASS_V(sel->nir, nir_lower_ubo_vec4); NIR_PASS_V(sh, nir_lower_ubo_vec4);
if (lower_64bit) if (lower_64bit)
NIR_PASS_V(sel->nir, r600::r600_nir_64_to_vec2); NIR_PASS_V(sh, r600::r600_nir_64_to_vec2);
/* Lower to scalar to let some optimization work out better */ /* Lower to scalar to let some optimization work out better */
while(optimize_once(sel->nir, false)); while(optimize_once(sh, false));
NIR_PASS_V(sel->nir, r600::r600_merge_vec2_stores); NIR_PASS_V(sh, r600::r600_merge_vec2_stores);
NIR_PASS_V(sel->nir, nir_remove_dead_variables, nir_var_shader_in, NULL); NIR_PASS_V(sh, nir_remove_dead_variables, nir_var_shader_in, NULL);
NIR_PASS_V(sel->nir, nir_remove_dead_variables, nir_var_shader_out, NULL); NIR_PASS_V(sh, nir_remove_dead_variables, nir_var_shader_out, NULL);
NIR_PASS_V(sel->nir, nir_lower_vars_to_scratch, NIR_PASS_V(sh, nir_lower_vars_to_scratch,
nir_var_function_temp, nir_var_function_temp,
40, 40,
r600_get_natural_size_align_bytes); r600_get_natural_size_align_bytes);
while (optimize_once(sel->nir, true)); while (optimize_once(sh, true));
auto sh = nir_shader_clone(sel->nir, sel->nir); NIR_PASS_V(sh, nir_lower_bool_to_int32);
NIR_PASS_V(sel->nir, nir_lower_bool_to_int32);
NIR_PASS_V(sh, nir_opt_algebraic_late); NIR_PASS_V(sh, nir_opt_algebraic_late);
if (sel->nir->info.stage == MESA_SHADER_FRAGMENT) if (sh->info.stage == MESA_SHADER_FRAGMENT)
r600::sort_fsoutput(sh); r600::sort_fsoutput(sh);
NIR_PASS_V(sh, nir_lower_locals_to_regs); NIR_PASS_V(sh, nir_lower_locals_to_regs);
//NIR_PASS_V(sel->nir, nir_opt_algebraic); //NIR_PASS_V(sh, nir_opt_algebraic);
//NIR_PASS_V(sel->nir, nir_copy_prop); //NIR_PASS_V(sh, nir_copy_prop);
NIR_PASS_V(sh, nir_lower_to_source_mods, NIR_PASS_V(sh, nir_lower_to_source_mods,
(nir_lower_to_source_mods_flags)(nir_lower_float_source_mods | (nir_lower_to_source_mods_flags)(nir_lower_float_source_mods |
nir_lower_64bit_source_mods)); nir_lower_64bit_source_mods));
@@ -1052,16 +1053,16 @@ int r600_shader_from_nir(struct r600_context *rctx,
} }
memset(&pipeshader->shader, 0, sizeof(r600_shader)); memset(&pipeshader->shader, 0, sizeof(r600_shader));
pipeshader->scratch_space_needed = sel->nir->scratch_size; pipeshader->scratch_space_needed = sh->scratch_size;
if (sel->nir->info.stage == MESA_SHADER_TESS_EVAL || if (sh->info.stage == MESA_SHADER_TESS_EVAL ||
sel->nir->info.stage == MESA_SHADER_VERTEX || sh->info.stage == MESA_SHADER_VERTEX ||
sel->nir->info.stage == MESA_SHADER_GEOMETRY) { sh->info.stage == MESA_SHADER_GEOMETRY) {
pipeshader->shader.clip_dist_write |= ((1 << sel->nir->info.clip_distance_array_size) - 1); pipeshader->shader.clip_dist_write |= ((1 << sh->info.clip_distance_array_size) - 1);
pipeshader->shader.cull_dist_write = ((1 << sel->nir->info.cull_distance_array_size) - 1) pipeshader->shader.cull_dist_write = ((1 << sh->info.cull_distance_array_size) - 1)
<< sel->nir->info.clip_distance_array_size; << sh->info.clip_distance_array_size;
pipeshader->shader.cc_dist_mask = (1 << (sel->nir->info.cull_distance_array_size + pipeshader->shader.cc_dist_mask = (1 << (sh->info.cull_distance_array_size +
sel->nir->info.clip_distance_array_size)) - 1; sh->info.clip_distance_array_size)) - 1;
} }
struct r600_shader* gs_shader = nullptr; struct r600_shader* gs_shader = nullptr;
@@ -1073,13 +1074,13 @@ int r600_shader_from_nir(struct r600_context *rctx,
if (!r || rctx->screen->b.debug_flags & DBG_ALL_SHADERS) { if (!r || rctx->screen->b.debug_flags & DBG_ALL_SHADERS) {
static int shnr = 0; static int shnr = 0;
snprintf(filename, 4000, "nir-%s_%d.inc", sel->nir->info.name, shnr++); snprintf(filename, 4000, "nir-%s_%d.inc", sh->info.name, shnr++);
if (access(filename, F_OK) == -1) { if (access(filename, F_OK) == -1) {
FILE *f = fopen(filename, "w"); FILE *f = fopen(filename, "w");
if (f) { if (f) {
fprintf(f, "const char *shader_blob_%s = {\nR\"(", sel->nir->info.name); fprintf(f, "const char *shader_blob_%s = {\nR\"(", sh->info.name);
nir_print_shader(sh, f); nir_print_shader(sh, f);
fprintf(f, ")\";\n"); fprintf(f, ")\";\n");
fclose(f); fclose(f);
@@ -1107,7 +1108,7 @@ int r600_shader_from_nir(struct r600_context *rctx,
return -1; return -1;
} }
if (sel->nir->info.stage == MESA_SHADER_GEOMETRY) { if (sh->info.stage == MESA_SHADER_GEOMETRY) {
r600::sfn_log << r600::SfnLog::shader_info << "Geometry shader, create copy shader\n"; r600::sfn_log << r600::SfnLog::shader_info << "Geometry shader, create copy shader\n";
generate_gs_copy_shader(rctx, pipeshader, &sel->so); generate_gs_copy_shader(rctx, pipeshader, &sel->so);
assert(pipeshader->gs_copy_shader); assert(pipeshader->gs_copy_shader);