pan/midgard: Tableize load/store ops

This will allow us to encode properties about the load/store ops like we
do for ALU ops. We include now properties about whether we have a store,
and if there are special cases on the load/store op. We also tag each
instruction by its natural size... this is probably not totally right,
but it's a start.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>

diff --git a/src/panfrost/midgard/disassemble.c b/src/panfrost/midgard/disassemble.c
index 7680d037937cb01a02ceac7856c6748d37e179c6..614de3bfd002e532019d01e1fee474e7c0b389cb 100644 (file)
--- a/src/panfrost/midgard/disassemble.c
+++ b/src/panfrost/midgard/disassemble.c
@@ -90,8 +90,8 @@ print_alu_opcode(midgard_alu_op op)
 static void
 print_ld_st_opcode(midgard_load_store_op op)
 {
-        if (load_store_opcode_names[op])
-                printf("%s", load_store_opcode_names[op]);
+        if (load_store_opcode_props[op].name)
+                printf("%s", load_store_opcode_props[op].name);
         else
                 printf("ldst_op_%02X", op);
 }

diff --git a/src/panfrost/midgard/helpers.h b/src/panfrost/midgard/helpers.h
index 024a6380d298c6409a5345f5d294a422041d9a0c..6afaf1577ca30b37cf7aff00fd30c1a8b0bc9608 100644 (file)
--- a/src/panfrost/midgard/helpers.h
+++ b/src/panfrost/midgard/helpers.h
@@ -262,6 +262,26 @@ struct mir_op_props {
         unsigned props;
 };
 
+/* For load/store */
+
+struct mir_ldst_op_props {
+        const char *name;
+        unsigned props;
+};
+
+/* Lower 2-bits are a midgard_reg_mode */
+#define GET_LDST_SIZE(c) (c & 3)
+
+/* Store (so the primary register is a source, not a destination */
+#define LDST_STORE (1 << 2)
+
+/* Mask has special meaning and should not be manipulated directly */
+#define LDST_SPECIAL_MASK (1 << 3)
+
+/* Non-store operation has side effects and should not be eliminated even if
+ * its mask is 0 */
+#define LDST_SIDE_FX (1 << 4)
+
 /* This file is common, so don't define the tables themselves. #include
  * midgard_op.h if you need that, or edit midgard_ops.c directly */
 

diff --git a/src/panfrost/midgard/midgard_ops.c b/src/panfrost/midgard/midgard_ops.c
index e490c03da73facbb4f885e929cfe57edcea15a63..d4a74dc0fb44aa12647b33e3a478bb1d25616f78 100644 (file)
--- a/src/panfrost/midgard/midgard_ops.c
+++ b/src/panfrost/midgard/midgard_ops.c
@@ -172,70 +172,82 @@ struct mir_op_props alu_opcode_props[256] = {
         [midgard_alu_op_freduce]        = {"freduce", 0},
 };
 
