Mesa (master): freedreno/ir3: Use RESINFO for a6xx image size queries.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue May 26 18:34:08 UTC 2020
Module: Mesa
Branch: master
Commit: 5ec3747fbe8e1d5a5a8b29b123b843b57ce77c6e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ec3747fbe8e1d5a5a8b29b123b843b57ce77c6e
Author: Eric Anholt <eric at anholt.net>
Date: Tue Jan 21 14:36:32 2020 -0800
freedreno/ir3: Use RESINFO for a6xx image size queries.
The closed GL driver uses resinfo on images with the writeonly flag (using
the texture-path's getsize only for readonly images). The closed vulkan
driver seems to use resinfo regardless. Using resinfo doesn't need any
fixups after the instruction. It also avoids one of the needs for the
TEX_CONST state for the image, which is awkward to set up in the GL
driver.
The new handler goes into ir3_a6xx to be next to the other current image
code, but the a4xx version is left in place because it wants a bunch of
sampler helpers.
Fixes assertion failure in dEQP-VK.image.image_size.buffer.readonly_32.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3501>
---
src/freedreno/ir3/ir3.c | 2 ++
src/freedreno/ir3/ir3_a4xx.c | 1 +
src/freedreno/ir3/ir3_a6xx.c | 18 ++++++++++++++++++
src/freedreno/ir3/ir3_compiler_nir.c | 7 ++++---
src/freedreno/ir3/ir3_context.h | 4 ++++
src/freedreno/ir3/ir3_cp.c | 20 ++++++++++++++------
6 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/src/freedreno/ir3/ir3.c b/src/freedreno/ir3/ir3.c
index d41022b7b29..5f4b86d610d 100644
--- a/src/freedreno/ir3/ir3.c
+++ b/src/freedreno/ir3/ir3.c
@@ -606,6 +606,7 @@ static int emit_cat6_a6xx(struct ir3_instruction *instr, void *ptr,
cat6->pad5 = 0x2;
break;
case OPC_LDIB:
+ case OPC_RESINFO:
cat6->pad1 = 0x1;
cat6->pad3 = 0xc;
cat6->pad5 = 0x2;
@@ -653,6 +654,7 @@ static int emit_cat6(struct ir3_instruction *instr, void *ptr,
case OPC_STIB:
case OPC_LDIB:
case OPC_LDC:
+ case OPC_RESINFO:
return emit_cat6_a6xx(instr, ptr, info);
default:
break;
diff --git a/src/freedreno/ir3/ir3_a4xx.c b/src/freedreno/ir3/ir3_a4xx.c
index 04dec6c027f..8dbc61c4846 100644
--- a/src/freedreno/ir3/ir3_a4xx.c
+++ b/src/freedreno/ir3/ir3_a4xx.c
@@ -356,4 +356,5 @@ const struct ir3_context_funcs ir3_a4xx_funcs = {
.emit_intrinsic_atomic_ssbo = emit_intrinsic_atomic_ssbo,
.emit_intrinsic_store_image = emit_intrinsic_store_image,
.emit_intrinsic_atomic_image = emit_intrinsic_atomic_image,
+ .emit_intrinsic_image_size = emit_intrinsic_image_size_tex,
};
diff --git a/src/freedreno/ir3/ir3_a6xx.c b/src/freedreno/ir3/ir3_a6xx.c
index 9b8f154bb64..39549d44b1d 100644
--- a/src/freedreno/ir3/ir3_a6xx.c
+++ b/src/freedreno/ir3/ir3_a6xx.c
@@ -340,6 +340,23 @@ emit_intrinsic_atomic_image(struct ir3_context *ctx, nir_intrinsic_instr *intr)
return atomic;
}
+static void
+emit_intrinsic_image_size(struct ir3_context *ctx, nir_intrinsic_instr *intr,
+ struct ir3_instruction **dst)
+{
+ struct ir3_block *b = ctx->block;
+ struct ir3_instruction *ibo = ir3_image_to_ibo(ctx, intr->src[0]);
+ struct ir3_instruction *resinfo = ir3_RESINFO(b, ibo, 0);
+ resinfo->cat6.iim_val = 1;
+ resinfo->cat6.d = intr->num_components;
+ resinfo->cat6.type = TYPE_U32;
+ resinfo->cat6.typed = false;
+ resinfo->regs[0]->wrmask = MASK(intr->num_components);
+ ir3_handle_bindless_cat6(resinfo, intr->src[0]);
+
+ ir3_split_dest(b, dst, resinfo, 0, intr->num_components);
+}
+
const struct ir3_context_funcs ir3_a6xx_funcs = {
.emit_intrinsic_load_ssbo = emit_intrinsic_load_ssbo,
.emit_intrinsic_store_ssbo = emit_intrinsic_store_ssbo,
@@ -347,6 +364,7 @@ const struct ir3_context_funcs ir3_a6xx_funcs = {
.emit_intrinsic_load_image = emit_intrinsic_load_image,
.emit_intrinsic_store_image = emit_intrinsic_store_image,
.emit_intrinsic_atomic_image = emit_intrinsic_atomic_image,
+ .emit_intrinsic_image_size = emit_intrinsic_image_size,
};
/*
diff --git a/src/freedreno/ir3/ir3_compiler_nir.c b/src/freedreno/ir3/ir3_compiler_nir.c
index e12a814abd8..054c679aedf 100644
--- a/src/freedreno/ir3/ir3_compiler_nir.c
+++ b/src/freedreno/ir3/ir3_compiler_nir.c
@@ -1175,8 +1175,9 @@ emit_intrinsic_load_image(struct ir3_context *ctx, nir_intrinsic_instr *intr,
ir3_split_dest(b, dst, sam, 0, 4);
}
-static void
-emit_intrinsic_image_size(struct ir3_context *ctx, nir_intrinsic_instr *intr,
+/* A4xx version of image_size, see ir3_a6xx.c for newer resinfo version. */
+void
+emit_intrinsic_image_size_tex(struct ir3_context *ctx, nir_intrinsic_instr *intr,
struct ir3_instruction **dst)
{
struct ir3_block *b = ctx->block;
@@ -1726,7 +1727,7 @@ emit_intrinsic(struct ir3_context *ctx, nir_intrinsic_instr *intr)
break;
case nir_intrinsic_image_size:
case nir_intrinsic_bindless_image_size:
- emit_intrinsic_image_size(ctx, intr, dst);
+ ctx->funcs->emit_intrinsic_image_size(ctx, intr, dst);
break;
case nir_intrinsic_image_atomic_add:
case nir_intrinsic_bindless_image_atomic_add:
diff --git a/src/freedreno/ir3/ir3_context.h b/src/freedreno/ir3/ir3_context.h
index c977dc15285..9cd147d9a6d 100644
--- a/src/freedreno/ir3/ir3_context.h
+++ b/src/freedreno/ir3/ir3_context.h
@@ -163,6 +163,8 @@ struct ir3_context_funcs {
struct ir3_instruction **dst);
void (*emit_intrinsic_store_image)(struct ir3_context *ctx, nir_intrinsic_instr *intr);
struct ir3_instruction * (*emit_intrinsic_atomic_image)(struct ir3_context *ctx, nir_intrinsic_instr *intr);
+ void (*emit_intrinsic_image_size)(struct ir3_context *ctx, nir_intrinsic_instr *intr,
+ struct ir3_instruction **dst);
};
extern const struct ir3_context_funcs ir3_a4xx_funcs;
@@ -181,6 +183,8 @@ struct ir3_instruction * ir3_create_collect(struct ir3_context *ctx,
void ir3_split_dest(struct ir3_block *block, struct ir3_instruction **dst,
struct ir3_instruction *src, unsigned base, unsigned n);
void ir3_handle_bindless_cat6(struct ir3_instruction *instr, nir_src rsrc);
+void emit_intrinsic_image_size_tex(struct ir3_context *ctx, nir_intrinsic_instr *intr,
+ struct ir3_instruction **dst);
NORETURN void ir3_context_error(struct ir3_context *ctx, const char *format, ...);
diff --git a/src/freedreno/ir3/ir3_cp.c b/src/freedreno/ir3/ir3_cp.c
index fd137301874..fb5ea8dc8cb 100644
--- a/src/freedreno/ir3/ir3_cp.c
+++ b/src/freedreno/ir3/ir3_cp.c
@@ -233,8 +233,8 @@ static bool valid_flags(struct ir3_instruction *instr, unsigned n,
if (instr->opc == OPC_LDLW && n == 0)
return false;
- /* disallow CP into anything but the SSBO slot argument for
- * atomics:
+ /* disallow immediates in anything but the SSBO slot argument for
+ * cat6 instructions:
*/
if (is_atomic(instr->opc) && (n != 0))
return false;
@@ -245,11 +245,19 @@ static bool valid_flags(struct ir3_instruction *instr, unsigned n,
if (instr->opc == OPC_STG && (instr->flags & IR3_INSTR_G) && (n != 2))
return false;
- /* as with atomics, ldib and ldc on a6xx can only have immediate
- * for SSBO slot argument
+ /* as with atomics, these cat6 instrs can only have an immediate
+ * for SSBO/IBO slot argument
*/
- if ((instr->opc == OPC_LDIB || instr->opc == OPC_LDC) && (n != 0))
- return false;
+ switch (instr->opc) {
+ case OPC_LDIB:
+ case OPC_LDC:
+ case OPC_RESINFO:
+ if (n != 0)
+ return false;
+ break;
+ default:
+ break;
+ }
}
break;
More information about the mesa-commit
mailing list