freedreno/ir3: add helpers to move instructions

[mesa.git] / src / freedreno / ir3 / ir3_group.c

diff --git a/src/freedreno/ir3/ir3_group.c b/src/freedreno/ir3/ir3_group.c
index c9859197a1e73118b4d4d2d36cc82320995142c4..61ecd5320b315f3f494fcae501ffd5c575ea1c29 100644 (file)
--- a/src/freedreno/ir3/ir3_group.c
+++ b/src/freedreno/ir3/ir3_group.c
@@ -34,7 +34,9 @@ static void
 insert_mov(struct ir3_instruction *collect, int idx)
 {
        struct ir3_instruction *src = ssa(collect->regs[idx+1]);
-       struct ir3_instruction *mov = ir3_MOV(src->block, src, TYPE_F32);
+       struct ir3_instruction *mov = ir3_MOV(src->block, src,
+               (collect->regs[idx+1]->flags & IR3_REG_HALF) ? TYPE_U16 : TYPE_U32);
+
        collect->regs[idx+1]->instr = mov;
 
        /* if collect and src are in the same block, move the inserted mov
@@ -42,8 +44,7 @@ insert_mov(struct ir3_instruction *collect, int idx)
         * it should be safe to leave at the end of the block it is in:
         */
        if (src->block == collect->block) {
-               list_delinit(&mov->node);
-               list_addtail(&mov->node, &collect->node);
+               ir3_instr_move_before(mov, collect);
        }
 }
 
@@ -142,7 +143,6 @@ restart:
 static bool
 instr_find_neighbors(struct ir3_instruction *instr)
 {
-       struct ir3_instruction *src;
        bool progress = false;
 
        if (ir3_instr_check_mark(instr))
@@ -165,7 +165,6 @@ find_neighbors(struct ir3 *ir)
        bool progress = false;
        unsigned i;
 
-       struct ir3_instruction *out;
        foreach_output (out, ir)
                progress |= instr_find_neighbors(out);