-const char *load_store_opcode_names[256] = {
-        [midgard_op_ld_cubemap_coords] = "ld_cubemap_coords",
-        [midgard_op_ld_compute_id] = "ld_compute_id",
-        [midgard_op_ldst_perspective_division_z] = "ldst_perspective_division_z",
-        [midgard_op_ldst_perspective_division_w] = "ldst_perspective_division_w",
-
-        [midgard_op_atomic_add] = "atomic_add",
-        [midgard_op_atomic_and] = "atomic_and",
-        [midgard_op_atomic_or] = "atomic_or",
-        [midgard_op_atomic_xor] = "atomic_xor",
-        [midgard_op_atomic_imin] = "atomic_imin",
-        [midgard_op_atomic_umin] = "atomic_umin",
-        [midgard_op_atomic_imax] = "atomic_imax",
-        [midgard_op_atomic_umax] = "atomic_umax",
-        [midgard_op_atomic_xchg] = "atomic_xchg",
-
-        [midgard_op_atomic_add64] = "atomic_add64",
-        [midgard_op_atomic_and64] = "atomic_and64",
-        [midgard_op_atomic_or64] = "atomic_or64",
-        [midgard_op_atomic_xor64] = "atomic_xor64",
-        [midgard_op_atomic_imin64] = "atomic_imin64",
-        [midgard_op_atomic_umin64] = "atomic_umin64",
-        [midgard_op_atomic_imax64] = "atomic_imax64",
-        [midgard_op_atomic_umax64] = "atomic_umax64",
-        [midgard_op_atomic_xchg64] = "atomic_xchg64",
-
-        [midgard_op_ld_char] = "ld_char",
-        [midgard_op_ld_char2] = "ld_char2",
-        [midgard_op_ld_short] = "ld_short",
-        [midgard_op_ld_char4] = "ld_char4",
-        [midgard_op_ld_short4] = "ld_short4",
-        [midgard_op_ld_int4] = "ld_int4",
-
-        [midgard_op_ld_attr_32] = "ld_attr_32",
-        [midgard_op_ld_attr_16] = "ld_attr_16",
-        [midgard_op_ld_attr_32i] = "ld_attr_32i",
-        [midgard_op_ld_attr_32u] = "ld_attr_32u",
-
-        [midgard_op_ld_vary_32] = "ld_vary_32",
-        [midgard_op_ld_vary_16] = "ld_vary_16",
-        [midgard_op_ld_vary_32i] = "ld_vary_32i",
-        [midgard_op_ld_vary_32u] = "ld_vary_32u",
-
-        [midgard_op_ld_color_buffer_8] = "ld_color_buffer_8",
-        [midgard_op_ld_color_buffer_16] = "ld_color_buffer_16",
-
-        [midgard_op_ld_ubo_char] = "ld_ubo_char",
-        [midgard_op_ld_ubo_char2] = "ld_ubo_char2",
-        [midgard_op_ld_ubo_char4] = "ld_ubo_char4",
-        [midgard_op_ld_ubo_short4] = "ld_ubo_short4",
-        [midgard_op_ld_ubo_int4] = "ld_ubo_int4",
-
-        [midgard_op_st_char] = "st_char",
-        [midgard_op_st_char2] = "st_char2",
-        [midgard_op_st_char4] = "st_char4",
-        [midgard_op_st_short4] = "st_short4",
-        [midgard_op_st_int4] = "st_int4",
-
-        [midgard_op_st_vary_32] = "st_vary_32",
-        [midgard_op_st_vary_16] = "st_vary_16",
-        [midgard_op_st_vary_32i] = "st_vary_32i",
-        [midgard_op_st_vary_32u] = "st_vary_32u",
-
-        [midgard_op_st_image_f] = "st_image_f",
-        [midgard_op_st_image_ui] = "st_image_ui",
-        [midgard_op_st_image_i] = "st_image_i",
+/* Define shorthands */
+
+#define M8  midgard_reg_mode_8
+#define M16 midgard_reg_mode_16
+#define M32 midgard_reg_mode_32
+#define M64 midgard_reg_mode_64
+
+struct mir_ldst_op_props load_store_opcode_props[256] = {
+        [midgard_op_ld_cubemap_coords] = {"ld_cubemap_coords", M32},
+        [midgard_op_ld_compute_id] = {"ld_compute_id", M32},
+        [midgard_op_ldst_perspective_division_z] = {"ldst_perspective_division_z", M32},
+        [midgard_op_ldst_perspective_division_w] = {"ldst_perspective_division_w", M32},
+
+        [midgard_op_atomic_add]  = {"atomic_add",  M32 | LDST_SIDE_FX},
+        [midgard_op_atomic_and]  = {"atomic_and",  M32 | LDST_SIDE_FX},
+        [midgard_op_atomic_or]   = {"atomic_or",   M32 | LDST_SIDE_FX},
+        [midgard_op_atomic_xor]  = {"atomic_xor",  M32 | LDST_SIDE_FX},
+        [midgard_op_atomic_imin] = {"atomic_imin", M32 | LDST_SIDE_FX},
+        [midgard_op_atomic_umin] = {"atomic_umin", M32 | LDST_SIDE_FX},
+        [midgard_op_atomic_imax] = {"atomic_imax", M32 | LDST_SIDE_FX},
+        [midgard_op_atomic_umax] = {"atomic_umax", M32 | LDST_SIDE_FX},
+        [midgard_op_atomic_xchg] = {"atomic_xchg", M32 | LDST_SIDE_FX},
+
+        [midgard_op_atomic_add64]  = {"atomic_add64",  M64 | LDST_SIDE_FX},
+        [midgard_op_atomic_and64]  = {"atomic_and64",  M64 | LDST_SIDE_FX},
+        [midgard_op_atomic_or64]   = {"atomic_or64",   M64 | LDST_SIDE_FX},
+        [midgard_op_atomic_xor64]  = {"atomic_xor64",  M64 | LDST_SIDE_FX},
+        [midgard_op_atomic_imin64] = {"atomic_imin64", M64 | LDST_SIDE_FX},
+        [midgard_op_atomic_umin64] = {"atomic_umin64", M64 | LDST_SIDE_FX},
+        [midgard_op_atomic_imax64] = {"atomic_imax64", M64 | LDST_SIDE_FX},
+        [midgard_op_atomic_umax64] = {"atomic_umax64", M64 | LDST_SIDE_FX},
+        [midgard_op_atomic_xchg64] = {"atomic_xchg64", M64 | LDST_SIDE_FX},
+
+        [midgard_op_ld_char]   = {"ld_char",   M32},
+        [midgard_op_ld_char2]  = {"ld_char2",  M16},
+        [midgard_op_ld_short]  = {"ld_short",  M32},
+        [midgard_op_ld_char4]  = {"ld_char4",  M32},
+        [midgard_op_ld_short4] = {"ld_short4", M32},
+        [midgard_op_ld_int4]   = {"ld_int4",   M32},
+
+        [midgard_op_ld_attr_32]  = {"ld_attr_32",  M32},
+        [midgard_op_ld_attr_32i] = {"ld_attr_32i", M32},
+        [midgard_op_ld_attr_32u] = {"ld_attr_32u", M32},
+        [midgard_op_ld_attr_16]  = {"ld_attr_16",  M32},
+
+        [midgard_op_ld_vary_32]  = {"ld_vary_32",  M32},
+        [midgard_op_ld_vary_16]  = {"ld_vary_16",  M32},
+        [midgard_op_ld_vary_32i] = {"ld_vary_32i", M32},
+        [midgard_op_ld_vary_32u] = {"ld_vary_32u", M32},
+
+        [midgard_op_ld_color_buffer_8]  = {"ld_color_buffer_8",  M8 | LDST_SPECIAL_MASK},
+        [midgard_op_ld_color_buffer_16] = {"ld_color_buffer_16", 0},
+
+        [midgard_op_ld_ubo_char]   = {"ld_ubo_char",   M32},
+        [midgard_op_ld_ubo_char2]  = {"ld_ubo_char2",  M16},
+        [midgard_op_ld_ubo_char4]  = {"ld_ubo_char4",  M32},
+        [midgard_op_ld_ubo_short4] = {"ld_ubo_short4", M32},
+        [midgard_op_ld_ubo_int4]   = {"ld_ubo_int4",   M32},
+
+        [midgard_op_st_char]   = {"st_char",   M32 | LDST_STORE},
+        [midgard_op_st_char2]  = {"st_char2",  M16 | LDST_STORE},
+        [midgard_op_st_char4]  = {"st_char4",  M32 | LDST_STORE},
+        [midgard_op_st_short4] = {"st_short4", M32 | LDST_STORE},
+        [midgard_op_st_int4]   = {"st_int4",   M32 | LDST_STORE},
+
+        [midgard_op_st_vary_32]  = {"st_vary_32",  M32 | LDST_STORE},
+        [midgard_op_st_vary_32i] = {"st_vary_32i", M32 | LDST_STORE},
+        [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},
 };
+
+#undef M8
+#undef M16
+#undef M32
+#undef M64

diff --git a/src/panfrost/midgard/midgard_ops.h b/src/panfrost/midgard/midgard_ops.h
index 64c91a5bcac57d399230005f5f1046b79a8b7728..3e9fff44836f7c05218294ec4d5eaee1d5b0d6fb 100644 (file)
--- a/src/panfrost/midgard/midgard_ops.h
+++ b/src/panfrost/midgard/midgard_ops.h
@@ -24,7 +24,7 @@
 /* Forward declare */
 
 extern struct mir_op_props alu_opcode_props[256];
-extern const char *load_store_opcode_names[256];
+extern struct mir_ldst_op_props load_store_opcode_props[256];
 
 /* Is this opcode that of an integer (regardless of signedness)? Instruction
  * names authoritatively determine types */

diff --git a/src/panfrost/midgard/midgard_print.c b/src/panfrost/midgard/midgard_print.c
index 7f0269c8ca022e9e0f2b32d5f4cb4e041682a50e..8eedcda53159f342199ee77aaaf24a8365ea6011 100644 (file)
--- a/src/panfrost/midgard/midgard_print.c
+++ b/src/panfrost/midgard/midgard_print.c
@@ -115,7 +115,7 @@ mir_print_instruction(midgard_instruction *ins)
 
         case TAG_LOAD_STORE_4: {
                 midgard_load_store_op op = ins->load_store.op;
-                const char *name = load_store_opcode_names[op];
+                const char *name = load_store_opcode_props[op].name;
 
                 assert(name);
                 printf("%s", name);