fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-02 05:10:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

st,i965: Stop looping on 64-bit lowering

Browse source 
Now that the 64-bit lowering passes do a complete lowering in one go, we
don't need to loop anymore.  We do, however, have to ensure that int64
lowering happens after double lowering because double lowering can
produce int64 ops.

Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Jason Ekstrand 2019-07-11 16:59:31 -05:00
parent 548da20b22
commit 110669c85c
3 changed files with 13 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/intel/compiler/brw_compiler.c
View file

@ -133,7 +133,9 @@ brw_compiler_create(void *mem_ctx, const struct gen_device_info *devinfo)
nir_lower_dceil |
nir_lower_dfract |
nir_lower_dround_even |
nir_lower_dmod;
nir_lower_dmod |
nir_lower_dsub |
nir_lower_ddiv;
if (!devinfo->has_64bit_types || (INTEL_DEBUG & DEBUG_SOFT64)) {
int64_options |= nir_lower_mov64 |

14
src/intel/compiler/brw_nir.c
View file

@ -681,18 +681,8 @@ brw_preprocess_nir(const struct brw_compiler *compiler, nir_shader *nir,
brw_nir_optimize(nir, compiler, is_scalar, true);
bool lowered_64bit_ops = false;
do {
progress = false;
OPT(nir_lower_int64, nir->options->lower_int64_options);
OPT(nir_lower_doubles, softfp64, nir->options->lower_doubles_options);
/* Necessary to lower add -> sub and div -> mul/rcp */
OPT(nir_opt_algebraic);
lowered_64bit_ops |= progress;
} while (progress);
OPT(nir_lower_doubles, softfp64, nir->options->lower_doubles_options);
OPT(nir_lower_int64, nir->options->lower_int64_options);
/* This needs to be run after the first optimization pass but before we
* lower indirect derefs away

25
src/mesa/state_tracker/st_glsl_to_nir.cpp
View file

@ -367,23 +367,14 @@ st_glsl_to_nir(struct st_context *st, struct gl_program *prog,
if (lower_64bit) {
bool lowered_64bit_ops = false;
bool progress = false;
NIR_PASS_V(nir, nir_opt_algebraic);
do {
progress = false;
if (options->lower_int64_options) {
NIR_PASS(progress, nir, nir_lower_int64,
options->lower_int64_options);
}
if (options->lower_doubles_options) {
NIR_PASS(progress, nir, nir_lower_doubles,
st->ctx->SoftFP64, options->lower_doubles_options);
}
NIR_PASS(progress, nir, nir_opt_algebraic);
lowered_64bit_ops |= progress;
} while (progress);
if (options->lower_doubles_options) {
NIR_PASS(lowered_64bit_ops, nir, nir_lower_doubles,
st->ctx->SoftFP64, options->lower_doubles_options);
}
if (options->lower_int64_options) {
NIR_PASS(lowered_64bit_ops, nir, nir_lower_int64,
options->lower_int64_options);
}
if (lowered_64bit_ops)
st_nir_opts(nir, is_scalar);