From a14f825126b89a96a1d9d112fe0a6e62f84fe97e Mon Sep 17 00:00:00 2001 From: Italo Nicola Date: Fri, 25 Sep 2020 21:35:38 +0000 Subject: [PATCH] pan/mdg: rename st_image opcodes and add float16 versions Signed-off-by: Italo Nicola Reviewed-by: Boris Brezillon Reviewed-by: Alyssa Rosenzweig Part-of: --- src/panfrost/midgard/midgard.h | 7 ++++--- src/panfrost/midgard/midgard_ops.c | 11 ++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/panfrost/midgard/midgard.h b/src/panfrost/midgard/midgard.h index a069e72..2eb50d7 100644 --- a/src/panfrost/midgard/midgard.h +++ b/src/panfrost/midgard/midgard.h @@ -521,9 +521,10 @@ typedef enum { midgard_op_st_vary_32i = 0xD7, /* Value to st in r27, location r26.w as short2 */ - midgard_op_st_image_f = 0xD8, - midgard_op_st_image_ui = 0xDA, - midgard_op_st_image_i = 0xDB, + midgard_op_st_image_32f = 0xD8, + midgard_op_st_image_16f = 0xD9, + midgard_op_st_image_32u = 0xDA, + midgard_op_st_image_32i = 0xDB, } midgard_load_store_op; typedef enum { diff --git a/src/panfrost/midgard/midgard_ops.c b/src/panfrost/midgard/midgard_ops.c index d0acdd5..dd753ff 100644 --- a/src/panfrost/midgard/midgard_ops.c +++ b/src/panfrost/midgard/midgard_ops.c @@ -242,8 +242,8 @@ struct mir_ldst_op_props load_store_opcode_props[256] = { [midgard_op_ld_ubo_short4] = {"ld_ubo_short4", M32}, [midgard_op_ld_ubo_int4] = {"ld_ubo_int4", M32}, - [midgard_op_ld_image_32f] = {"ld_image_32f", M32}, - [midgard_op_ld_image_16f] = {"ld_image_16f", M16}, + [midgard_op_ld_image_32f] = {"ld_image_32f", M32}, + [midgard_op_ld_image_16f] = {"ld_image_16f", M16}, [midgard_op_ld_image_32i] = {"ld_image_32i", M32}, [midgard_op_ld_image_32u] = {"ld_image_32u", M32}, @@ -258,9 +258,10 @@ struct mir_ldst_op_props load_store_opcode_props[256] = { [midgard_op_st_vary_32u] = {"st_vary_32u", M32 | LDST_STORE}, [midgard_op_st_vary_16] = {"st_vary_16", M16 | LDST_STORE}, - [midgard_op_st_image_f] = {"st_image_f", M32 | LDST_STORE}, - [midgard_op_st_image_ui] = {"st_image_ui", M32 | LDST_STORE}, - [midgard_op_st_image_i] = {"st_image_i", M32 | LDST_STORE}, + [midgard_op_st_image_32f] = {"st_image_32f", M32 | LDST_STORE}, + [midgard_op_st_image_16f] = {"st_image_16f", M16 | LDST_STORE}, + [midgard_op_st_image_32i] = {"st_image_32i", M32 | LDST_STORE}, + [midgard_op_st_image_32u] = {"st_image_32u", M32 | LDST_STORE}, }; #undef M8 -- 2.7.4