r600g: Split r600_bc_alu_src.

The r600_bc_alu_src structure is used in two different ways, as a vector and
for the individual channels of that same vector. This is somewhat fragile,
and probably confusing.

diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index 46d7fc3..49e4866 100644 (file)
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -848,7 +848,7 @@ static int r600_bc_alu_nliterals(struct r600_bc *bc, struct r600_bc_alu *alu,
 
        for (i = 0; i < num_src; ++i) {
                if (alu->src[i].sel == V_SQ_ALU_SRC_LITERAL) {
-                       uint32_t value = alu->src[i].value[alu->src[i].chan];
+                       uint32_t value = alu->src[i].value;
                        unsigned found = 0;
                        for (j = 0; j < *nliteral; ++j) {
                                if (literal[j] == value) {
@@ -875,7 +875,7 @@ static void r600_bc_alu_adjust_literals(struct r600_bc *bc,
 
        for (i = 0; i < num_src; ++i) {
                if (alu->src[i].sel == V_SQ_ALU_SRC_LITERAL) {
-                       uint32_t value = alu->src[i].value[alu->src[i].chan];
+                       uint32_t value = alu->src[i].value;
                        for (j = 0; j < nliteral; ++j) {
                                if (literal[j] == value) {
                                        alu->src[i].chan = j;
@@ -1178,8 +1178,7 @@ int r600_bc_add_alu_type(struct r600_bc *bc, const struct r600_bc_alu *alu, int
                        bc->ngpr = nalu->src[i].sel + 1;
                }
                if (nalu->src[i].sel == V_SQ_ALU_SRC_LITERAL)
-                       r600_bc_special_constants(
-                               nalu->src[i].value[nalu->src[i].chan],
+                       r600_bc_special_constants(nalu->src[i].value,
                                &nalu->src[i].sel, &nalu->src[i].neg);
        }
        if (nalu->dst.sel >= bc->ngpr) {

diff --git a/src/gallium/drivers/r600/r600_asm.h b/src/gallium/drivers/r600/r600_asm.h
index 82456d9..921d0d9 100644 (file)
--- a/src/gallium/drivers/r600/r600_asm.h
+++ b/src/gallium/drivers/r600/r600_asm.h
@@ -34,7 +34,7 @@ struct r600_bc_alu_src {
        unsigned                        neg;
        unsigned                        abs;
        unsigned                        rel;
-       uint32_t                        value[4];
+       uint32_t                        value;
 };
 
 struct r600_bc_alu_dst {

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 2194c17..abb9ee0 100644 (file)
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -280,6 +280,15 @@ void r600_pipe_shader_destroy(struct pipe_context *ctx, struct r600_pipe_shader
  */
 struct r600_shader_tgsi_instruction;
 
+struct r600_shader_src {
+       unsigned                                sel;
+       unsigned                                swizzle[4];
+       unsigned                                neg;
+       unsigned                                abs;
+       unsigned                                rel;
+       uint32_t                                value[4];
+};
+
 struct r600_shader_ctx {
        struct tgsi_shader_info                 info;
        struct tgsi_parse_context               parse;
@@ -755,11 +764,27 @@ static int tgsi_end(struct r600_shader_ctx *ctx)
        return 0;
 }
 
+static void r600_bc_src(struct r600_bc_alu_src *bc_src,
+                       const struct r600_shader_src *shader_src,
+                       unsigned chan)
+{
+       bc_src->sel = shader_src->sel;
+       bc_src->chan = shader_src->swizzle[chan];
+       bc_src->neg = shader_src->neg;
+       bc_src->abs = shader_src->abs;
+       bc_src->rel = shader_src->rel;
+       bc_src->value = shader_src->value[bc_src->chan];
+}
+
 static void tgsi_src(struct r600_shader_ctx *ctx,
                     const struct tgsi_full_src_register *tgsi_src,
-                    struct r600_bc_alu_src *r600_src)
+                    struct r600_shader_src *r600_src)
 {
-       memset(r600_src, 0, sizeof(struct r600_bc_alu_src));
+       memset(r600_src, 0, sizeof(*r600_src));
+       r600_src->swizzle[0] = tgsi_src->Register.SwizzleX;
+       r600_src->swizzle[1] = tgsi_src->Register.SwizzleY;
+       r600_src->swizzle[2] = tgsi_src->Register.SwizzleZ;
+       r600_src->swizzle[3] = tgsi_src->Register.SwizzleW;
        r600_src->neg = tgsi_src->Register.Negate;
        r600_src->abs = tgsi_src->Register.Absolute;
        if (tgsi_src->Register.File == TGSI_FILE_IMMEDIATE) {
@@ -802,23 +827,7 @@ static void tgsi_dst(struct r600_shader_ctx *ctx,
        }
 }
 
-static unsigned tgsi_chan(const struct tgsi_full_src_register *tgsi_src, unsigned swizzle)
-{
-       switch (swizzle) {
-       case 0:
-               return tgsi_src->Register.SwizzleX;
-       case 1:
-               return tgsi_src->Register.SwizzleY;
-       case 2:
-               return tgsi_src->Register.SwizzleZ;
-       case 3:
-               return tgsi_src->Register.SwizzleW;
-       default:
-               return 0;
-       }
-}
-
-static int tgsi_split_constant(struct r600_shader_ctx *ctx, struct r600_bc_alu_src r600_src[3])
+static int tgsi_split_constant(struct r600_shader_ctx *ctx, struct r600_shader_src r600_src[3])
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
        struct r600_bc_alu alu;
@@ -857,7 +866,7 @@ static int tgsi_split_constant(struct r600_shader_ctx *ctx, struct r600_bc_alu_s
 }
 
 /* need to move any immediate into a temp - for trig functions which use literal for PI stuff */
-static int tgsi_split_literal_constant(struct r600_shader_ctx *ctx, struct r600_bc_alu_src r600_src[3])
+static int tgsi_split_literal_constant(struct r600_shader_ctx *ctx, struct r600_shader_src r600_src[3])
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
        struct r600_bc_alu alu;
@@ -876,7 +885,7 @@ static int tgsi_split_literal_constant(struct r600_shader_ctx *ctx, struct r600_
                                alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV);
                                alu.src[0].sel = r600_src[i].sel;
                                alu.src[0].chan = k;
-                               alu.src[0].value[k] = r600_src[i].value[k];
+                               alu.src[0].value = r600_src[i].value[k];
                                alu.dst.sel = treg;
                                alu.dst.chan = k;
                                alu.dst.write = 1;
@@ -908,7 +917,7 @@ static int tgsi_last_instruction(unsigned writemask)
 static int tgsi_op2_s(struct r600_shader_ctx *ctx, int swap)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
-       struct r600_bc_alu_src r600_src[3];
+       struct r600_shader_src r600_src[3];
        struct r600_bc_alu alu;
        int i, j, r;
        int lasti = tgsi_last_instruction(inst->Dst[0].Register.WriteMask);
@@ -929,15 +938,11 @@ static int tgsi_op2_s(struct r600_shader_ctx *ctx, int swap)
                alu.inst = ctx->inst_info->r600_opcode;
                if (!swap) {
                        for (j = 0; j < inst->Instruction.NumSrcRegs; j++) {
-                               alu.src[j] = r600_src[j];
-                               alu.src[j].chan = tgsi_chan(&inst->Src[j], i);
+                               r600_bc_src(&alu.src[j], &r600_src[j], i);
                        }
                } else {
-                       alu.src[0] = r600_src[1];
-                       alu.src[0].chan = tgsi_chan(&inst->Src[1], i);
-
-                       alu.src[1] = r600_src[0];
-                       alu.src[1].chan = tgsi_chan(&inst->Src[0], i);
+                       r600_bc_src(&alu.src[0], &r600_src[1], i);
+                       r600_bc_src(&alu.src[1], &r600_src[0], i);
                }
                /* handle some special cases */
                switch (ctx->inst_info->tgsi_opcode) {
@@ -976,13 +981,12 @@ static int tgsi_op2_swap(struct r600_shader_ctx *ctx)
  * see fdo bug 27901
  */
 static int tgsi_setup_trig(struct r600_shader_ctx *ctx,
-                          struct r600_bc_alu_src r600_src[3])
+                          struct r600_shader_src r600_src[3])
 {
        static float half_inv_pi = 1.0 /(3.1415926535 * 2);
        static float double_pi = 3.1415926535 * 2;
        static float neg_pi = -3.1415926535;
 
-       struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
        int r;
        struct r600_bc_alu alu;
 
@@ -1001,12 +1005,11 @@ static int tgsi_setup_trig(struct r600_shader_ctx *ctx,
        alu.dst.sel = ctx->temp_reg;
        alu.dst.write = 1;
 
-       alu.src[0] = r600_src[0];
-       alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+       r600_bc_src(&alu.src[0], &r600_src[0], 0);
 
        alu.src[1].sel = V_SQ_ALU_SRC_LITERAL;
        alu.src[1].chan = 0;
-       alu.src[1].value[0] = *(uint32_t *)&half_inv_pi;
+       alu.src[1].value = *(uint32_t *)&half_inv_pi;
        alu.src[2].sel = V_SQ_ALU_SRC_0_5;
        alu.src[2].chan = 0;
        alu.last = 1;
@@ -1045,8 +1048,8 @@ static int tgsi_setup_trig(struct r600_shader_ctx *ctx,
        alu.src[2].chan = 0;
 
        if (ctx->bc->chiprev == CHIPREV_R600) {
-               alu.src[1].value[0] = *(uint32_t *)&double_pi;
-               alu.src[2].value[0] = *(uint32_t *)&neg_pi;
+               alu.src[1].value = *(uint32_t *)&double_pi;
+               alu.src[2].value = *(uint32_t *)&neg_pi;
        } else {
                alu.src[1].sel = V_SQ_ALU_SRC_1;
                alu.src[2].sel = V_SQ_ALU_SRC_0_5;
@@ -1063,7 +1066,7 @@ static int tgsi_setup_trig(struct r600_shader_ctx *ctx,
 static int tgsi_trig(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
-       struct r600_bc_alu_src r600_src[3];
+       struct r600_shader_src r600_src[3];
        struct r600_bc_alu alu;
        int i, r;
        int lasti = tgsi_last_instruction(inst->Dst[0].Register.WriteMask);
@@ -1107,7 +1110,7 @@ static int tgsi_trig(struct r600_shader_ctx *ctx)
 static int tgsi_scs(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
-       struct r600_bc_alu_src r600_src[3];
+       struct r600_shader_src r600_src[3];
        struct r600_bc_alu alu;
        int r;
 
@@ -1205,8 +1208,9 @@ static int tgsi_kill(struct r600_shader_ctx *ctx)
                        alu.src[1].sel = V_SQ_ALU_SRC_1;
                        alu.src[1].neg = 1;
                } else {
-                       tgsi_src(ctx, &inst->Src[0], &alu.src[1]);
-                       alu.src[1].chan = tgsi_chan(&inst->Src[0], i);
+                       struct r600_shader_src r600_src;
+                       tgsi_src(ctx, &inst->Src[0], &r600_src);
+                       r600_bc_src(&alu.src[1], &r600_src, i);
                }
                if (i == 3) {
                        alu.last = 1;
@@ -1225,8 +1229,8 @@ static int tgsi_kill(struct r600_shader_ctx *ctx)
 static int tgsi_lit(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_shader_src r600_src[3];
        struct r600_bc_alu alu;
-       struct r600_bc_alu_src r600_src[3];
        int r;
 
        r = tgsi_split_constant(ctx, r600_src);
@@ -1250,7 +1254,7 @@ static int tgsi_lit(struct r600_shader_ctx *ctx)
        /* dst.y = max(src.x, 0.0) */
        memset(&alu, 0, sizeof(struct r600_bc_alu));
        alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MAX);
-       alu.src[0] = r600_src[0];
+       r600_bc_src(&alu.src[0], &r600_src[0], 0);
        alu.src[1].sel  = V_SQ_ALU_SRC_0; /*0.0*/
        alu.src[1].chan = 0;
        tgsi_dst(ctx, &inst->Dst[0], 1, &alu.dst);
@@ -1279,8 +1283,7 @@ static int tgsi_lit(struct r600_shader_ctx *ctx)
                /* dst.z = log(src.y) */
                memset(&alu, 0, sizeof(struct r600_bc_alu));
                alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_LOG_CLAMPED);
-               alu.src[0] = r600_src[0];
-               alu.src[0].chan = tgsi_chan(&inst->Src[0], 1);
+               r600_bc_src(&alu.src[0], &r600_src[0], 1);
                tgsi_dst(ctx, &inst->Dst[0], 2, &alu.dst);
                alu.last = 1;
                r = r600_bc_add_alu(ctx->bc, &alu);
@@ -1293,13 +1296,11 @@ static int tgsi_lit(struct r600_shader_ctx *ctx)
                /* tmp.x = amd MUL_LIT(src.w, dst.z, src.x ) */
                memset(&alu, 0, sizeof(struct r600_bc_alu));
                alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP3_SQ_OP3_INST_MUL_LIT);
-               alu.src[0] = r600_src[0];
-               alu.src[0].chan = tgsi_chan(&inst->Src[0], 3);
+               r600_bc_src(&alu.src[0], &r600_src[0], 3);
                alu.src[1].sel  = sel;
                alu.src[1].chan = chan;
 
-               alu.src[2] = r600_src[0];
-               alu.src[2].chan = tgsi_chan(&inst->Src[0], 0);
+               r600_bc_src(&alu.src[2], &r600_src[0], 0);
                alu.dst.sel = ctx->temp_reg;
                alu.dst.chan = 0;
                alu.dst.write = 1;
@@ -1338,8 +1339,10 @@ static int tgsi_rsq(struct r600_shader_ctx *ctx)
        alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_RECIPSQRT_CLAMPED);
 
        for (i = 0; i < inst->Instruction.NumSrcRegs; i++) {
-               tgsi_src(ctx, &inst->Src[i], &alu.src[i]);
-               alu.src[i].chan = tgsi_chan(&inst->Src[i], 0);
+               struct r600_shader_src r600_src;
+
+               tgsi_src(ctx, &inst->Src[i], &r600_src);
+               r600_bc_src(&alu.src[i], &r600_src, 0);
                alu.src[i].abs = 1;
        }
        alu.dst.sel = ctx->temp_reg;
@@ -1377,14 +1380,15 @@ static int tgsi_helper_tempx_replicate(struct r600_shader_ctx *ctx)
 static int tgsi_trans_srcx_replicate(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_shader_src r600_src;
        struct r600_bc_alu alu;
        int i, r;
 
        memset(&alu, 0, sizeof(struct r600_bc_alu));
        alu.inst = ctx->inst_info->r600_opcode;
        for (i = 0; i < inst->Instruction.NumSrcRegs; i++) {
-               tgsi_src(ctx, &inst->Src[i], &alu.src[i]);
-               alu.src[i].chan = tgsi_chan(&inst->Src[i], 0);
+               tgsi_src(ctx, &inst->Src[i], &r600_src);
+               r600_bc_src(&alu.src[i], &r600_src, 0);
        }
        alu.dst.sel = ctx->temp_reg;
        alu.dst.write = 1;
@@ -1399,14 +1403,17 @@ static int tgsi_trans_srcx_replicate(struct r600_shader_ctx *ctx)
 static int tgsi_pow(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_shader_src r600_src[2];
        struct r600_bc_alu alu;
        int r;
 
+       tgsi_src(ctx, &inst->Src[0], &r600_src[0]);
+       tgsi_src(ctx, &inst->Src[1], &r600_src[1]);
+
        /* LOG2(a) */
        memset(&alu, 0, sizeof(struct r600_bc_alu));
        alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_LOG_IEEE);
-       tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
-       alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+       r600_bc_src(&alu.src[0], &r600_src[0], 0);
        alu.dst.sel = ctx->temp_reg;
        alu.dst.write = 1;
        alu.last = 1;
@@ -1416,8 +1423,7 @@ static int tgsi_pow(struct r600_shader_ctx *ctx)
        /* b * LOG2(a) */
        memset(&alu, 0, sizeof(struct r600_bc_alu));
        alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL);
-       tgsi_src(ctx, &inst->Src[1], &alu.src[0]);
-       alu.src[0].chan = tgsi_chan(&inst->Src[1], 0);
+       r600_bc_src(&alu.src[0], &r600_src[1], 0);
        alu.src[1].sel = ctx->temp_reg;
        alu.dst.sel = ctx->temp_reg;
        alu.dst.write = 1;
@@ -1441,8 +1447,8 @@ static int tgsi_pow(struct r600_shader_ctx *ctx)
 static int tgsi_ssg(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_shader_src r600_src[3];
        struct r600_bc_alu alu;
-       struct r600_bc_alu_src r600_src[3];
        int i, r;
 
        r = tgsi_split_constant(ctx, r600_src);
@@ -1461,13 +1467,10 @@ static int tgsi_ssg(struct r600_shader_ctx *ctx)
                alu.dst.sel = ctx->temp_reg;
                alu.dst.chan = i;
 
-               alu.src[0] = r600_src[0];
-               alu.src[0].chan = tgsi_chan(&inst->Src[0], i);
-
+               r600_bc_src(&alu.src[0], &r600_src[0], i);
                alu.src[1].sel = V_SQ_ALU_SRC_1;
+               r600_bc_src(&alu.src[2], &r600_src[0], i);
 
-               alu.src[2] = r600_src[0];
-               alu.src[2].chan = tgsi_chan(&inst->Src[0], i);
                if (i == 3)
                        alu.last = 1;
                r = r600_bc_add_alu(ctx->bc, &alu);
@@ -1530,7 +1533,7 @@ static int tgsi_helper_copy(struct r600_shader_ctx *ctx, struct tgsi_full_instru
 static int tgsi_op3(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
-       struct r600_bc_alu_src r600_src[3];
+       struct r600_shader_src r600_src[3];
        struct r600_bc_alu alu;
        int i, j, r;
        int lasti = tgsi_last_instruction(inst->Dst[0].Register.WriteMask);
@@ -1548,8 +1551,7 @@ static int tgsi_op3(struct r600_shader_ctx *ctx)
                memset(&alu, 0, sizeof(struct r600_bc_alu));
                alu.inst = ctx->inst_info->r600_opcode;
                for (j = 0; j < inst->Instruction.NumSrcRegs; j++) {
-                       alu.src[j] = r600_src[j];
-                       alu.src[j].chan = tgsi_chan(&inst->Src[j], i);
+                       r600_bc_src(&alu.src[j], &r600_src[j], i);
                }
 
                tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
@@ -1569,7 +1571,7 @@ static int tgsi_op3(struct r600_shader_ctx *ctx)
 static int tgsi_dp(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
-       struct r600_bc_alu_src r600_src[3];
+       struct r600_shader_src r600_src[3];
        struct r600_bc_alu alu;
        int i, j, r;
 
@@ -1583,8 +1585,7 @@ static int tgsi_dp(struct r600_shader_ctx *ctx)
                memset(&alu, 0, sizeof(struct r600_bc_alu));
                alu.inst = ctx->inst_info->r600_opcode;
                for (j = 0; j < inst->Instruction.NumSrcRegs; j++) {
-                       alu.src[j] = r600_src[j];
-                       alu.src[j].chan = tgsi_chan(&inst->Src[j], i);
+                       r600_bc_src(&alu.src[j], &r600_src[j], i);
                }
 
                tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
@@ -1640,12 +1641,14 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
        src_gpr = ctx->file_offset[inst->Src[0].Register.File] + inst->Src[0].Register.Index;
 
        if (inst->Instruction.Opcode == TGSI_OPCODE_TXP) {
+               struct r600_shader_src r600_src;
+
                /* Add perspective divide */
                memset(&alu, 0, sizeof(struct r600_bc_alu));
                alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_RECIP_IEEE);
-               tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
+               tgsi_src(ctx, &inst->Src[0], &r600_src);
+               r600_bc_src(&alu.src[0], &r600_src, 3);
 
-               alu.src[0].chan = tgsi_chan(&inst->Src[0], 3);
                alu.dst.sel = ctx->temp_reg;
                alu.dst.chan = 3;
                alu.last = 1;
@@ -1659,8 +1662,7 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
                        alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL);
                        alu.src[0].sel = ctx->temp_reg;
                        alu.src[0].chan = 3;
-                       tgsi_src(ctx, &inst->Src[0], &alu.src[1]);
-                       alu.src[1].chan = tgsi_chan(&inst->Src[0], i);
+                       r600_bc_src(&alu.src[1], &r600_src, i);
                        alu.dst.sel = ctx->temp_reg;
                        alu.dst.chan = i;
                        alu.dst.write = 1;
@@ -1684,8 +1686,11 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
        }
 
        if (inst->Texture.Texture == TGSI_TEXTURE_CUBE) {
+               struct r600_shader_src r600_src;
                int src_chan, src2_chan;
 
+               tgsi_src(ctx, &inst->Src[0], &r600_src);
+
                /* tmp1.xyzw = CUBE(R0.zzxy, R0.yxzz) */
                for (i = 0; i < 4; i++) {
                        memset(&alu, 0, sizeof(struct r600_bc_alu));
@@ -1713,10 +1718,8 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
                                src2_chan = 0;
                                break;
                        }
-                       tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
-                       alu.src[0].chan = tgsi_chan(&inst->Src[0], src_chan);
-                       tgsi_src(ctx, &inst->Src[0], &alu.src[1]);
-                       alu.src[1].chan = tgsi_chan(&inst->Src[0], src2_chan);
+                       r600_bc_src(&alu.src[0], &r600_src, src_chan);
+                       r600_bc_src(&alu.src[1], &r600_src, src2_chan);
                        alu.dst.sel = ctx->temp_reg;
                        alu.dst.chan = i;
                        if (i == 3)
@@ -1756,7 +1759,7 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
 
                alu.src[2].sel = V_SQ_ALU_SRC_LITERAL;
                alu.src[2].chan = 0;
-               alu.src[2].value[0] = *(uint32_t *)&one_point_five;
+               alu.src[2].value = *(uint32_t *)&one_point_five;
 
                alu.dst.sel = ctx->temp_reg;
                alu.dst.chan = 0;
@@ -1777,7 +1780,7 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
 
                alu.src[2].sel = V_SQ_ALU_SRC_LITERAL;
                alu.src[2].chan = 0;
-               alu.src[2].value[0] = *(uint32_t *)&one_point_five;
+               alu.src[2].value = *(uint32_t *)&one_point_five;
 
                alu.dst.sel = ctx->temp_reg;
                alu.dst.chan = 1;
@@ -1793,11 +1796,13 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
        }
 
        if (src_not_temp) {
+               struct r600_shader_src r600_src;
+
+               tgsi_src(ctx, &inst->Src[0], &r600_src);
                for (i = 0; i < 4; i++) {
                        memset(&alu, 0, sizeof(struct r600_bc_alu));
                        alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV);
-                       tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
-                       alu.src[0].chan = tgsi_chan(&inst->Src[0], i);
+                       r600_bc_src(&alu.src[0], &r600_src, i);
                        alu.dst.sel = ctx->temp_reg;
                        alu.dst.chan = i;
                        if (i == 3)
@@ -1858,7 +1863,7 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
 static int tgsi_lrp(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
-       struct r600_bc_alu_src r600_src[3];
+       struct r600_shader_src r600_src[3];
        struct r600_bc_alu alu;
        int lasti = tgsi_last_instruction(inst->Dst[0].Register.WriteMask);
        unsigned i;
@@ -1879,10 +1884,8 @@ static int tgsi_lrp(struct r600_shader_ctx *ctx)
 
                        memset(&alu, 0, sizeof(struct r600_bc_alu));
                        alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_ADD);
-                       alu.src[0] = r600_src[1];
-                       alu.src[0].chan = tgsi_chan(&inst->Src[1], i);
-                       alu.src[1] = r600_src[2];
-                       alu.src[1].chan = tgsi_chan(&inst->Src[2], i);
+                       r600_bc_src(&alu.src[0], &r600_src[1], i);
+                       r600_bc_src(&alu.src[1], &r600_src[2], i);
                        alu.omod = 3;
                        tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
                        alu.dst.chan = i;
@@ -1905,8 +1908,7 @@ static int tgsi_lrp(struct r600_shader_ctx *ctx)
                alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_ADD);
                alu.src[0].sel = V_SQ_ALU_SRC_1;
                alu.src[0].chan = 0;
-               alu.src[1] = r600_src[0];
-               alu.src[1].chan = tgsi_chan(&inst->Src[0], i);
+               r600_bc_src(&alu.src[1], &r600_src[0], i);
                alu.src[1].neg = 1;
                alu.dst.sel = ctx->temp_reg;
                alu.dst.chan = i;
@@ -1928,8 +1930,7 @@ static int tgsi_lrp(struct r600_shader_ctx *ctx)
                alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL);
                alu.src[0].sel = ctx->temp_reg;
                alu.src[0].chan = i;
-               alu.src[1] = r600_src[2];
-               alu.src[1].chan = tgsi_chan(&inst->Src[2], i);
+               r600_bc_src(&alu.src[1], &r600_src[2], i);
                alu.dst.sel = ctx->temp_reg;
                alu.dst.chan = i;
                if (i == lasti) {
@@ -1949,10 +1950,8 @@ static int tgsi_lrp(struct r600_shader_ctx *ctx)
                memset(&alu, 0, sizeof(struct r600_bc_alu));
                alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP3_SQ_OP3_INST_MULADD);
                alu.is_op3 = 1;
-               alu.src[0] = r600_src[0];
-               alu.src[0].chan = tgsi_chan(&inst->Src[0], i);
-               alu.src[1] = r600_src[1];
-               alu.src[1].chan = tgsi_chan(&inst->Src[1], i);
+               r600_bc_src(&alu.src[0], &r600_src[0], i);
+               r600_bc_src(&alu.src[1], &r600_src[1], i);
                alu.src[2].sel = ctx->temp_reg;
                alu.src[2].chan = i;
 
@@ -1971,7 +1970,7 @@ static int tgsi_lrp(struct r600_shader_ctx *ctx)
 static int tgsi_cmp(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
-       struct r600_bc_alu_src r600_src[3];
+       struct r600_shader_src r600_src[3];
        struct r600_bc_alu alu;
        int i, r;
        int lasti = tgsi_last_instruction(inst->Dst[0].Register.WriteMask);
@@ -1989,15 +1988,9 @@ static int tgsi_cmp(struct r600_shader_ctx *ctx)
 
                memset(&alu, 0, sizeof(struct r600_bc_alu));
                alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP3_SQ_OP3_INST_CNDGE);
-               alu.src[0] = r600_src[0];
-               alu.src[0].chan = tgsi_chan(&inst->Src[0], i);
-
-               alu.src[1] = r600_src[2];
-               alu.src[1].chan = tgsi_chan(&inst->Src[2], i);
-
-               alu.src[2] = r600_src[1];
-               alu.src[2].chan = tgsi_chan(&inst->Src[1], i);
-
+               r600_bc_src(&alu.src[0], &r600_src[0], i);
+               r600_bc_src(&alu.src[1], &r600_src[2], i);
+               r600_bc_src(&alu.src[2], &r600_src[1], i);
                tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
                alu.dst.chan = i;
                alu.dst.write = 1;
@@ -2014,7 +2007,7 @@ static int tgsi_cmp(struct r600_shader_ctx *ctx)
 static int tgsi_xpd(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
-       struct r600_bc_alu_src r600_src[3];
+       struct r600_shader_src r600_src[3];
        struct r600_bc_alu alu;
        uint32_t use_temp = 0;
        int i, r;
@@ -2033,32 +2026,30 @@ static int tgsi_xpd(struct r600_shader_ctx *ctx)
                memset(&alu, 0, sizeof(struct r600_bc_alu));
                alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL);
 
-               alu.src[0] = r600_src[0];
                switch (i) {
                case 0:
-                       alu.src[0].chan = tgsi_chan(&inst->Src[0], 2);
+                       r600_bc_src(&alu.src[0], &r600_src[0], 2);
                        break;
                case 1:
-                       alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+                       r600_bc_src(&alu.src[0], &r600_src[0], 0);
                        break;
                case 2:
-                       alu.src[0].chan = tgsi_chan(&inst->Src[0], 1);
+                       r600_bc_src(&alu.src[0], &r600_src[0], 1);
                        break;
                case 3:
                        alu.src[0].sel = V_SQ_ALU_SRC_0;
                        alu.src[0].chan = i;
                }
 
-               alu.src[1] = r600_src[1];
                switch (i) {
                case 0:
-                       alu.src[1].chan = tgsi_chan(&inst->Src[1], 1);
+                       r600_bc_src(&alu.src[1], &r600_src[1], 1);
                        break;
                case 1:
-                       alu.src[1].chan = tgsi_chan(&inst->Src[1], 2);
+                       r600_bc_src(&alu.src[1], &r600_src[1], 2);
                        break;
                case 2:
-                       alu.src[1].chan = tgsi_chan(&inst->Src[1], 0);
+                       r600_bc_src(&alu.src[1], &r600_src[1], 0);
                        break;
                case 3:
                        alu.src[1].sel = V_SQ_ALU_SRC_0;
@@ -2080,32 +2071,30 @@ static int tgsi_xpd(struct r600_shader_ctx *ctx)
                memset(&alu, 0, sizeof(struct r600_bc_alu));
                alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP3_SQ_OP3_INST_MULADD);
 
-               alu.src[0] = r600_src[0];
                switch (i) {
                case 0:
-                       alu.src[0].chan = tgsi_chan(&inst->Src[0], 1);
+                       r600_bc_src(&alu.src[0], &r600_src[0], 1);
                        break;
                case 1:
-                       alu.src[0].chan = tgsi_chan(&inst->Src[0], 2);
+                       r600_bc_src(&alu.src[0], &r600_src[0], 2);
                        break;
                case 2:
-                       alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+                       r600_bc_src(&alu.src[0], &r600_src[0], 0);
                        break;
                case 3:
                        alu.src[0].sel = V_SQ_ALU_SRC_0;
                        alu.src[0].chan = i;
                }
 
-               alu.src[1] = r600_src[1];
                switch (i) {
                case 0:
-                       alu.src[1].chan = tgsi_chan(&inst->Src[1], 2);
+                       r600_bc_src(&alu.src[1], &r600_src[1], 2);
                        break;
                case 1:
-                       alu.src[1].chan = tgsi_chan(&inst->Src[1], 0);
+                       r600_bc_src(&alu.src[1], &r600_src[1], 0);
                        break;
                case 2:
-                       alu.src[1].chan = tgsi_chan(&inst->Src[1], 1);
+                       r600_bc_src(&alu.src[1], &r600_src[1], 1);
                        break;
                case 3:
                        alu.src[1].sel = V_SQ_ALU_SRC_0;
@@ -2137,18 +2126,18 @@ static int tgsi_xpd(struct r600_shader_ctx *ctx)
 static int tgsi_exp(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
-       struct r600_bc_alu_src r600_src[3] = { { 0 } };
+       struct r600_shader_src r600_src;
        struct r600_bc_alu alu;
        int r;
 
+       tgsi_src(ctx, &inst->Src[0], &r600_src);
+
        /* result.x = 2^floor(src); */
        if (inst->Dst[0].Register.WriteMask & 1) {
                memset(&alu, 0, sizeof(struct r600_bc_alu));
 
                alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_FLOOR);
-               tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
-
-               alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+               r600_bc_src(&alu.src[0], &r600_src, 0);
 
                alu.dst.sel = ctx->temp_reg;
                alu.dst.chan = 0;
@@ -2176,9 +2165,7 @@ static int tgsi_exp(struct r600_shader_ctx *ctx)
                memset(&alu, 0, sizeof(struct r600_bc_alu));
 
                alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_FRACT);
-               alu.src[0] = r600_src[0];
-               tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
-               alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+               r600_bc_src(&alu.src[0], &r600_src, 0);
 
                alu.dst.sel = ctx->temp_reg;
 //             r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
@@ -2198,8 +2185,7 @@ static int tgsi_exp(struct r600_shader_ctx *ctx)
        if ((inst->Dst[0].Register.WriteMask >> 2) & 0x1) {
                memset(&alu, 0, sizeof(struct r600_bc_alu));
                alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_EXP_IEEE);
-               tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
-               alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+               r600_bc_src(&alu.src[0], &r600_src, 0);
 
                alu.dst.sel = ctx->temp_reg;
                alu.dst.write = 1;
@@ -2234,17 +2220,18 @@ static int tgsi_exp(struct r600_shader_ctx *ctx)
 static int tgsi_log(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_shader_src r600_src;
        struct r600_bc_alu alu;
        int r;
 
+       tgsi_src(ctx, &inst->Src[0], &r600_src);
+
        /* result.x = floor(log2(src)); */
        if (inst->Dst[0].Register.WriteMask & 1) {
                memset(&alu, 0, sizeof(struct r600_bc_alu));
 
                alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_LOG_IEEE);
-               tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
-
-               alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+               r600_bc_src(&alu.src[0], &r600_src, 0);
 
                alu.dst.sel = ctx->temp_reg;
                alu.dst.chan = 0;
@@ -2273,9 +2260,7 @@ static int tgsi_log(struct r600_shader_ctx *ctx)
                memset(&alu, 0, sizeof(struct r600_bc_alu));
 
                alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_LOG_IEEE);
-               tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
-
-               alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+               r600_bc_src(&alu.src[0], &r600_src, 0);
 
                alu.dst.sel = ctx->temp_reg;
                alu.dst.chan = 1;
@@ -2335,8 +2320,7 @@ static int tgsi_log(struct r600_shader_ctx *ctx)
 
                alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL);
 
-               tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
-               alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+               r600_bc_src(&alu.src[0], &r600_src, 0);
 
                alu.src[1].sel = ctx->temp_reg;
                alu.src[1].chan = 1;
@@ -2356,8 +2340,7 @@ static int tgsi_log(struct r600_shader_ctx *ctx)
                memset(&alu, 0, sizeof(struct r600_bc_alu));
 
                alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_LOG_IEEE);
-               tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
-               alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+               r600_bc_src(&alu.src[0], &r600_src, 0);
 
                alu.dst.sel = ctx->temp_reg;
                alu.dst.write = 1;
@@ -2393,8 +2376,12 @@ static int tgsi_log(struct r600_shader_ctx *ctx)
 static int tgsi_eg_arl(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_shader_src r600_src;
        struct r600_bc_alu alu;
        int r;
+
+       tgsi_src(ctx, &inst->Src[0], &r600_src);
+
        memset(&alu, 0, sizeof(struct r600_bc_alu));
 
        switch (inst->Instruction.Opcode) {
@@ -2409,8 +2396,7 @@ static int tgsi_eg_arl(struct r600_shader_ctx *ctx)
                return -1;
        }
 
-       tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
-       alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+       r600_bc_src(&alu.src[0], &r600_src, 0);
        alu.last = 1;
        alu.dst.chan = 0;
        alu.dst.sel = ctx->temp_reg;
@@ -2420,7 +2406,6 @@ static int tgsi_eg_arl(struct r600_shader_ctx *ctx)
                return r;
        memset(&alu, 0, sizeof(struct r600_bc_alu));
        alu.inst = EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOVA_INT;
-       tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
        alu.src[0].sel = ctx->temp_reg;
        alu.src[0].chan = 0;
        alu.last = 1;
@@ -2433,8 +2418,12 @@ static int tgsi_r600_arl(struct r600_shader_ctx *ctx)
 {
        /* TODO from r600c, ar values don't persist between clauses */
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_shader_src r600_src;
        struct r600_bc_alu alu;
        int r;
+
+       tgsi_src(ctx, &inst->Src[0], &r600_src);
+
        memset(&alu, 0, sizeof(struct r600_bc_alu));
 
        switch (inst->Instruction.Opcode) {
@@ -2449,9 +2438,7 @@ static int tgsi_r600_arl(struct r600_shader_ctx *ctx)
                return -1;
        }
 
-
-       tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
-       alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+       r600_bc_src(&alu.src[0], &r600_src, 0);
 
        alu.last = 1;
 
@@ -2465,9 +2452,13 @@ static int tgsi_r600_arl(struct r600_shader_ctx *ctx)
 static int tgsi_opdst(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_shader_src r600_src[2];
        struct r600_bc_alu alu;
        int i, r = 0;
 
+       tgsi_src(ctx, &inst->Src[0], &r600_src[0]);
+       tgsi_src(ctx, &inst->Src[1], &r600_src[1]);
+
        for (i = 0; i < 4; i++) {
                memset(&alu, 0, sizeof(struct r600_bc_alu));
 
@@ -2477,15 +2468,13 @@ static int tgsi_opdst(struct r600_shader_ctx *ctx)
                if (i == 0 || i == 3) {
                        alu.src[0].sel = V_SQ_ALU_SRC_1;
                } else {
-                       tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
-                       alu.src[0].chan = tgsi_chan(&inst->Src[0], i);
+                       r600_bc_src(&alu.src[0], &r600_src[0], i);
                }
 
-               if (i == 0 || i == 2) {
+               if (i == 0 || i == 2) {
                        alu.src[1].sel = V_SQ_ALU_SRC_1;
                } else {
-                       tgsi_src(ctx, &inst->Src[1], &alu.src[1]);
-                       alu.src[1].chan = tgsi_chan(&inst->Src[1], i);
+                       r600_bc_src(&alu.src[1], &r600_src[1], i);
                }
                if (i == 3)
                        alu.last = 1;
@@ -2499,9 +2488,12 @@ static int tgsi_opdst(struct r600_shader_ctx *ctx)
 static int emit_logic_pred(struct r600_shader_ctx *ctx, int opcode)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_shader_src r600_src;
        struct r600_bc_alu alu;
        int r;
 
+       tgsi_src(ctx, &inst->Src[0], &r600_src);
+
        memset(&alu, 0, sizeof(struct r600_bc_alu));
        alu.inst = opcode;
        alu.predicate = 1;
@@ -2510,8 +2502,7 @@ static int emit_logic_pred(struct r600_shader_ctx *ctx, int opcode)
        alu.dst.write = 1;
        alu.dst.chan = 0;
 
-       tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
-       alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+       r600_bc_src(&alu.src[0], &r600_src, 0);
        alu.src[1].sel = V_SQ_ALU_SRC_0;
        alu.src[1].chan = 0;