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

glsl: Make all drivers take the GLSLOptimizeConservatively path.

Browse Source 
Now that all consumers of GLSL use NIR, make the remaining drivers take
the path that relies on NIR to really do optimization.

nouveau steam shader-db runtime -6.69631% +/- 1.29235% (n=12).
No change on shader-db there.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16364>
This commit is contained in:
Emma Anholt
2022-05-05 16:28:34 -07:00
committed by Marge Bot
parent d100c07c48
commit f3df3d4c80
23 changed files with 12 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/gallium/screen.rst
View File

@@ -412,9 +412,6 @@ The integer capabilities:
ARB_transform_feedback3.
* ``PIPE_CAP_SHADER_CAN_READ_OUTPUTS``: Whether every TGSI shader stage can read
from the output file.
* ``PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY``: Tell the GLSL compiler to use
the minimum amount of optimizations just to be able to do all the linking
and lowering.
* ``PIPE_CAP_FBFETCH``: The number of render targets whose value in the
current framebuffer can be read in the shader. 0 means framebuffer fetch
is not supported. 1 means that only the first render target can be read,

24
src/compiler/glsl/glsl_parser_extras.cpp
View File

@@ -2109,18 +2109,12 @@ opt_shader_and_create_symbol_table(const struct gl_constants *consts,
&consts->ShaderCompilerOptions[shader->Stage];
/* Do some optimization at compile time to reduce shader IR size
* and reduce later work if the same shader is linked multiple times
* and reduce later work if the same shader is linked multiple times.
*
* Run it just once, since NIR will do the real optimization.
*/
if (consts->GLSLOptimizeConservatively) {
/* Run it just once. */
do_common_optimization(shader->ir, false, false, options,
consts->NativeIntegers);
} else {
/* Repeat it until it stops making changes. */
while (do_common_optimization(shader->ir, false, false, options,
consts->NativeIntegers))
;
}
do_common_optimization(shader->ir, false, false, options,
consts->NativeIntegers);
validate_ir_tree(shader->ir);
@@ -2470,12 +2464,8 @@ do_common_optimization(exec_list *ir, bool linked,
delete ls;
}
/* If the PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY cap is set, this pass will
* only be called once rather than repeatedly until no further progress is
* made.
*
* If an optimization pass fails to preserve the invariant flag, calling
* the pass only once may result in incorrect code generation. Always call
/* If an optimization pass fails to preserve the invariant flag, calling
* the pass only once earlier may result in incorrect code generation. Always call
* propagate_invariance() last to avoid this possibility.
*/
OPT(propagate_invariance, ir);

16
src/compiler/glsl/linker.cpp
View File

@@ -4188,18 +4188,10 @@ static void
linker_optimisation_loop(const struct gl_constants *consts, exec_list *ir,
unsigned stage)
{
if (consts->GLSLOptimizeConservatively) {
/* Run it just once. */
do_common_optimization(ir, true, false,
&consts->ShaderCompilerOptions[stage],
consts->NativeIntegers);
} else {
/* Repeat it until it stops making changes. */
while (do_common_optimization(ir, true, false,
&consts->ShaderCompilerOptions[stage],
consts->NativeIntegers))
;
}
/* Run it just once, since NIR will do the real optimizaiton. */
do_common_optimization(ir, true, false,
&consts->ShaderCompilerOptions[stage],
consts->NativeIntegers);
}
void

2
src/compiler/glsl/tests/lower_precision_test.py
View File

@@ -1268,7 +1268,7 @@ TESTS = [
color2 = y + 1;
}
""",
r'assign \(x\) \(var_ref x\) \(expression float f162f'),
r'assign \(x\) \(var_ref x@2\) \(expression float f162f'),
Test("ldexp",
"""
#version 310 es

1
src/gallium/auxiliary/util/u_screen.c
View File

@@ -294,7 +294,6 @@ u_pipe_screen_get_param_defaults(struct pipe_screen *pscreen,
case PIPE_CAP_RASTERIZER_SUBPIXEL_BITS:
return 4; /* GLES 2.0 minimum value */
case PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY:
case PIPE_CAP_PREFER_BACK_BUFFER_REUSE:
return 1;

3
src/gallium/drivers/d3d12/d3d12_screen.cpp
View File

@@ -254,9 +254,6 @@ d3d12_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
case PIPE_CAP_PCI_FUNCTION:
return 0; /* TODO: figure these out */
case PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY:
return 0; /* not sure */
case PIPE_CAP_FLATSHADE:
case PIPE_CAP_ALPHA_TEST:
case PIPE_CAP_TWO_SIDED_COLOR:

1
src/gallium/drivers/etnaviv/etnaviv_screen.c
View File

@@ -185,7 +185,6 @@ etna_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
/* Unsupported features. */
case PIPE_CAP_TEXTURE_BUFFER_OFFSET_ALIGNMENT:
case PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY:
case PIPE_CAP_ALLOW_MAPPED_BUFFERS_DURING_EXECUTION:
case PIPE_CAP_TEXRECT:
return 0;

1
src/gallium/drivers/freedreno/freedreno_screen.c
View File

@@ -408,7 +408,6 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
return 64 * 1024 * 1024;
case PIPE_CAP_SHAREABLE_SHADERS:
case PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY:
if (is_ir3(screen))
return 1;
return 0;

1
src/gallium/drivers/i915/i915_screen.c
View File

@@ -410,7 +410,6 @@ i915_get_param(struct pipe_screen *screen, enum pipe_cap cap)
case PIPE_CAP_PCI_FUNCTION:
return 0;
case PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY:
case PIPE_CAP_ALLOW_MAPPED_BUFFERS_DURING_EXECUTION:
return 0;

1
src/gallium/drivers/llvmpipe/lp_screen.c
View File

@@ -329,7 +329,6 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
case PIPE_CAP_PCI_BUS:
case PIPE_CAP_PCI_DEVICE:
case PIPE_CAP_PCI_FUNCTION:
case PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY:
case PIPE_CAP_ALLOW_MAPPED_BUFFERS_DURING_EXECUTION:
return 0;

1
src/gallium/drivers/nouveau/nv30/nv30_screen.c
View File

@@ -218,7 +218,6 @@ nv30_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
case PIPE_CAP_SHADER_ARRAY_COMPONENTS:
case PIPE_CAP_SHADER_CAN_READ_OUTPUTS:
case PIPE_CAP_NATIVE_FENCE_FD:
case PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY:
case PIPE_CAP_FBFETCH:
case PIPE_CAP_TGSI_MUL_ZERO_WINS:
case PIPE_CAP_DOUBLES:

1
src/gallium/drivers/nouveau/nv50/nv50_screen.c
View File

@@ -338,7 +338,6 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS:
case PIPE_CAP_SHADER_CAN_READ_OUTPUTS:
case PIPE_CAP_NATIVE_FENCE_FD:
case PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY:
case PIPE_CAP_FBFETCH:
case PIPE_CAP_DOUBLES:
case PIPE_CAP_INT64:

1
src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
View File

@@ -384,7 +384,6 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
case PIPE_CAP_PCI_FUNCTION:
case PIPE_CAP_SHADER_CAN_READ_OUTPUTS:
case PIPE_CAP_NATIVE_FENCE_FD:
case PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY:
case PIPE_CAP_SPARSE_BUFFER_PAGE_SIZE:
case PIPE_CAP_NIR_SAMPLERS_AS_DEREF:
case PIPE_CAP_MEMOBJ:

2
src/gallium/drivers/r300/r300_screen.c
View File

@@ -176,8 +176,6 @@ static int r300_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
case PIPE_CAP_VERTEX_SHADER_SATURATE:
return is_r500 ? 1 : 0;
case PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY:
return 0;
case PIPE_CAP_SHAREABLE_SHADERS:
return 0;

3
src/gallium/drivers/r600/r600_pipe.c
View File

@@ -411,9 +411,6 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
case PIPE_CAP_MAX_COMBINED_SHADER_BUFFERS:
return 8;
case PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY:
return 0;
case PIPE_CAP_INT64:
case PIPE_CAP_DOUBLES:
if (rscreen->b.family == CHIP_ARUBA ||

1
src/gallium/drivers/radeonsi/si_get.c
View File

@@ -128,7 +128,6 @@ static int si_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
case PIPE_CAP_CULL_DISTANCE:
case PIPE_CAP_SHADER_ARRAY_COMPONENTS:
case PIPE_CAP_SHADER_CAN_READ_OUTPUTS:
case PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY:
case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME:
case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS:
case PIPE_CAP_DOUBLES:

1
src/gallium/drivers/svga/svga_screen.c
View File

@@ -450,7 +450,6 @@ svga_get_param(struct pipe_screen *screen, enum pipe_cap param)
case PIPE_CAP_DOUBLES:
return sws->have_sm5;
case PIPE_CAP_UMA:
case PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY:
case PIPE_CAP_ALLOW_MAPPED_BUFFERS_DURING_EXECUTION:
return 0;
case PIPE_CAP_TGSI_DIV:

1
src/gallium/drivers/virgl/virgl_screen.c
View File

@@ -315,7 +315,6 @@ virgl_get_param(struct pipe_screen *screen, enum pipe_cap param)
case PIPE_CAP_PCI_BUS:
case PIPE_CAP_PCI_DEVICE:
case PIPE_CAP_PCI_FUNCTION:
case PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY:
case PIPE_CAP_ALLOW_MAPPED_BUFFERS_DURING_EXECUTION:
return 0;
case PIPE_CAP_CLEAR_TEXTURE:

3
src/gallium/drivers/zink/zink_screen.c
View File

@@ -684,9 +684,6 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
case PIPE_CAP_VIEWPORT_SUBPIXEL_BITS:
return screen->info.props.limits.viewportSubPixelBits;
case PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY:
return 0; /* not sure */
case PIPE_CAP_MAX_GS_INVOCATIONS:
return screen->info.props.limits.maxGeometryShaderInvocations;

1
src/gallium/include/pipe/p_defines.h
View File

@@ -888,7 +888,6 @@ enum pipe_cap
PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS,
PIPE_CAP_SHADER_CAN_READ_OUTPUTS,
PIPE_CAP_NATIVE_FENCE_FD,
PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY,
PIPE_CAP_GLSL_TESS_LEVELS_AS_INPUTS,
PIPE_CAP_FBFETCH,
PIPE_CAP_TGSI_MUL_ZERO_WINS,

7
src/mesa/main/consts_exts.h
View File

@@ -765,13 +765,6 @@ struct gl_constants
bool GLSLPointCoordIsSysVal;
bool GLSLFrontFacingIsSysVal;
/**
* Run the minimum amount of GLSL optimizations to be able to link
* shaders optimally (eliminate dead varyings and uniforms) and just do
* all the necessary lowering.
*/
bool GLSLOptimizeConservatively;
/**
* Whether to call lower_const_arrays_to_uniforms() during linking.
*/

10
src/mesa/main/ff_fragment_shader.cpp
View File

@@ -1093,16 +1093,6 @@ create_new_program(struct gl_context *ctx, struct state_key *key)
validate_ir_tree(p.shader->ir);
const struct gl_shader_compiler_options *options =
&ctx->Const.ShaderCompilerOptions[MESA_SHADER_FRAGMENT];
/* Conservative approach: Don't optimize here, the linker does it too. */
if (!ctx->Const.GLSLOptimizeConservatively) {
while (do_common_optimization(p.shader->ir, false, false, options,
ctx->Const.NativeIntegers))
;
}
reparent_ir(p.shader->ir, p.shader->ir);
p.shader->CompileStatus = COMPILE_SUCCESS;

2
src/mesa/state_tracker/st_extensions.c
View File

@@ -387,8 +387,6 @@ void st_init_limits(struct pipe_screen *screen,
c->Program[MESA_SHADER_GEOMETRY].MaxUniformComponents +
c->Program[MESA_SHADER_FRAGMENT].MaxUniformComponents;
c->GLSLOptimizeConservatively =
screen->get_param(screen, PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY);
c->GLSLLowerConstArrays =
screen->get_param(screen, PIPE_CAP_PREFER_IMM_ARRAYS_AS_CONSTBUF);
c->GLSLTessLevelsAsInputs =