#include "pipe/p_state.h"
#include "pipe/p_context.h"
#include "pipe/p_screen.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
#include "util/u_inlines.h"
#include "util/ralloc.h"
#include "intel/blorp/blorp.h"
}
void
-iris_blorp_surf_for_resource(struct iris_vtable *vtbl,
+iris_blorp_surf_for_resource(struct isl_device *isl_dev,
struct blorp_surf *surf,
struct pipe_resource *p_res,
enum isl_aux_usage aux_usage,
{
struct iris_resource *res = (void *) p_res;
- if (aux_usage == ISL_AUX_USAGE_HIZ &&
+ assert(!iris_resource_unfinished_aux_import(res));
+
+ if (isl_aux_usage_has_hiz(aux_usage) &&
!iris_resource_level_has_hiz(res, level))
aux_usage = ISL_AUX_USAGE_NONE;
.buffer = res->bo,
.offset = res->offset,
.reloc_flags = is_render_target ? EXEC_OBJECT_WRITE : 0,
- .mocs = vtbl->mocs(res->bo),
+ .mocs = iris_mocs(res->bo, isl_dev),
},
.aux_usage = aux_usage,
};
.buffer = res->aux.bo,
.offset = res->aux.offset,
.reloc_flags = is_render_target ? EXEC_OBJECT_WRITE : 0,
- .mocs = vtbl->mocs(res->bo),
+ .mocs = iris_mocs(res->bo, isl_dev),
};
surf->clear_color =
iris_resource_get_clear_color(res, NULL, NULL);
.buffer = res->aux.clear_color_bo,
.offset = res->aux.clear_color_offset,
.reloc_flags = 0,
- .mocs = vtbl->mocs(res->aux.clear_color_bo),
+ .mocs = iris_mocs(res->aux.clear_color_bo, isl_dev),
};
}
+}
- // XXX: ASTC
+static bool
+is_astc(enum isl_format format)
+{
+ return format != ISL_FORMAT_UNSUPPORTED &&
+ isl_format_get_layout(format)->txc == ISL_TXC_ASTC;
}
static void
-tex_cache_flush_hack(struct iris_batch *batch)
+tex_cache_flush_hack(struct iris_batch *batch,
+ enum isl_format view_format,
+ enum isl_format surf_format)
{
- /* The hardware seems to have issues with having a two different
- * format views of the same texture in the sampler cache at the
- * same time. It's unclear exactly what the issue is but it hurts
- * blits and copies particularly badly because they often reinterpret
- * formats. We badly need better understanding of the sampler issue
- * and a better fix but this works for now and fixes CTS tests.
+ const struct gen_device_info *devinfo = &batch->screen->devinfo;
+
+ /* The WaSamplerCacheFlushBetweenRedescribedSurfaceReads workaround says:
+ *
+ * "Currently Sampler assumes that a surface would not have two
+ * different format associate with it. It will not properly cache
+ * the different views in the MT cache, causing a data corruption."
+ *
+ * We may need to handle this for texture views in general someday, but
+ * for now we handle it here, as it hurts copies and blits particularly
+ * badly because they ofter reinterpret formats.
*
* If the BO hasn't been referenced yet this batch, we assume that the
* texture cache doesn't contain any relevant data nor need flushing.
*
- * TODO: Remove this hack!
+ * Icelake (Gen11+) claims to fix this issue, but seems to still have
+ * issues with ASTC formats.
*/
- iris_emit_pipe_control_flush(batch,
- PIPE_CONTROL_CS_STALL |
+ bool need_flush = devinfo->gen >= 11 ?
+ is_astc(surf_format) != is_astc(view_format) :
+ view_format != surf_format;
+ if (!need_flush)
+ return;
+
+ const char *reason =
+ "workaround: WaSamplerCacheFlushBetweenRedescribedSurfaceReads";
+
+ iris_emit_pipe_control_flush(batch, reason, PIPE_CONTROL_CS_STALL);
+ iris_emit_pipe_control_flush(batch, reason,
PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE);
}
+static enum isl_aux_usage
+iris_resource_blorp_write_aux_usage(struct iris_context *ice,
+ struct iris_resource *res,
+ enum isl_format render_format)
+{
+ if (res->surf.usage & (ISL_SURF_USAGE_DEPTH_BIT |
+ ISL_SURF_USAGE_STENCIL_BIT)) {
+ assert(render_format == res->surf.format);
+ return res->aux.usage;
+ } else {
+ return iris_resource_render_aux_usage(ice, res, render_format, false);
+ }
+}
+
/**
* The pipe->blit() driver hook.
*
blorp_flags |= BLORP_BATCH_PREDICATE_ENABLE;
}
+ if (iris_resource_unfinished_aux_import(src_res))
+ iris_resource_finish_aux_import(ctx->screen, src_res);
+ if (iris_resource_unfinished_aux_import(dst_res))
+ iris_resource_finish_aux_import(ctx->screen, dst_res);
+
struct iris_format_info src_fmt =
iris_format_for_usage(devinfo, info->src.format,
ISL_SURF_USAGE_TEXTURE_BIT);
enum isl_aux_usage src_aux_usage =
- iris_resource_texture_aux_usage(ice, src_res, src_fmt.fmt, 0);
+ iris_resource_texture_aux_usage(ice, src_res, src_fmt.fmt);
- if (src_aux_usage == ISL_AUX_USAGE_HIZ)
- src_aux_usage = ISL_AUX_USAGE_NONE;
+ if (iris_resource_level_has_hiz(src_res, info->src.level))
+ assert(src_res->surf.format == src_fmt.fmt);
- bool src_clear_supported = src_aux_usage != ISL_AUX_USAGE_NONE &&
+ bool src_clear_supported = isl_aux_usage_has_fast_clears(src_aux_usage) &&
src_res->surf.format == src_fmt.fmt;
- iris_resource_prepare_access(ice, batch, src_res, info->src.level, 1,
+ iris_resource_prepare_access(ice, src_res, info->src.level, 1,
info->src.box.z, info->src.box.depth,
src_aux_usage, src_clear_supported);
+ iris_emit_buffer_barrier_for(batch, src_res->bo, IRIS_DOMAIN_OTHER_READ);
struct iris_format_info dst_fmt =
iris_format_for_usage(devinfo, info->dst.format,
ISL_SURF_USAGE_RENDER_TARGET_BIT);
enum isl_aux_usage dst_aux_usage =
- iris_resource_render_aux_usage(ice, dst_res, dst_fmt.fmt, false, false);
- bool dst_clear_supported = dst_aux_usage != ISL_AUX_USAGE_NONE;
+ iris_resource_blorp_write_aux_usage(ice, dst_res, dst_fmt.fmt);
+ bool dst_clear_supported = isl_aux_usage_has_fast_clears(dst_aux_usage);
struct blorp_surf src_surf, dst_surf;
- iris_blorp_surf_for_resource(&ice->vtbl, &src_surf, info->src.resource,
- src_aux_usage, info->src.level, false);
- iris_blorp_surf_for_resource(&ice->vtbl, &dst_surf, info->dst.resource,
- dst_aux_usage, info->dst.level, true);
-
- iris_resource_prepare_access(ice, batch, dst_res, info->dst.level, 1,
+ iris_blorp_surf_for_resource(&screen->isl_dev, &src_surf,
+ info->src.resource, src_aux_usage,
+ info->src.level, false);
+ iris_blorp_surf_for_resource(&screen->isl_dev, &dst_surf,
+ info->dst.resource, dst_aux_usage,
+ info->dst.level, true);
+
+ iris_resource_prepare_access(ice, dst_res, info->dst.level, 1,
info->dst.box.z, info->dst.box.depth,
dst_aux_usage, dst_clear_supported);
+ iris_emit_buffer_barrier_for(batch, dst_res->bo, IRIS_DOMAIN_RENDER_WRITE);
float src_x0 = info->src.box.x;
float src_x1 = info->src.box.x + info->src.box.width;
filter = BLORP_FILTER_NEAREST;
}
- bool format_mismatch = src_fmt.fmt != src_res->surf.format;
-
- if (format_mismatch && iris_batch_references(batch, src_res->bo))
- tex_cache_flush_hack(batch);
+ if (iris_batch_references(batch, src_res->bo))
+ tex_cache_flush_hack(batch, src_fmt.fmt, src_res->surf.format);
if (dst_res->base.target == PIPE_BUFFER)
- util_range_add(&dst_res->valid_buffer_range, dst_x0, dst_x1);
+ util_range_add(&dst_res->base, &dst_res->valid_buffer_range, dst_x0, dst_x1);
struct blorp_batch blorp_batch;
blorp_batch_init(&ice->blorp, &blorp_batch, batch, blorp_flags);
if (info->mask & main_mask) {
for (int slice = 0; slice < info->dst.box.depth; slice++) {
iris_batch_maybe_flush(batch, 1500);
+ iris_batch_sync_region_start(batch);
blorp_blit(&blorp_batch,
&src_surf, info->src.level, info->src.box.z + slice,
src_x0, src_y0, src_x1, src_y1,
dst_x0, dst_y0, dst_x1, dst_y1,
filter, mirror_x, mirror_y);
+
+ iris_batch_sync_region_end(batch);
}
}
+ struct iris_resource *stc_dst = NULL;
+ enum isl_aux_usage stc_dst_aux_usage = ISL_AUX_USAGE_NONE;
if ((info->mask & PIPE_MASK_S) &&
util_format_has_stencil(util_format_description(info->dst.format)) &&
util_format_has_stencil(util_format_description(info->src.format))) {
- struct iris_resource *src_res, *dst_res, *junk;
+ struct iris_resource *src_res, *junk;
+ struct blorp_surf src_surf, dst_surf;
iris_get_depth_stencil_resources(info->src.resource, &junk, &src_res);
- iris_get_depth_stencil_resources(info->dst.resource, &junk, &dst_res);
- iris_blorp_surf_for_resource(&ice->vtbl, &src_surf, &src_res->base,
- ISL_AUX_USAGE_NONE, info->src.level, false);
- iris_blorp_surf_for_resource(&ice->vtbl, &dst_surf, &dst_res->base,
- ISL_AUX_USAGE_NONE, info->dst.level, true);
+ iris_get_depth_stencil_resources(info->dst.resource, &junk, &stc_dst);
+
+ struct iris_format_info src_fmt =
+ iris_format_for_usage(devinfo, src_res->base.format,
+ ISL_SURF_USAGE_TEXTURE_BIT);
+ enum isl_aux_usage stc_src_aux_usage =
+ iris_resource_texture_aux_usage(ice, src_res, src_fmt.fmt);
+
+ struct iris_format_info dst_fmt =
+ iris_format_for_usage(devinfo, stc_dst->base.format,
+ ISL_SURF_USAGE_RENDER_TARGET_BIT);
+ stc_dst_aux_usage =
+ iris_resource_blorp_write_aux_usage(ice, stc_dst, dst_fmt.fmt);
+
+ iris_resource_prepare_access(ice, src_res, info->src.level, 1,
+ info->src.box.z, info->src.box.depth,
+ stc_src_aux_usage, false);
+ iris_emit_buffer_barrier_for(batch, src_res->bo, IRIS_DOMAIN_OTHER_READ);
+ iris_resource_prepare_access(ice, stc_dst, info->dst.level, 1,
+ info->dst.box.z, info->dst.box.depth,
+ stc_dst_aux_usage, false);
+ iris_emit_buffer_barrier_for(batch, stc_dst->bo, IRIS_DOMAIN_RENDER_WRITE);
+ iris_blorp_surf_for_resource(&screen->isl_dev, &src_surf,
+ &src_res->base, stc_src_aux_usage,
+ info->src.level, false);
+ iris_blorp_surf_for_resource(&screen->isl_dev, &dst_surf,
+ &stc_dst->base, stc_dst_aux_usage,
+ info->dst.level, true);
for (int slice = 0; slice < info->dst.box.depth; slice++) {
iris_batch_maybe_flush(batch, 1500);
+ iris_batch_sync_region_start(batch);
blorp_blit(&blorp_batch,
&src_surf, info->src.level, info->src.box.z + slice,
src_x0, src_y0, src_x1, src_y1,
dst_x0, dst_y0, dst_x1, dst_y1,
filter, mirror_x, mirror_y);
+
+ iris_batch_sync_region_end(batch);
}
}
blorp_batch_finish(&blorp_batch);
- if (format_mismatch)
- tex_cache_flush_hack(batch);
+ tex_cache_flush_hack(batch, src_fmt.fmt, src_res->surf.format);
+
+ if (info->mask & main_mask) {
+ iris_resource_finish_write(ice, dst_res, info->dst.level, info->dst.box.z,
+ info->dst.box.depth, dst_aux_usage);
+ }
- iris_resource_finish_write(ice, dst_res, info->dst.level, info->dst.box.z,
- info->dst.box.depth, dst_aux_usage);
+ if (stc_dst) {
+ iris_resource_finish_write(ice, stc_dst, info->dst.level, info->dst.box.z,
+ info->dst.box.depth, stc_dst_aux_usage);
+ }
iris_flush_and_dirty_for_history(ice, batch, (struct iris_resource *)
- info->dst.resource);
+ info->dst.resource,
+ PIPE_CONTROL_RENDER_TARGET_FLUSH,
+ "cache history: post-blit");
}
static void
-get_copy_region_aux_settings(const struct gen_device_info *devinfo,
+get_copy_region_aux_settings(struct iris_context *ice,
struct iris_resource *res,
enum isl_aux_usage *out_aux_usage,
- bool *out_clear_supported)
+ bool *out_clear_supported,
+ bool is_render_target)
{
+ struct iris_screen *screen = (void *) ice->ctx.screen;
+ const struct gen_device_info *devinfo = &screen->devinfo;
+
switch (res->aux.usage) {
+ case ISL_AUX_USAGE_HIZ:
+ case ISL_AUX_USAGE_HIZ_CCS:
+ case ISL_AUX_USAGE_HIZ_CCS_WT:
+ if (is_render_target) {
+ *out_aux_usage = res->aux.usage;
+ } else {
+ *out_aux_usage = iris_resource_texture_aux_usage(ice, res,
+ res->surf.format);
+ }
+ *out_clear_supported = (*out_aux_usage != ISL_AUX_USAGE_NONE);
+ break;
case ISL_AUX_USAGE_MCS:
+ case ISL_AUX_USAGE_MCS_CCS:
case ISL_AUX_USAGE_CCS_E:
+ case ISL_AUX_USAGE_GEN12_CCS_E:
*out_aux_usage = res->aux.usage;
/* Prior to Gen9, fast-clear only supported 0/1 clear colors. Since
* we're going to re-interpret the format as an integer format possibly
*/
*out_clear_supported = devinfo->gen >= 9;
break;
+ case ISL_AUX_USAGE_STC_CCS:
+ *out_aux_usage = res->aux.usage;
+ *out_clear_supported = false;
+ break;
default:
*out_aux_usage = ISL_AUX_USAGE_NONE;
*out_clear_supported = false;
struct blorp_batch blorp_batch;
struct iris_context *ice = blorp->driver_ctx;
struct iris_screen *screen = (void *) ice->ctx.screen;
- const struct gen_device_info *devinfo = &screen->devinfo;
struct iris_resource *src_res = (void *) src;
struct iris_resource *dst_res = (void *) dst;
enum isl_aux_usage src_aux_usage, dst_aux_usage;
bool src_clear_supported, dst_clear_supported;
- get_copy_region_aux_settings(devinfo, src_res, &src_aux_usage,
- &src_clear_supported);
- get_copy_region_aux_settings(devinfo, dst_res, &dst_aux_usage,
- &dst_clear_supported);
+ get_copy_region_aux_settings(ice, src_res, &src_aux_usage,
+ &src_clear_supported, false);
+ get_copy_region_aux_settings(ice, dst_res, &dst_aux_usage,
+ &dst_clear_supported, true);
if (iris_batch_references(batch, src_res->bo))
- tex_cache_flush_hack(batch);
+ tex_cache_flush_hack(batch, ISL_FORMAT_UNSUPPORTED, src_res->surf.format);
if (dst->target == PIPE_BUFFER)
- util_range_add(&dst_res->valid_buffer_range, dstx, dstx + src_box->width);
+ util_range_add(&dst_res->base, &dst_res->valid_buffer_range, dstx, dstx + src_box->width);
if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) {
struct blorp_address src_addr = {
.reloc_flags = EXEC_OBJECT_WRITE,
};
+ iris_emit_buffer_barrier_for(batch, iris_resource_bo(src),
+ IRIS_DOMAIN_OTHER_READ);
+ iris_emit_buffer_barrier_for(batch, iris_resource_bo(dst),
+ IRIS_DOMAIN_RENDER_WRITE);
+
iris_batch_maybe_flush(batch, 1500);
+ iris_batch_sync_region_start(batch);
blorp_batch_init(&ice->blorp, &blorp_batch, batch, 0);
blorp_buffer_copy(&blorp_batch, src_addr, dst_addr, src_box->width);
blorp_batch_finish(&blorp_batch);
-
- iris_flush_and_dirty_for_history(ice, batch,
- (struct iris_resource *) dst);
+ iris_batch_sync_region_end(batch);
} else {
// XXX: what about one surface being a buffer and not the other?
struct blorp_surf src_surf, dst_surf;
- iris_blorp_surf_for_resource(&ice->vtbl, &src_surf, src, src_aux_usage,
- src_level, false);
- iris_blorp_surf_for_resource(&ice->vtbl, &dst_surf, dst, dst_aux_usage,
- dst_level, true);
+ iris_blorp_surf_for_resource(&screen->isl_dev, &src_surf,
+ src, src_aux_usage, src_level, false);
+ iris_blorp_surf_for_resource(&screen->isl_dev, &dst_surf,
+ dst, dst_aux_usage, dst_level, true);
- iris_resource_prepare_access(ice, batch, src_res, src_level, 1,
+ iris_resource_prepare_access(ice, src_res, src_level, 1,
src_box->z, src_box->depth,
src_aux_usage, src_clear_supported);
- iris_resource_prepare_access(ice, batch, dst_res, dst_level, 1,
+ iris_resource_prepare_access(ice, dst_res, dst_level, 1,
dstz, src_box->depth,
dst_aux_usage, dst_clear_supported);
+ iris_emit_buffer_barrier_for(batch, iris_resource_bo(src),
+ IRIS_DOMAIN_OTHER_READ);
+ iris_emit_buffer_barrier_for(batch, iris_resource_bo(dst),
+ IRIS_DOMAIN_RENDER_WRITE);
+
blorp_batch_init(&ice->blorp, &blorp_batch, batch, 0);
for (int slice = 0; slice < src_box->depth; slice++) {
iris_batch_maybe_flush(batch, 1500);
+ iris_batch_sync_region_start(batch);
blorp_copy(&blorp_batch, &src_surf, src_level, src_box->z + slice,
&dst_surf, dst_level, dstz + slice,
src_box->x, src_box->y, dstx, dsty,
src_box->width, src_box->height);
+ iris_batch_sync_region_end(batch);
}
blorp_batch_finish(&blorp_batch);
src_box->depth, dst_aux_usage);
}
- tex_cache_flush_hack(batch);
+ tex_cache_flush_hack(batch, ISL_FORMAT_UNSUPPORTED, src_res->surf.format);
+}
+
+static struct iris_batch *
+get_preferred_batch(struct iris_context *ice, struct iris_bo *bo)
+{
+ /* If the compute batch is already using this buffer, we'd prefer to
+ * continue queueing in the compute batch.
+ */
+ if (iris_batch_references(&ice->batches[IRIS_BATCH_COMPUTE], bo))
+ return &ice->batches[IRIS_BATCH_COMPUTE];
+
+ /* Otherwise default to the render batch. */
+ return &ice->batches[IRIS_BATCH_RENDER];
}
*/
static void
iris_resource_copy_region(struct pipe_context *ctx,
- struct pipe_resource *dst,
+ struct pipe_resource *p_dst,
unsigned dst_level,
unsigned dstx, unsigned dsty, unsigned dstz,
- struct pipe_resource *src,
+ struct pipe_resource *p_src,
unsigned src_level,
const struct pipe_box *src_box)
{
struct iris_context *ice = (void *) ctx;
+ struct iris_screen *screen = (void *) ctx->screen;
struct iris_batch *batch = &ice->batches[IRIS_BATCH_RENDER];
+ struct iris_resource *src = (void *) p_src;
+ struct iris_resource *dst = (void *) p_dst;
+
+ if (iris_resource_unfinished_aux_import(src))
+ iris_resource_finish_aux_import(ctx->screen, src);
+ if (iris_resource_unfinished_aux_import(dst))
+ iris_resource_finish_aux_import(ctx->screen, dst);
+
+ /* Use MI_COPY_MEM_MEM for tiny (<= 16 byte, % 4) buffer copies. */
+ if (p_src->target == PIPE_BUFFER && p_dst->target == PIPE_BUFFER &&
+ (src_box->width % 4 == 0) && src_box->width <= 16) {
+ struct iris_bo *dst_bo = iris_resource_bo(p_dst);
+ batch = get_preferred_batch(ice, dst_bo);
+ iris_batch_maybe_flush(batch, 24 + 5 * (src_box->width / 4));
+ iris_emit_pipe_control_flush(batch,
+ "stall for MI_COPY_MEM_MEM copy_region",
+ PIPE_CONTROL_CS_STALL);
+ screen->vtbl.copy_mem_mem(batch, dst_bo, dstx, iris_resource_bo(p_src),
+ src_box->x, src_box->width);
+ return;
+ }
+
+ iris_copy_region(&ice->blorp, batch, p_dst, dst_level, dstx, dsty, dstz,
+ p_src, src_level, src_box);
+
+ if (util_format_is_depth_and_stencil(p_dst->format) &&
+ util_format_has_stencil(util_format_description(p_src->format))) {
+ struct iris_resource *junk, *s_src_res, *s_dst_res;
+ iris_get_depth_stencil_resources(p_src, &junk, &s_src_res);
+ iris_get_depth_stencil_resources(p_dst, &junk, &s_dst_res);
+
+ iris_copy_region(&ice->blorp, batch, &s_dst_res->base, dst_level, dstx,
+ dsty, dstz, &s_src_res->base, src_level, src_box);
+ }
- iris_copy_region(&ice->blorp, batch, dst, dst_level, dstx, dsty, dstz,
- src, src_level, src_box);
+ iris_flush_and_dirty_for_history(ice, batch, dst,
+ PIPE_CONTROL_RENDER_TARGET_FLUSH,
+ "cache history: post copy_region");
}
void