fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 22:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

iris: pin and re-pin the scratch BO

Browse source
This commit is contained in:
Kenneth Graunke 2018-12-12 01:41:39 -08:00
parent dd0d47a5d2
commit e169cb09c3
3 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/iris/iris_context.h
View file

@ -628,9 +628,9 @@ const struct shader_info *iris_get_shader_info(const struct iris_context *ice,
gl_shader_stage stage); gl_shader_stage stage);
unsigned iris_get_shader_num_ubos(const struct iris_context *ice, unsigned iris_get_shader_num_ubos(const struct iris_context *ice,
gl_shader_stage stage); gl_shader_stage stage);
uint32_t iris_get_scratch_space(struct iris_context *ice, struct iris_bo *iris_get_scratch_space(struct iris_context *ice,
unsigned per_thread_scratch, unsigned per_thread_scratch,
gl_shader_stage stage); gl_shader_stage stage);
/* iris_program_cache.c */ /* iris_program_cache.c */

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

@ -1481,10 +1481,8 @@ iris_fill_cs_push_const_buffer(struct brw_cs_prog_data *cs_prog_data,
/** /**
* Allocate scratch BOs as needed for the given per-thread size and stage. * Allocate scratch BOs as needed for the given per-thread size and stage.
*
* Returns the 32-bit "Scratch Space Base Pointer" value.
*/ */
uint32_t struct iris_bo *
iris_get_scratch_space(struct iris_context *ice, iris_get_scratch_space(struct iris_context *ice,
unsigned per_thread_scratch, unsigned per_thread_scratch,
gl_shader_stage stage) gl_shader_stage stage)
@ -1526,7 +1524,7 @@ iris_get_scratch_space(struct iris_context *ice,
*bop = iris_bo_alloc(bufmgr, "scratch", size, IRIS_MEMZONE_SHADER); *bop = iris_bo_alloc(bufmgr, "scratch", size, IRIS_MEMZONE_SHADER);
} }
return (*bop)->gtt_offset; return *bop;
} }
void void

31
src/gallium/drivers/iris/iris_state.c
View file

@ -3113,8 +3113,9 @@ KSP(const struct iris_compiled_shader *shader)
pkt.Enable = true; \ pkt.Enable = true; \
\ \
if (prog_data->total_scratch) { \ if (prog_data->total_scratch) { \
uint32_t scratch_addr = \ struct iris_bo *bo = \
iris_get_scratch_space(ice, prog_data->total_scratch, stage); \ iris_get_scratch_space(ice, prog_data->total_scratch, stage); \
uint32_t scratch_addr = bo->gtt_offset; \
pkt.PerThreadScratchSpace = ffs(prog_data->total_scratch) - 11; \ pkt.PerThreadScratchSpace = ffs(prog_data->total_scratch) - 11; \
pkt.ScratchSpaceBasePointer = rw_bo(NULL, scratch_addr); \ pkt.ScratchSpaceBasePointer = rw_bo(NULL, scratch_addr); \
} }
@ -3308,9 +3309,10 @@ iris_store_fs_state(struct iris_context *ice,
KSP(shader) + brw_wm_prog_data_prog_offset(wm_prog_data, ps, 2); KSP(shader) + brw_wm_prog_data_prog_offset(wm_prog_data, ps, 2);
if (prog_data->total_scratch) { if (prog_data->total_scratch) {
uint32_t scratch_addr = struct iris_bo *bo =
iris_get_scratch_space(ice, prog_data->total_scratch, iris_get_scratch_space(ice, prog_data->total_scratch,
MESA_SHADER_FRAGMENT); MESA_SHADER_FRAGMENT);
uint32_t scratch_addr = bo->gtt_offset;
ps.PerThreadScratchSpace = ffs(prog_data->total_scratch) - 11; ps.PerThreadScratchSpace = ffs(prog_data->total_scratch) - 11;
ps.ScratchSpaceBasePointer = rw_bo(NULL, scratch_addr); ps.ScratchSpaceBasePointer = rw_bo(NULL, scratch_addr);
} }
@ -3804,12 +3806,19 @@ iris_restore_render_saved_bos(struct iris_context *ice,
for (int stage = 0; stage <= MESA_SHADER_FRAGMENT; stage++) { for (int stage = 0; stage <= MESA_SHADER_FRAGMENT; stage++) {
if (clean & (IRIS_DIRTY_VS << stage)) { if (clean & (IRIS_DIRTY_VS << stage)) {
struct iris_compiled_shader *shader = ice->shaders.prog[stage]; struct iris_compiled_shader *shader = ice->shaders.prog[stage];
if (shader) { if (shader) {
struct iris_bo *bo = iris_resource_bo(shader->assembly.res); struct iris_bo *bo = iris_resource_bo(shader->assembly.res);
iris_use_pinned_bo(batch, bo, false); iris_use_pinned_bo(batch, bo, false);
}
// XXX: scratch buffer struct brw_stage_prog_data *prog_data = shader->prog_data;
if (prog_data->total_scratch > 0) {
struct iris_bo *bo =
iris_get_scratch_space(ice, prog_data->total_scratch, stage);
iris_use_pinned_bo(batch, bo, true);
}
}
} }
} }
@ -3886,12 +3895,19 @@ iris_restore_compute_saved_bos(struct iris_context *ice,
if (clean & IRIS_DIRTY_CS) { if (clean & IRIS_DIRTY_CS) {
struct iris_compiled_shader *shader = ice->shaders.prog[stage]; struct iris_compiled_shader *shader = ice->shaders.prog[stage];
if (shader) { if (shader) {
struct iris_bo *bo = iris_resource_bo(shader->assembly.res); struct iris_bo *bo = iris_resource_bo(shader->assembly.res);
iris_use_pinned_bo(batch, bo, false); iris_use_pinned_bo(batch, bo, false);
}
// XXX: scratch buffer struct brw_stage_prog_data *prog_data = shader->prog_data;
if (prog_data->total_scratch > 0) {
struct iris_bo *bo =
iris_get_scratch_space(ice, prog_data->total_scratch, stage);
iris_use_pinned_bo(batch, bo, true);
}
}
} }
} }
@ -4695,9 +4711,10 @@ iris_upload_compute_state(struct iris_context *ice,
iris_emit_cmd(batch, GENX(MEDIA_VFE_STATE), vfe) { iris_emit_cmd(batch, GENX(MEDIA_VFE_STATE), vfe) {
if (prog_data->total_scratch) { if (prog_data->total_scratch) {
uint32_t scratch_addr = struct iris_bo *bo =
iris_get_scratch_space(ice, prog_data->total_scratch, iris_get_scratch_space(ice, prog_data->total_scratch,
MESA_SHADER_COMPUTE); MESA_SHADER_COMPUTE);
uint32_t scratch_addr = bo->gtt_offset;
vfe.PerThreadScratchSpace = ffs(prog_data->total_scratch) - 11; vfe.PerThreadScratchSpace = ffs(prog_data->total_scratch) - 11;
vfe.ScratchSpaceBasePointer = rw_bo(NULL, scratch_addr); vfe.ScratchSpaceBasePointer = rw_bo(NULL, scratch_addr);
} }