Mesa (master): freedreno/ir3: cleanup instruction builder macros
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Apr 25 22:12:34 UTC 2019
Module: Mesa
Branch: master
Commit: 6d6ec2d4d2c75c7b0b0de759437bff75441fa302
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6d6ec2d4d2c75c7b0b0de759437bff75441fa302
Author: Rob Clark <robdclark at chromium.org>
Date: Fri Apr 5 18:21:05 2019 -0400
freedreno/ir3: cleanup instruction builder macros
De-duplicate the "normal" and "flags" versions of the macros, and while
at it go ahead and add "flags" versions for all the remaining macros,
since we'll at least need INSTR1F in a following commit.
Signed-off-by: Rob Clark <robdclark at chromium.org>
---
src/freedreno/ir3/ir3.h | 73 ++++++++++++++++++-------------------------------
1 file changed, 27 insertions(+), 46 deletions(-)
diff --git a/src/freedreno/ir3/ir3.h b/src/freedreno/ir3/ir3.h
index 8f58d67fb94..5b3544c3542 100644
--- a/src/freedreno/ir3/ir3.h
+++ b/src/freedreno/ir3/ir3.h
@@ -1141,42 +1141,53 @@ ir3_NOP(struct ir3_block *block)
return ir3_instr_create(block, OPC_NOP);
}
-#define INSTR0(name) \
+#define IR3_INSTR_0 0
+
+#define __INSTR0(flag, name, opc) \
static inline struct ir3_instruction * \
ir3_##name(struct ir3_block *block) \
{ \
struct ir3_instruction *instr = \
- ir3_instr_create(block, OPC_##name); \
+ ir3_instr_create(block, opc); \
+ instr->flags |= flag; \
return instr; \
}
+#define INSTR0F(f, name) __INSTR0(IR3_INSTR_##f, name##_##f, OPC_##name)
+#define INSTR0(name) __INSTR0(0, name, OPC_##name)
-#define INSTR1(name) \
+#define __INSTR1(flag, name, opc) \
static inline struct ir3_instruction * \
ir3_##name(struct ir3_block *block, \
struct ir3_instruction *a, unsigned aflags) \
{ \
struct ir3_instruction *instr = \
- ir3_instr_create(block, OPC_##name); \
+ ir3_instr_create(block, opc); \
ir3_reg_create(instr, 0, 0); /* dst */ \
__ssa_src(instr, a, aflags); \
+ instr->flags |= flag; \
return instr; \
}
+#define INSTR1F(f, name) __INSTR1(IR3_INSTR_##f, name##_##f, OPC_##name)
+#define INSTR1(name) __INSTR1(0, name, OPC_##name)
-#define INSTR2(name) \
+#define __INSTR2(flag, name, opc) \
static inline struct ir3_instruction * \
ir3_##name(struct ir3_block *block, \
struct ir3_instruction *a, unsigned aflags, \
struct ir3_instruction *b, unsigned bflags) \
{ \
struct ir3_instruction *instr = \
- ir3_instr_create(block, OPC_##name); \
+ ir3_instr_create(block, opc); \
ir3_reg_create(instr, 0, 0); /* dst */ \
__ssa_src(instr, a, aflags); \
__ssa_src(instr, b, bflags); \
+ instr->flags |= flag; \
return instr; \
}
+#define INSTR2F(f, name) __INSTR2(IR3_INSTR_##f, name##_##f, OPC_##name)
+#define INSTR2(name) __INSTR2(0, name, OPC_##name)
-#define INSTR3(name) \
+#define __INSTR3(flag, name, opc) \
static inline struct ir3_instruction * \
ir3_##name(struct ir3_block *block, \
struct ir3_instruction *a, unsigned aflags, \
@@ -1184,32 +1195,18 @@ ir3_##name(struct ir3_block *block, \
struct ir3_instruction *c, unsigned cflags) \
{ \
struct ir3_instruction *instr = \
- ir3_instr_create(block, OPC_##name); \
+ ir3_instr_create2(block, opc, 4); \
ir3_reg_create(instr, 0, 0); /* dst */ \
__ssa_src(instr, a, aflags); \
__ssa_src(instr, b, bflags); \
__ssa_src(instr, c, cflags); \
+ instr->flags |= flag; \
return instr; \
}
+#define INSTR3F(f, name) __INSTR3(IR3_INSTR_##f, name##_##f, OPC_##name)
+#define INSTR3(name) __INSTR3(0, name, OPC_##name)
-#define INSTR3F(f, name) \
-static inline struct ir3_instruction * \
-ir3_##name##_##f(struct ir3_block *block, \
- struct ir3_instruction *a, unsigned aflags, \
- struct ir3_instruction *b, unsigned bflags, \
- struct ir3_instruction *c, unsigned cflags) \
-{ \
- struct ir3_instruction *instr = \
- ir3_instr_create2(block, OPC_##name, 5); \
- ir3_reg_create(instr, 0, 0); /* dst */ \
- __ssa_src(instr, a, aflags); \
- __ssa_src(instr, b, bflags); \
- __ssa_src(instr, c, cflags); \
- instr->flags |= IR3_INSTR_##f; \
- return instr; \
-}
-
-#define INSTR4(name) \
+#define __INSTR4(flag, name, opc) \
static inline struct ir3_instruction * \
ir3_##name(struct ir3_block *block, \
struct ir3_instruction *a, unsigned aflags, \
@@ -1218,33 +1215,17 @@ ir3_##name(struct ir3_block *block, \
struct ir3_instruction *d, unsigned dflags) \
{ \
struct ir3_instruction *instr = \
- ir3_instr_create2(block, OPC_##name, 5); \
- ir3_reg_create(instr, 0, 0); /* dst */ \
- __ssa_src(instr, a, aflags); \
- __ssa_src(instr, b, bflags); \
- __ssa_src(instr, c, cflags); \
- __ssa_src(instr, d, dflags); \
- return instr; \
-}
-
-#define INSTR4F(f, name) \
-static inline struct ir3_instruction * \
-ir3_##name##_##f(struct ir3_block *block, \
- struct ir3_instruction *a, unsigned aflags, \
- struct ir3_instruction *b, unsigned bflags, \
- struct ir3_instruction *c, unsigned cflags, \
- struct ir3_instruction *d, unsigned dflags) \
-{ \
- struct ir3_instruction *instr = \
- ir3_instr_create2(block, OPC_##name, 5); \
+ ir3_instr_create2(block, opc, 5); \
ir3_reg_create(instr, 0, 0); /* dst */ \
__ssa_src(instr, a, aflags); \
__ssa_src(instr, b, bflags); \
__ssa_src(instr, c, cflags); \
__ssa_src(instr, d, dflags); \
- instr->flags |= IR3_INSTR_##f; \
+ instr->flags |= flag; \
return instr; \
}
+#define INSTR4F(f, name) __INSTR4(IR3_INSTR_##f, name##_##f, OPC_##name)
+#define INSTR4(name) __INSTR4(0, name, OPC_##name)
/* cat0 instructions: */
INSTR0(BR)
More information about the mesa-commit
mailing list