diff options
| author | Marek Olšák <[email protected]> | 2018-08-15 21:29:31 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-05-16 13:06:49 -0400 |
| commit | c44c6951d46a8e19c8764711d4c3d7a331822c9f (patch) | |
| tree | 16ac79bebb8f9409ca937e18535c3b541511639a | |
| parent | c7ceeea0937f1844d080fce347aec393b8a13a85 (diff) | |
radeonsi: extract COMPUTE_RESOURCE_LIMITS code into a helper
Tested-by: Dieter Nützel <[email protected]>
Acked-by: Nicolai Hähnle <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_compute.c | 32 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.h | 3 |
2 files changed, 23 insertions, 12 deletions
diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index 46a0ba76ed5..cf9c0601fc9 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -753,18 +753,14 @@ static void si_setup_tgsi_user_data(struct si_context *sctx, } } -static void si_emit_dispatch_packets(struct si_context *sctx, - const struct pipe_grid_info *info) +unsigned si_get_compute_resource_limits(struct si_screen *sscreen, + unsigned waves_per_threadgroup, + unsigned max_waves_per_sh) { - struct si_screen *sscreen = sctx->screen; - struct radeon_cmdbuf *cs = sctx->gfx_cs; - bool render_cond_bit = sctx->render_cond && !sctx->render_cond_force_off; - unsigned waves_per_threadgroup = - DIV_ROUND_UP(info->block[0] * info->block[1] * info->block[2], 64); unsigned compute_resource_limits = S_00B854_SIMD_DEST_CNTL(waves_per_threadgroup % 4 == 0); - if (sctx->chip_class >= GFX7) { + if (sscreen->info.chip_class >= GFX7) { unsigned num_cu_per_se = sscreen->info.num_good_compute_units / sscreen->info.max_se; @@ -775,17 +771,29 @@ static void si_emit_dispatch_packets(struct si_context *sctx, if (num_cu_per_se % 4 && waves_per_threadgroup == 1) compute_resource_limits |= S_00B854_FORCE_SIMD_DIST(1); - compute_resource_limits |= S_00B854_WAVES_PER_SH(sctx->cs_max_waves_per_sh); + compute_resource_limits |= S_00B854_WAVES_PER_SH(max_waves_per_sh); } else { /* GFX6 */ - if (sctx->cs_max_waves_per_sh) { - unsigned limit_div16 = DIV_ROUND_UP(sctx->cs_max_waves_per_sh, 16); + if (max_waves_per_sh) { + unsigned limit_div16 = DIV_ROUND_UP(max_waves_per_sh, 16); compute_resource_limits |= S_00B854_WAVES_PER_SH_SI(limit_div16); } } + return compute_resource_limits; +} + +static void si_emit_dispatch_packets(struct si_context *sctx, + const struct pipe_grid_info *info) +{ + struct si_screen *sscreen = sctx->screen; + struct radeon_cmdbuf *cs = sctx->gfx_cs; + bool render_cond_bit = sctx->render_cond && !sctx->render_cond_force_off; + unsigned waves_per_threadgroup = + DIV_ROUND_UP(info->block[0] * info->block[1] * info->block[2], 64); radeon_set_sh_reg(cs, R_00B854_COMPUTE_RESOURCE_LIMITS, - compute_resource_limits); + si_get_compute_resource_limits(sscreen, waves_per_threadgroup, + sctx->cs_max_waves_per_sh)); unsigned dispatch_initiator = S_00B800_COMPUTE_SHADER_EN(1) | diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index 1c98f41b5f3..be7ca4d5f5c 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -1304,6 +1304,9 @@ unsigned si_end_counter(struct si_screen *sscreen, unsigned type, uint64_t begin); /* si_compute.c */ +unsigned si_get_compute_resource_limits(struct si_screen *sscreen, + unsigned waves_per_threadgroup, + unsigned max_waves_per_sh); void si_init_compute_functions(struct si_context *sctx); /* si_perfcounters.c */ |