diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/iris/iris_context.h | 29 | ||||
| -rw-r--r-- | src/gallium/drivers/iris/iris_pipe_control.c | 132 | ||||
| -rw-r--r-- | src/gallium/drivers/iris/iris_resolve.c | 164 | ||||
| -rw-r--r-- | src/gallium/drivers/iris/meson.build | 1 |
4 files changed, 182 insertions, 144 deletions
diff --git a/src/gallium/drivers/iris/iris_context.h b/src/gallium/drivers/iris/iris_context.h index 8567b81e65d..d540d3934ef 100644 --- a/src/gallium/drivers/iris/iris_context.h +++ b/src/gallium/drivers/iris/iris_context.h @@ -431,19 +431,6 @@ void iris_emit_pipe_control_write(struct iris_batch *batch, uint32_t flags, void iris_emit_end_of_pipe_sync(struct iris_batch *batch, uint32_t flags); -void iris_cache_sets_clear(struct iris_batch *batch); -void iris_cache_flush_for_read(struct iris_batch *batch, struct iris_bo *bo); -void iris_cache_flush_for_render(struct iris_batch *batch, - struct iris_bo *bo, - enum isl_format format, - enum isl_aux_usage aux_usage); -void iris_render_cache_add_bo(struct iris_batch *batch, - struct iris_bo *bo, - enum isl_format format, - enum isl_aux_usage aux_usage); -void iris_cache_flush_for_depth(struct iris_batch *batch, struct iris_bo *bo); -void iris_depth_cache_add_bo(struct iris_batch *batch, struct iris_bo *bo); - void iris_init_flush_functions(struct pipe_context *ctx); /* iris_blorp.c */ @@ -499,4 +486,20 @@ bool iris_blorp_upload_shader(struct blorp_batch *blorp_batch, uint32_t *kernel_out, void *prog_data_out); +/* iris_resolve.c */ + +void iris_cache_sets_clear(struct iris_batch *batch); +void iris_flush_depth_and_render_caches(struct iris_batch *batch); +void iris_cache_flush_for_read(struct iris_batch *batch, struct iris_bo *bo); +void iris_cache_flush_for_render(struct iris_batch *batch, + struct iris_bo *bo, + enum isl_format format, + enum isl_aux_usage aux_usage); +void iris_render_cache_add_bo(struct iris_batch *batch, + struct iris_bo *bo, + enum isl_format format, + enum isl_aux_usage aux_usage); +void iris_cache_flush_for_depth(struct iris_batch *batch, struct iris_bo *bo); +void iris_depth_cache_add_bo(struct iris_batch *batch, struct iris_bo *bo); + #endif diff --git a/src/gallium/drivers/iris/iris_pipe_control.c b/src/gallium/drivers/iris/iris_pipe_control.c index bf640a05420..71b4afea0e1 100644 --- a/src/gallium/drivers/iris/iris_pipe_control.c +++ b/src/gallium/drivers/iris/iris_pipe_control.c @@ -42,11 +42,6 @@ * PIPE_CONTROL_* bits), and it will take care of splitting it into multiple * PIPE_CONTROL commands as necessary. The per-generation workarounds are * applied in iris_emit_raw_pipe_control() in iris_state.c. - * - * This file also contains our cache tracking helpers. We have sets for - * the render cache, depth cache, and so on. If a BO is in the set, then - * it may have data in that cache. These take care of emitting flushes for - * render-to-texture, format reinterpretation issues, and other situations. */ #include "iris_context.h" @@ -150,131 +145,6 @@ iris_emit_end_of_pipe_sync(struct iris_batch *batch, uint32_t flags) batch->screen->workaround_bo, 0, 0); } -void -iris_cache_sets_clear(struct iris_batch *batch) -{ - struct hash_entry *render_entry; - hash_table_foreach(batch->cache.render, render_entry) - _mesa_hash_table_remove(batch->cache.render, render_entry); - - struct set_entry *depth_entry; - set_foreach(batch->cache.depth, depth_entry) - _mesa_set_remove(batch->cache.depth, depth_entry); -} - -/** - * Emits an appropriate flush for a BO if it has been rendered to within the - * same batchbuffer as a read that's about to be emitted. - * - * The GPU has separate, incoherent caches for the render cache and the - * sampler cache, along with other caches. Usually data in the different - * caches don't interact (e.g. we don't render to our driver-generated - * immediate constant data), but for render-to-texture in FBOs we definitely - * do. When a batchbuffer is flushed, the kernel will ensure that everything - * necessary is flushed before another use of that BO, but for reuse from - * different caches within a batchbuffer, it's all our responsibility. - */ -static void -flush_depth_and_render_caches(struct iris_batch *batch) -{ - iris_emit_pipe_control_flush(batch, - PIPE_CONTROL_DEPTH_CACHE_FLUSH | - PIPE_CONTROL_RENDER_TARGET_FLUSH | - PIPE_CONTROL_CS_STALL); - - iris_emit_pipe_control_flush(batch, - PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE | - PIPE_CONTROL_CONST_CACHE_INVALIDATE); - - iris_cache_sets_clear(batch); -} - -void -iris_cache_flush_for_read(struct iris_batch *batch, - struct iris_bo *bo) -{ - if (_mesa_hash_table_search(batch->cache.render, bo) || - _mesa_set_search(batch->cache.depth, bo)) - flush_depth_and_render_caches(batch); -} - -static void * -format_aux_tuple(enum isl_format format, enum isl_aux_usage aux_usage) -{ - return (void *)(uintptr_t)((uint32_t)format << 8 | aux_usage); -} - -void -iris_cache_flush_for_render(struct iris_batch *batch, - struct iris_bo *bo, - enum isl_format format, - enum isl_aux_usage aux_usage) -{ - if (_mesa_set_search(batch->cache.depth, bo)) - flush_depth_and_render_caches(batch); - - /* Check to see if this bo has been used by a previous rendering operation - * but with a different format or aux usage. If it has, flush the render - * cache so we ensure that it's only in there with one format or aux usage - * at a time. - * - * Even though it's not obvious, this can easily happen in practice. - * Suppose a client is blending on a surface with sRGB encode enabled on - * gen9. This implies that you get AUX_USAGE_CCS_D at best. If the client - * then disables sRGB decode and continues blending we will flip on - * AUX_USAGE_CCS_E without doing any sort of resolve in-between (this is - * perfectly valid since CCS_E is a subset of CCS_D). However, this means - * that we have fragments in-flight which are rendering with UNORM+CCS_E - * and other fragments in-flight with SRGB+CCS_D on the same surface at the - * same time and the pixel scoreboard and color blender are trying to sort - * it all out. This ends badly (i.e. GPU hangs). - * - * To date, we have never observed GPU hangs or even corruption to be - * associated with switching the format, only the aux usage. However, - * there are comments in various docs which indicate that the render cache - * isn't 100% resilient to format changes. We may as well be conservative - * and flush on format changes too. We can always relax this later if we - * find it to be a performance problem. - */ - struct hash_entry *entry = _mesa_hash_table_search(batch->cache.render, bo); - if (entry && entry->data != format_aux_tuple(format, aux_usage)) - flush_depth_and_render_caches(batch); -} - -void -iris_render_cache_add_bo(struct iris_batch *batch, - struct iris_bo *bo, - enum isl_format format, - enum isl_aux_usage aux_usage) -{ -#ifndef NDEBUG - struct hash_entry *entry = _mesa_hash_table_search(batch->cache.render, bo); - if (entry) { - /* Otherwise, someone didn't do a flush_for_render and that would be - * very bad indeed. - */ - assert(entry->data == format_aux_tuple(format, aux_usage)); - } -#endif - - _mesa_hash_table_insert(batch->cache.render, bo, - format_aux_tuple(format, aux_usage)); -} - -void -iris_cache_flush_for_depth(struct iris_batch *batch, - struct iris_bo *bo) -{ - if (_mesa_hash_table_search(batch->cache.render, bo)) - flush_depth_and_render_caches(batch); -} - -void -iris_depth_cache_add_bo(struct iris_batch *batch, struct iris_bo *bo) -{ - _mesa_set_add(batch->cache.depth, bo); -} - static void iris_texture_barrier(struct pipe_context *ctx, unsigned flags) { @@ -282,7 +152,7 @@ iris_texture_barrier(struct pipe_context *ctx, unsigned flags) // XXX: compute batch? - flush_depth_and_render_caches(&ice->render_batch); + iris_flush_depth_and_render_caches(&ice->render_batch); } static void diff --git a/src/gallium/drivers/iris/iris_resolve.c b/src/gallium/drivers/iris/iris_resolve.c new file mode 100644 index 00000000000..380456ed9c9 --- /dev/null +++ b/src/gallium/drivers/iris/iris_resolve.c @@ -0,0 +1,164 @@ +/* + * Copyright © 2017 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +/** + * @file iris_resolve.c + * + * This file handles resolve tracking for main and auxiliary surfaces. + * + * It also handles our cache tracking. We have sets for the render cache, + * depth cache, and so on. If a BO is in a cache's set, then it may have + * data in that cache. The helpers take care of emitting flushes for + * render-to-texture, format reinterpretation issues, and other situations. + */ + +#include "iris_context.h" +#include "util/hash_table.h" +#include "util/set.h" + +/** + * Clear the cache-tracking sets. + */ +void +iris_cache_sets_clear(struct iris_batch *batch) +{ + struct hash_entry *render_entry; + hash_table_foreach(batch->cache.render, render_entry) + _mesa_hash_table_remove(batch->cache.render, render_entry); + + struct set_entry *depth_entry; + set_foreach(batch->cache.depth, depth_entry) + _mesa_set_remove(batch->cache.depth, depth_entry); +} + +/** + * Emits an appropriate flush for a BO if it has been rendered to within the + * same batchbuffer as a read that's about to be emitted. + * + * The GPU has separate, incoherent caches for the render cache and the + * sampler cache, along with other caches. Usually data in the different + * caches don't interact (e.g. we don't render to our driver-generated + * immediate constant data), but for render-to-texture in FBOs we definitely + * do. When a batchbuffer is flushed, the kernel will ensure that everything + * necessary is flushed before another use of that BO, but for reuse from + * different caches within a batchbuffer, it's all our responsibility. + */ +void +iris_flush_depth_and_render_caches(struct iris_batch *batch) +{ + iris_emit_pipe_control_flush(batch, + PIPE_CONTROL_DEPTH_CACHE_FLUSH | + PIPE_CONTROL_RENDER_TARGET_FLUSH | + PIPE_CONTROL_CS_STALL); + + iris_emit_pipe_control_flush(batch, + PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE | + PIPE_CONTROL_CONST_CACHE_INVALIDATE); + + iris_cache_sets_clear(batch); +} + +void +iris_cache_flush_for_read(struct iris_batch *batch, + struct iris_bo *bo) +{ + if (_mesa_hash_table_search(batch->cache.render, bo) || + _mesa_set_search(batch->cache.depth, bo)) + iris_flush_depth_and_render_caches(batch); +} + +static void * +format_aux_tuple(enum isl_format format, enum isl_aux_usage aux_usage) +{ + return (void *)(uintptr_t)((uint32_t)format << 8 | aux_usage); +} + +void +iris_cache_flush_for_render(struct iris_batch *batch, + struct iris_bo *bo, + enum isl_format format, + enum isl_aux_usage aux_usage) +{ + if (_mesa_set_search(batch->cache.depth, bo)) + iris_flush_depth_and_render_caches(batch); + + /* Check to see if this bo has been used by a previous rendering operation + * but with a different format or aux usage. If it has, flush the render + * cache so we ensure that it's only in there with one format or aux usage + * at a time. + * + * Even though it's not obvious, this can easily happen in practice. + * Suppose a client is blending on a surface with sRGB encode enabled on + * gen9. This implies that you get AUX_USAGE_CCS_D at best. If the client + * then disables sRGB decode and continues blending we will flip on + * AUX_USAGE_CCS_E without doing any sort of resolve in-between (this is + * perfectly valid since CCS_E is a subset of CCS_D). However, this means + * that we have fragments in-flight which are rendering with UNORM+CCS_E + * and other fragments in-flight with SRGB+CCS_D on the same surface at the + * same time and the pixel scoreboard and color blender are trying to sort + * it all out. This ends badly (i.e. GPU hangs). + * + * To date, we have never observed GPU hangs or even corruption to be + * associated with switching the format, only the aux usage. However, + * there are comments in various docs which indicate that the render cache + * isn't 100% resilient to format changes. We may as well be conservative + * and flush on format changes too. We can always relax this later if we + * find it to be a performance problem. + */ + struct hash_entry *entry = _mesa_hash_table_search(batch->cache.render, bo); + if (entry && entry->data != format_aux_tuple(format, aux_usage)) + iris_flush_depth_and_render_caches(batch); +} + +void +iris_render_cache_add_bo(struct iris_batch *batch, + struct iris_bo *bo, + enum isl_format format, + enum isl_aux_usage aux_usage) +{ +#ifndef NDEBUG + struct hash_entry *entry = _mesa_hash_table_search(batch->cache.render, bo); + if (entry) { + /* Otherwise, someone didn't do a flush_for_render and that would be + * very bad indeed. + */ + assert(entry->data == format_aux_tuple(format, aux_usage)); + } +#endif + + _mesa_hash_table_insert(batch->cache.render, bo, + format_aux_tuple(format, aux_usage)); +} + +void +iris_cache_flush_for_depth(struct iris_batch *batch, + struct iris_bo *bo) +{ + if (_mesa_hash_table_search(batch->cache.render, bo)) + iris_flush_depth_and_render_caches(batch); +} + +void +iris_depth_cache_add_bo(struct iris_batch *batch, struct iris_bo *bo) +{ + _mesa_set_add(batch->cache.depth, bo); +} diff --git a/src/gallium/drivers/iris/meson.build b/src/gallium/drivers/iris/meson.build index 18a45f418f0..ca48d189254 100644 --- a/src/gallium/drivers/iris/meson.build +++ b/src/gallium/drivers/iris/meson.build @@ -37,6 +37,7 @@ files_libiris = files( 'iris_program.c', 'iris_program_cache.c', 'iris_query.c', + 'iris_resolve.c', 'iris_resource.c', 'iris_resource.h', 'iris_screen.c', |