r600g: Removed debug code.
[mesa.git] / src / gallium / drivers / r600 / r600_shader.c
index 956c7e7930cfd0e68221e73504158f64f196f6d1..e18c6ce60524d0f25b9ee1af2a8818f40f96787c 100644 (file)
@@ -30,6 +30,7 @@
 #include "r600_shader.h"
 #include "r600_asm.h"
 #include "r600_sq.h"
+#include "r600_opcodes.h"
 #include "r600d.h"
 #include <stdio.h>
 #include <errno.h>
@@ -48,6 +49,9 @@ struct r600_shader_ctx {
        struct r600_bc                          *bc;
        struct r600_shader                      *shader;
        u32                                     value[4];
+       u32                                     *literals;
+       u32                                     nliterals;
+       u32                                     max_driver_temp_used;
 };
 
 struct r600_shader_tgsi_instruction {
@@ -57,8 +61,8 @@ struct r600_shader_tgsi_instruction {
        int (*process)(struct r600_shader_ctx *ctx);
 };
 
-static struct r600_shader_tgsi_instruction r600_shader_tgsi_instruction[];
-static int r600_shader_from_tgsi(const struct tgsi_token *tokens, struct r600_shader *shader);
+static struct r600_shader_tgsi_instruction r600_shader_tgsi_instruction[], eg_shader_tgsi_instruction[];
+static int tgsi_helper_tempx_replicate(struct r600_shader_ctx *ctx);
 
 static int r600_shader_update(struct pipe_context *ctx, struct r600_shader *shader)
 {
@@ -105,11 +109,12 @@ int r600_pipe_shader_create(struct pipe_context *ctx,
        struct r600_screen *rscreen = r600_screen(ctx->screen);
        int r;
 
-fprintf(stderr, "--------------------------------------------------------------\n");
-tgsi_dump(tokens, 0);
+//fprintf(stderr, "--------------------------------------------------------------\n");
+//tgsi_dump(tokens, 0);
        if (rpshader == NULL)
                return -ENOMEM;
        rpshader->shader.family = radeon_get_family(rscreen->rw);
+       rpshader->shader.use_mem_constant = rscreen->use_mem_constant;
        r = r600_shader_from_tgsi(tokens, &rpshader->shader);
        if (r) {
                R600_ERR("translation from TGSI failed !\n");
@@ -120,86 +125,30 @@ tgsi_dump(tokens, 0);
                R600_ERR("building bytecode failed !\n");
                return r;
        }
-fprintf(stderr, "______________________________________________________________\n");
+//fprintf(stderr, "______________________________________________________________\n");
        return 0;
 }
 
 static int r600_pipe_shader_vs(struct pipe_context *ctx, struct r600_context_state *rpshader)
 {
-       struct r600_screen *rscreen = r600_screen(ctx->screen);
-       struct r600_shader *rshader = &rpshader->shader;
+       struct r600_context *rctx = r600_context(ctx);
        struct radeon_state *state;
-       unsigned i, tmp;
 
-       rpshader->rstate = radeon_state_decref(rpshader->rstate);
-       state = radeon_state(rscreen->rw, R600_VS_SHADER_TYPE, R600_VS_SHADER);
-       if (state == NULL)
-               return -ENOMEM;
-       for (i = 0; i < 10; i++) {
-               state->states[R600_VS_SHADER__SPI_VS_OUT_ID_0 + i] = 0;
-       }
-       /* so far never got proper semantic id from tgsi */
-       for (i = 0; i < 32; i++) {
-               tmp = i << ((i & 3) * 8);
-               state->states[R600_VS_SHADER__SPI_VS_OUT_ID_0 + i / 4] |= tmp;
-       }
-       state->states[R600_VS_SHADER__SPI_VS_OUT_CONFIG] = S_0286C4_VS_EXPORT_COUNT(rshader->noutput - 2);
-       state->states[R600_VS_SHADER__SQ_PGM_RESOURCES_VS] = S_028868_NUM_GPRS(rshader->bc.ngpr);
-       rpshader->rstate = state;
-       rpshader->rstate->bo[0] = radeon_bo_incref(rscreen->rw, rpshader->bo);
-       rpshader->rstate->bo[1] = radeon_bo_incref(rscreen->rw, rpshader->bo);
-       rpshader->rstate->nbo = 2;
-       rpshader->rstate->placement[0] = RADEON_GEM_DOMAIN_GTT;
-       return radeon_state_pm4(state);
+       state = &rpshader->rstate[0];
+       radeon_state_fini(&rpshader->rstate[0]);
+
+       return rctx->vtbl->vs_shader(rctx, rpshader, state);
 }
 
 static int r600_pipe_shader_ps(struct pipe_context *ctx, struct r600_context_state *rpshader)
 {
-       const struct pipe_rasterizer_state *rasterizer;
-       struct r600_screen *rscreen = r600_screen(ctx->screen);
-       struct r600_shader *rshader = &rpshader->shader;
        struct r600_context *rctx = r600_context(ctx);
        struct radeon_state *state;
-       unsigned i, tmp, exports_ps, num_cout;
 
-       rasterizer = &rctx->rasterizer->state.rasterizer;
-       rpshader->rstate = radeon_state_decref(rpshader->rstate);
-       state = radeon_state(rscreen->rw, R600_PS_SHADER_TYPE, R600_PS_SHADER);
-       if (state == NULL)
-               return -ENOMEM;
-       for (i = 0; i < rshader->ninput; i++) {
-               tmp = S_028644_SEMANTIC(i);
-               tmp |= S_028644_SEL_CENTROID(1);
-               if (rshader->input[i].name == TGSI_SEMANTIC_COLOR ||
-                       rshader->input[i].name == TGSI_SEMANTIC_BCOLOR) {
-                       tmp |= S_028644_FLAT_SHADE(rshader->flat_shade);
-               }
-               if (rasterizer->sprite_coord_enable & (1 << i)) {
-                       tmp |= S_028644_PT_SPRITE_TEX(1);
-               }
-               state->states[R600_PS_SHADER__SPI_PS_INPUT_CNTL_0 + i] = tmp;
-       }
+       state = &rpshader->rstate[0];
+       radeon_state_fini(state);
 
-       exports_ps = 0;
-       num_cout = 0;
-       for (i = 0; i < rshader->noutput; i++) {
-               if (rshader->output[i].name == TGSI_SEMANTIC_POSITION)
-                       exports_ps |= 1;
-               else if (rshader->output[i].name == TGSI_SEMANTIC_COLOR) {
-                       exports_ps |= (1 << (num_cout+1));
-                       num_cout++;
-               }
-       }
-       state->states[R600_PS_SHADER__SPI_PS_IN_CONTROL_0] = S_0286CC_NUM_INTERP(rshader->ninput) |
-                                                       S_0286CC_PERSP_GRADIENT_ENA(1);
-       state->states[R600_PS_SHADER__SPI_PS_IN_CONTROL_1] = 0x00000000;
-       state->states[R600_PS_SHADER__SQ_PGM_RESOURCES_PS] = S_028868_NUM_GPRS(rshader->bc.ngpr);
-       state->states[R600_PS_SHADER__SQ_PGM_EXPORTS_PS] = exports_ps;
-       rpshader->rstate = state;
-       rpshader->rstate->bo[0] = radeon_bo_incref(rscreen->rw, rpshader->bo);
-       rpshader->rstate->nbo = 1;
-       rpshader->rstate->placement[0] = RADEON_GEM_DOMAIN_GTT;
-       return radeon_state_pm4(state);
+       return rctx->vtbl->ps_shader(rctx, rpshader, state);
 }
 
 static int r600_pipe_shader(struct pipe_context *ctx, struct r600_context_state *rpshader)
@@ -208,18 +157,19 @@ static int r600_pipe_shader(struct pipe_context *ctx, struct r600_context_state
        struct r600_context *rctx = r600_context(ctx);
        struct r600_shader *rshader = &rpshader->shader;
        int r;
+       void *data;
 
        /* copy new shader */
-       radeon_bo_decref(rscreen->rw, rpshader->bo);
+       radeon_ws_bo_reference(rscreen->rw, &rpshader->bo, NULL);
        rpshader->bo = NULL;
-       rpshader->bo = radeon_bo(rscreen->rw, 0, rshader->bc.ndw * 4,
-                               4096, NULL);
+       rpshader->bo = radeon_ws_bo(rscreen->rw, rshader->bc.ndw * 4,
+                                   4096, 0);
        if (rpshader->bo == NULL) {
                return -ENOMEM;
        }
-       radeon_bo_map(rscreen->rw, rpshader->bo);
-       memcpy(rpshader->bo->data, rshader->bc.bytecode, rshader->bc.ndw * 4);
-       radeon_bo_unmap(rscreen->rw, rpshader->bo);
+       data = radeon_ws_bo_map(rscreen->rw, rpshader->bo, 0, ctx);
+       memcpy(data, rshader->bc.bytecode, rshader->bc.ndw * 4);
+       radeon_ws_bo_unmap(rscreen->rw, rpshader->bo);
        /* build state */
        rshader->flat_shade = rctx->flat_shade;
        switch (rshader->processor_type) {
@@ -268,27 +218,63 @@ static int tgsi_is_supported(struct r600_shader_ctx *ctx)
                R600_ERR("predicate unsupported\n");
                return -EINVAL;
        }
+#if 0
        if (i->Instruction.Label) {
                R600_ERR("label unsupported\n");
                return -EINVAL;
        }
+#endif
        for (j = 0; j < i->Instruction.NumSrcRegs; j++) {
-               if (i->Src[j].Register.Indirect ||
-                       i->Src[j].Register.Dimension ||
+               if (i->Src[j].Register.Dimension ||
                        i->Src[j].Register.Absolute) {
-                       R600_ERR("unsupported src (indirect|dimension|absolute)\n");
+                       R600_ERR("unsupported src %d (dimension %d|absolute %d)\n", j,
+                                i->Src[j].Register.Dimension,
+                                i->Src[j].Register.Absolute);
                        return -EINVAL;
                }
        }
        for (j = 0; j < i->Instruction.NumDstRegs; j++) {
-               if (i->Dst[j].Register.Indirect || i->Dst[j].Register.Dimension) {
-                       R600_ERR("unsupported dst (indirect|dimension)\n");
+               if (i->Dst[j].Register.Dimension) {
+                       R600_ERR("unsupported dst (dimension)\n");
                        return -EINVAL;
                }
        }
        return 0;
 }
 
+static int evergreen_interp_alu(struct r600_shader_ctx *ctx, int gpr)
+{
+       int i, r;
+       struct r600_bc_alu alu;
+
+       for (i = 0; i < 8; i++) {
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+
+               if (i < 4)
+                       alu.inst = EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INTERP_ZW;
+               else
+                       alu.inst = EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INTERP_XY;
+
+               if ((i > 1) && (i < 6)) {
+                       alu.dst.sel = ctx->shader->input[gpr].gpr;
+                       alu.dst.write = 1;
+               }
+
+               alu.dst.chan = i % 4;
+               alu.src[0].chan = (1 - (i % 2));
+               alu.src[1].sel = V_SQ_ALU_SRC_PARAM_BASE + gpr;
+
+               alu.bank_swizzle_force = SQ_ALU_VEC_210;
+               if ((i % 4) == 3)
+                       alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+       }
+       return 0;
+}      
+               
+                       
 static int tgsi_declaration(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_declaration *d = &ctx->parse.FullToken.FullDeclaration;
@@ -322,6 +308,10 @@ static int tgsi_declaration(struct r600_shader_ctx *ctx)
                        if (r)
                                return r;
                }
+               if (ctx->type == TGSI_PROCESSOR_FRAGMENT && ctx->bc->chiprev == 2) {
+                       /* turn input into interpolate on EG */
+                       evergreen_interp_alu(ctx, i);
+               }
                break;
        case TGSI_FILE_OUTPUT:
                i = ctx->shader->noutput++;
@@ -333,6 +323,7 @@ static int tgsi_declaration(struct r600_shader_ctx *ctx)
        case TGSI_FILE_CONSTANT:
        case TGSI_FILE_TEMPORARY:
        case TGSI_FILE_SAMPLER:
+       case TGSI_FILE_ADDRESS:
                break;
        default:
                R600_ERR("unsupported file %d declaration\n", d->Declaration.File);
@@ -341,6 +332,11 @@ static int tgsi_declaration(struct r600_shader_ctx *ctx)
        return 0;
 }
 
+static int r600_get_temp(struct r600_shader_ctx *ctx)
+{
+       return ctx->temp_reg + ctx->max_driver_temp_used++;
+}
+
 int r600_shader_from_tgsi(const struct tgsi_token *tokens, struct r600_shader *shader)
 {
        struct tgsi_full_immediate *immediate;
@@ -355,6 +351,7 @@ int r600_shader_from_tgsi(const struct tgsi_token *tokens, struct r600_shader *s
        r = r600_bc_init(ctx.bc, shader->family);
        if (r)
                return r;
+       ctx.bc->use_mem_constant = shader->use_mem_constant;
        ctx.tokens = tokens;
        tgsi_scan_shader(tokens, &ctx.info);
        tgsi_parse_init(&ctx.parse, tokens);
@@ -362,9 +359,15 @@ int r600_shader_from_tgsi(const struct tgsi_token *tokens, struct r600_shader *s
        shader->processor_type = ctx.type;
 
        /* register allocations */
-       /* Values [0,127] correspond to GPR[0..127]. 
-        * Values [256,511] correspond to cfile constants c[0..255]. 
+       /* Values [0,127] correspond to GPR[0..127].
+        * Values [128,159] correspond to constant buffer bank 0
+        * Values [160,191] correspond to constant buffer bank 1
+        * Values [256,511] correspond to cfile constants c[0..255].
         * Other special values are shown in the list below.
+        * 244  ALU_SRC_1_DBL_L: special constant 1.0 double-float, LSW. (RV670+)
+        * 245  ALU_SRC_1_DBL_M: special constant 1.0 double-float, MSW. (RV670+)
+        * 246  ALU_SRC_0_5_DBL_L: special constant 0.5 double-float, LSW. (RV670+)
+        * 247  ALU_SRC_0_5_DBL_M: special constant 0.5 double-float, MSW. (RV670+)
         * 248  SQ_ALU_SRC_0: special constant 0.0.
         * 249  SQ_ALU_SRC_1: special constant 1.0 float.
         * 250  SQ_ALU_SRC_1_INT: special constant 1 integer.
@@ -384,20 +387,33 @@ int r600_shader_from_tgsi(const struct tgsi_token *tokens, struct r600_shader *s
                                                ctx.info.file_count[TGSI_FILE_INPUT];
        ctx.file_offset[TGSI_FILE_TEMPORARY] = ctx.file_offset[TGSI_FILE_OUTPUT] +
                                                ctx.info.file_count[TGSI_FILE_OUTPUT];
-       ctx.file_offset[TGSI_FILE_CONSTANT] = 256;
+       if (ctx.shader->use_mem_constant)
+               ctx.file_offset[TGSI_FILE_CONSTANT] = 128;
+       else
+               ctx.file_offset[TGSI_FILE_CONSTANT] = 256;
+
        ctx.file_offset[TGSI_FILE_IMMEDIATE] = 253;
        ctx.temp_reg = ctx.file_offset[TGSI_FILE_TEMPORARY] +
                        ctx.info.file_count[TGSI_FILE_TEMPORARY];
 
+       ctx.nliterals = 0;
+       ctx.literals = NULL;
+
        while (!tgsi_parse_end_of_tokens(&ctx.parse)) {
                tgsi_parse_token(&ctx.parse);
                switch (ctx.parse.FullToken.Token.Type) {
                case TGSI_TOKEN_TYPE_IMMEDIATE:
                        immediate = &ctx.parse.FullToken.FullImmediate;
-                       ctx.value[0] = immediate->u[0].Uint;
-                       ctx.value[1] = immediate->u[1].Uint;
-                       ctx.value[2] = immediate->u[2].Uint;
-                       ctx.value[3] = immediate->u[3].Uint;
+                       ctx.literals = realloc(ctx.literals, (ctx.nliterals + 1) * 16);
+                       if(ctx.literals == NULL) {
+                               r = -ENOMEM;
+                               goto out_err;
+                       }
+                       ctx.literals[ctx.nliterals * 4 + 0] = immediate->u[0].Uint;
+                       ctx.literals[ctx.nliterals * 4 + 1] = immediate->u[1].Uint;
+                       ctx.literals[ctx.nliterals * 4 + 2] = immediate->u[2].Uint;
+                       ctx.literals[ctx.nliterals * 4 + 3] = immediate->u[3].Uint;
+                       ctx.nliterals++;
                        break;
                case TGSI_TOKEN_TYPE_DECLARATION:
                        r = tgsi_declaration(&ctx);
@@ -408,8 +424,14 @@ int r600_shader_from_tgsi(const struct tgsi_token *tokens, struct r600_shader *s
                        r = tgsi_is_supported(&ctx);
                        if (r)
                                goto out_err;
+                       ctx.max_driver_temp_used = 0;
+                       /* reserve first tmp for everyone */
+                       r600_get_temp(&ctx);
                        opcode = ctx.parse.FullToken.FullInstruction.Instruction.Opcode;
-                       ctx.inst_info = &r600_shader_tgsi_instruction[opcode];
+                       if (ctx.bc->chiprev == 2)
+                               ctx.inst_info = &eg_shader_tgsi_instruction[opcode];
+                       else
+                               ctx.inst_info = &r600_shader_tgsi_instruction[opcode];
                        r = ctx.inst_info->process(&ctx);
                        if (r)
                                goto out_err;
@@ -436,7 +458,7 @@ int r600_shader_from_tgsi(const struct tgsi_token *tokens, struct r600_shader *s
                output[i].barrier = 1;
                output[i].type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_PARAM;
                output[i].array_base = i - pos0;
-               output[i].inst = V_SQ_CF_ALLOC_EXPORT_WORD1_SQ_CF_INST_EXPORT;
+               output[i].inst = BC_INST(ctx.bc, V_SQ_CF_ALLOC_EXPORT_WORD1_SQ_CF_INST_EXPORT);
                switch (ctx.type) {
                case TGSI_PROCESSOR_VERTEX:
                        if (shader->output[i].name == TGSI_SEMANTIC_POSITION) {
@@ -458,6 +480,8 @@ int r600_shader_from_tgsi(const struct tgsi_token *tokens, struct r600_shader *s
                                output[i].type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_PIXEL;
                        } else if (shader->output[i].name == TGSI_SEMANTIC_POSITION) {
                                output[i].array_base = 61;
+                               output[i].swizzle_x = 2;
+                               output[i].swizzle_y = output[i].swizzle_z = output[i].swizzle_w = 7;
                                output[i].type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_PIXEL;
                        } else {
                                R600_ERR("unsupported fragment output name %d\n", shader->output[i].name);
@@ -490,7 +514,7 @@ int r600_shader_from_tgsi(const struct tgsi_token *tokens, struct r600_shader *s
                        output[i].barrier = 1;
                        output[i].type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_PARAM;
                        output[i].array_base = 0;
-                       output[i].inst = V_SQ_CF_ALLOC_EXPORT_WORD1_SQ_CF_INST_EXPORT;
+                       output[i].inst = BC_INST(ctx.bc, V_SQ_CF_ALLOC_EXPORT_WORD1_SQ_CF_INST_EXPORT);
                        noutput++;
                }
        }
@@ -504,9 +528,9 @@ int r600_shader_from_tgsi(const struct tgsi_token *tokens, struct r600_shader *s
                output[0].swizzle_z = 7;
                output[0].swizzle_w = 7;
                output[0].barrier = 1;
-               output[0].type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_PARAM;
+               output[0].type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_PIXEL;
                output[0].array_base = 0;
-               output[0].inst = V_SQ_CF_ALLOC_EXPORT_WORD1_SQ_CF_INST_EXPORT;
+               output[0].inst = BC_INST(ctx.bc, V_SQ_CF_ALLOC_EXPORT_WORD1_SQ_CF_INST_EXPORT);
                noutput++;
        }
        /* set export done on last export of each type */
@@ -516,7 +540,7 @@ int r600_shader_from_tgsi(const struct tgsi_token *tokens, struct r600_shader *s
                }
                if (!(output_done & (1 << output[i].type))) {
                        output_done |= (1 << output[i].type);
-                       output[i].inst = V_SQ_CF_ALLOC_EXPORT_WORD1_SQ_CF_INST_EXPORT_DONE;
+                       output[i].inst = BC_INST(ctx.bc, V_SQ_CF_ALLOC_EXPORT_WORD1_SQ_CF_INST_EXPORT_DONE);
                }
        }
        /* add output to bytecode */
@@ -525,9 +549,11 @@ int r600_shader_from_tgsi(const struct tgsi_token *tokens, struct r600_shader *s
                if (r)
                        goto out_err;
        }
+       free(ctx.literals);
        tgsi_parse_free(&ctx.parse);
        return 0;
 out_err:
+       free(ctx.literals);
        tgsi_parse_free(&ctx.parse);
        return r;
 }
@@ -547,11 +573,19 @@ static int tgsi_src(struct r600_shader_ctx *ctx,
                        const struct tgsi_full_src_register *tgsi_src,
                        struct r600_bc_alu_src *r600_src)
 {
+       int index;
        memset(r600_src, 0, sizeof(struct r600_bc_alu_src));
        r600_src->sel = tgsi_src->Register.Index;
        if (tgsi_src->Register.File == TGSI_FILE_IMMEDIATE) {
                r600_src->sel = 0;
+               index = tgsi_src->Register.Index;
+               ctx->value[0] = ctx->literals[index * 4 + 0];
+               ctx->value[1] = ctx->literals[index * 4 + 1];
+               ctx->value[2] = ctx->literals[index * 4 + 2];
+               ctx->value[3] = ctx->literals[index * 4 + 3];
        }
+       if (tgsi_src->Register.Indirect)
+               r600_src->rel = V_SQ_REL_RELATIVE;
        r600_src->neg = tgsi_src->Register.Negate;
        r600_src->sel += ctx->file_offset[tgsi_src->Register.File];
        return 0;
@@ -568,6 +602,8 @@ static int tgsi_dst(struct r600_shader_ctx *ctx,
        r600_dst->sel += ctx->file_offset[tgsi_dst->Register.File];
        r600_dst->chan = swizzle;
        r600_dst->write = 1;
+       if (tgsi_dst->Register.Indirect)
+               r600_dst->rel = V_SQ_REL_RELATIVE;
        if (inst->Instruction.Saturate) {
                r600_dst->clamp = 1;
        }
@@ -607,12 +643,13 @@ static int tgsi_split_constant(struct r600_shader_ctx *ctx, struct r600_bc_alu_s
        }
        for (i = 0, j = nconst - 1; i < inst->Instruction.NumSrcRegs; i++) {
                if (inst->Src[j].Register.File == TGSI_FILE_CONSTANT && j > 0) {
+                       int treg = r600_get_temp(ctx);
                        for (k = 0; k < 4; k++) {
                                memset(&alu, 0, sizeof(struct r600_bc_alu));
-                               alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV;
-                               alu.src[0].sel = r600_src[0].sel;
+                               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV);
+                               alu.src[0].sel = r600_src[j].sel;
                                alu.src[0].chan = k;
-                               alu.dst.sel = ctx->temp_reg + j;
+                               alu.dst.sel = treg;
                                alu.dst.chan = k;
                                alu.dst.write = 1;
                                if (k == 3)
@@ -621,37 +658,90 @@ static int tgsi_split_constant(struct r600_shader_ctx *ctx, struct r600_bc_alu_s
                                if (r)
                                        return r;
                        }
-                       r600_src[0].sel = ctx->temp_reg + j;
+                       r600_src[j].sel = treg;
                        j--;
                }
        }
        return 0;
 }
 
-static int tgsi_op2(struct r600_shader_ctx *ctx)
+/* 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])
+{
+       struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_bc_alu alu;
+       int i, j, k, nliteral, r;
+
+       for (i = 0, nliteral = 0; i < inst->Instruction.NumSrcRegs; i++) {
+               if (inst->Src[i].Register.File == TGSI_FILE_IMMEDIATE) {
+                       nliteral++;
+               }
+       }
+       for (i = 0, j = 0; i < inst->Instruction.NumSrcRegs; i++) {
+               if (inst->Src[j].Register.File == TGSI_FILE_IMMEDIATE) {
+                       int treg = r600_get_temp(ctx);
+                       for (k = 0; k < 4; k++) {
+                               memset(&alu, 0, sizeof(struct r600_bc_alu));
+                               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV);
+                               alu.src[0].sel = r600_src[j].sel;
+                               alu.src[0].chan = k;
+                               alu.dst.sel = treg;
+                               alu.dst.chan = k;
+                               alu.dst.write = 1;
+                               if (k == 3)
+                                       alu.last = 1;
+                               r = r600_bc_add_alu(ctx->bc, &alu);
+                               if (r)
+                                       return r;
+                       }
+                       r = r600_bc_add_literal(ctx->bc, ctx->value);
+                       if (r)
+                               return r;
+                       r600_src[j].sel = treg;
+                       j++;
+               }
+       }
+       return 0;
+}
+
+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_bc_alu alu;
        int i, j, r;
+       int lasti = 0;
+
+       for (i = 0; i < 4; i++) {
+               if (inst->Dst[0].Register.WriteMask & (1 << i)) {
+                       lasti = i;
+               }
+       }
 
        r = tgsi_split_constant(ctx, r600_src);
        if (r)
                return r;
-       for (i = 0; i < 4; i++) {
+       for (i = 0; i < lasti + 1; i++) {
+               if (!(inst->Dst[0].Register.WriteMask & (1 << i)))
+                       continue;
+
                memset(&alu, 0, sizeof(struct r600_bc_alu));
-               if (!(inst->Dst[0].Register.WriteMask & (1 << i))) {
-                       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP;
-                       alu.dst.chan = i;
-               } else {
-                       alu.inst = ctx->inst_info->r600_opcode;
+               r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
+               if (r)
+                       return r;
+               
+               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);
                        }
-                       r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
-                       if (r)
-                               return r;
+               } 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);
                }
                /* handle some special cases */
                switch (ctx->inst_info->tgsi_opcode) {
@@ -664,7 +754,7 @@ static int tgsi_op2(struct r600_shader_ctx *ctx)
                default:
                        break;
                }
-               if (i == 3) {
+               if (i == lasti) {
                        alu.last = 1;
                }
                r = r600_bc_add_alu(ctx->bc, &alu);
@@ -674,244 +764,415 @@ static int tgsi_op2(struct r600_shader_ctx *ctx)
        return 0;
 }
 
-static int tgsi_kill(struct r600_shader_ctx *ctx)
+static int tgsi_op2(struct r600_shader_ctx *ctx)
 {
-       struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
-       struct r600_bc_alu alu;
-       int i, r;
+       return tgsi_op2_s(ctx, 0);
+}
 
-       for (i = 0; i < 4; i++) {
-               memset(&alu, 0, sizeof(struct r600_bc_alu));
-               alu.inst = ctx->inst_info->r600_opcode;
-               alu.dst.chan = i;
-               alu.src[0].sel = 248;
-               r = tgsi_src(ctx, &inst->Src[0], &alu.src[1]);
-               if (r)
-                       return r;
-               alu.src[1].chan = tgsi_chan(&inst->Src[0], i);
-               if (i == 3) {
-                       alu.last = 1;
-               }
-               r = r600_bc_add_alu(ctx->bc, &alu);
-               if (r)
-                       return r;
-       }
-       return 0;
+static int tgsi_op2_swap(struct r600_shader_ctx *ctx)
+{
+       return tgsi_op2_s(ctx, 1);
 }
 
-static int tgsi_slt(struct r600_shader_ctx *ctx)
+/* 
+ * r600 - trunc to -PI..PI range
+ * r700 - normalize by dividing by 2PI
+ * see fdo bug 27901
+ */
+static int tgsi_setup_trig(struct r600_shader_ctx *ctx,
+                          struct r600_bc_alu_src r600_src[3])
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
-       struct r600_bc_alu_src r600_src[3];
+       int r;
+       uint32_t lit_vals[4];
        struct r600_bc_alu alu;
-       int i, r;
-
+       
+       memset(lit_vals, 0, 4*4);
        r = tgsi_split_constant(ctx, r600_src);
        if (r)
                return r;
-       for (i = 0; i < 4; i++) {
-               memset(&alu, 0, sizeof(struct r600_bc_alu));
-               if (!(inst->Dst[0].Register.WriteMask & (1 << i))) {
-                       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP;
-                       alu.dst.chan = i;
-               } else {
-                       alu.inst = ctx->inst_info->r600_opcode;
-                       alu.src[1] = r600_src[0];
-                       alu.src[1].chan = tgsi_chan(&inst->Src[0], i);
-                       alu.src[0] = r600_src[1];
-                       alu.src[0].chan = tgsi_chan(&inst->Src[1], i);
-                       r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
-                       if (r)
-                               return r;
-               }
-               if (i == 3) {
-                       alu.last = 1;
-               }
-               r = r600_bc_add_alu(ctx->bc, &alu);
-               if (r)
-                       return r;
-       }
-       return 0;
-}
 
-static int tgsi_lit(struct r600_shader_ctx *ctx)
-{
-       struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
-       struct r600_bc_alu alu;
-       int r;
+       r = tgsi_split_literal_constant(ctx, r600_src);
+       if (r)
+               return r;
+
+       lit_vals[0] = fui(1.0 /(3.1415926535 * 2));
+       lit_vals[1] = fui(0.5f);
 
-       /* dst.x, <- 1.0  */
        memset(&alu, 0, sizeof(struct r600_bc_alu));
-       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV;
-       alu.src[0].sel  = 249; /*1.0*/
-       alu.src[0].chan = 0;
-       r = tgsi_dst(ctx, &inst->Dst[0], 0, &alu.dst);
+       alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP3_SQ_OP3_INST_MULADD);
+       alu.is_op3 = 1;
+
+       alu.dst.chan = 0;
+       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);
+               
+       alu.src[1].sel = V_SQ_ALU_SRC_LITERAL;
+       alu.src[1].chan = 0;
+       alu.src[2].sel = V_SQ_ALU_SRC_LITERAL;
+       alu.src[2].chan = 1;
+       alu.last = 1;
+       r = r600_bc_add_alu(ctx->bc, &alu);
        if (r)
                return r;
-       alu.dst.write = (inst->Dst[0].Register.WriteMask >> 0) & 1;
-       r = r600_bc_add_alu(ctx->bc, &alu);
+       r = r600_bc_add_literal(ctx->bc, lit_vals);
        if (r)
                return r;
 
-       /* dst.y = max(src.x, 0.0) */
        memset(&alu, 0, sizeof(struct r600_bc_alu));
-       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MAX;
-       r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
+       alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_FRACT);
+               
+       alu.dst.chan = 0;
+       alu.dst.sel = ctx->temp_reg;
+       alu.dst.write = 1;
+
+       alu.src[0].sel = ctx->temp_reg;
+       alu.src[0].chan = 0;
+       alu.last = 1;
+       r = r600_bc_add_alu(ctx->bc, &alu);
        if (r)
                return r;
-       alu.src[1].sel  = 248; /*0.0*/
-       alu.src[1].chan = tgsi_chan(&inst->Src[0], 0);
-       r = tgsi_dst(ctx, &inst->Dst[0], 1, &alu.dst);
+
+       if (ctx->bc->chiprev == 0) {
+               lit_vals[0] = fui(3.1415926535897f * 2.0f);
+               lit_vals[1] = fui(-3.1415926535897f);
+       } else {
+               lit_vals[0] = fui(1.0f);
+               lit_vals[1] = fui(-0.5f);
+       }
+
+       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.dst.chan = 0;
+       alu.dst.sel = ctx->temp_reg;
+       alu.dst.write = 1;
+
+       alu.src[0].sel = ctx->temp_reg;
+       alu.src[0].chan = 0;
+               
+       alu.src[1].sel = V_SQ_ALU_SRC_LITERAL;
+       alu.src[1].chan = 0;
+       alu.src[2].sel = V_SQ_ALU_SRC_LITERAL;
+       alu.src[2].chan = 1;
+       alu.last = 1;
+       r = r600_bc_add_alu(ctx->bc, &alu);
        if (r)
                return r;
-       alu.dst.write = (inst->Dst[0].Register.WriteMask >> 1) & 1;
-       r = r600_bc_add_alu(ctx->bc, &alu);
+       r = r600_bc_add_literal(ctx->bc, lit_vals);
        if (r)
                return r;
+       return 0;
+}
 
-       /* dst.z = NOP - fill Z slot */
-       memset(&alu, 0, sizeof(struct r600_bc_alu));
-       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP;
-       alu.dst.chan = 2;
-       r = r600_bc_add_alu(ctx->bc, &alu);
+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_bc_alu alu;
+       int i, r;
+       int lasti = 0;
+
+       r = tgsi_setup_trig(ctx, r600_src);
        if (r)
                return r;
 
-       /* dst.w, <- 1.0  */
        memset(&alu, 0, sizeof(struct r600_bc_alu));
-       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV;
-       alu.src[0].sel  = 249;
+       alu.inst = ctx->inst_info->r600_opcode;
+       alu.dst.chan = 0;
+       alu.dst.sel = ctx->temp_reg;
+       alu.dst.write = 1;
+
+       alu.src[0].sel = ctx->temp_reg;
        alu.src[0].chan = 0;
-       r = tgsi_dst(ctx, &inst->Dst[0], 3, &alu.dst);
-       if (r)
-               return r;
-       alu.dst.write = (inst->Dst[0].Register.WriteMask >> 3) & 1;
        alu.last = 1;
        r = r600_bc_add_alu(ctx->bc, &alu);
        if (r)
                return r;
 
-       if (inst->Dst[0].Register.WriteMask & (1 << 2))
-       {
-               int chan;
-               int sel;
+       /* replicate result */
+       for (i = 0; i < 4; i++) {
+               if (inst->Dst[0].Register.WriteMask & (1 << i))
+                       lasti = i;
+       }
+       for (i = 0; i < lasti + 1; i++) {
+               if (!(inst->Dst[0].Register.WriteMask & (1 << i)))
+                       continue;
 
-               /* dst.z = log(src.y) */
                memset(&alu, 0, sizeof(struct r600_bc_alu));
-               alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_LOG_CLAMPED;
-               r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
-               if (r)
-                       return r;
-               alu.src[0].chan = tgsi_chan(&inst->Src[0], 1);
-               r = tgsi_dst(ctx, &inst->Dst[0], 2, &alu.dst);
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV);
+
+               alu.src[0].sel = ctx->temp_reg;
+               r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
                if (r)
                        return r;
-               alu.last = 1;
+               if (i == lasti)
+                       alu.last = 1;
                r = r600_bc_add_alu(ctx->bc, &alu);
                if (r)
                        return r;
+       }
+       return 0;
+}
 
-               chan = alu.dst.chan;
-               sel = alu.dst.sel;
+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_bc_alu alu;
+       int r;
 
-               /* tmp.x = amd MUL_LIT(src.w, dst.z, src.x ) */
-               memset(&alu, 0, sizeof(struct r600_bc_alu));
-               alu.inst = V_SQ_ALU_WORD1_OP3_SQ_OP3_INST_MUL_LIT;
-               r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
-               if (r)
-                       return r;
-               alu.src[0].chan = tgsi_chan(&inst->Src[0], 3);
-               alu.src[1].sel  = sel;
-               alu.src[1].chan = chan;
-               r = tgsi_src(ctx, &inst->Src[0], &alu.src[2]);
+       /* We'll only need the trig stuff if we are going to write to the
+        * X or Y components of the destination vector.
+        */
+       if (likely(inst->Dst[0].Register.WriteMask & TGSI_WRITEMASK_XY)) {
+               r = tgsi_setup_trig(ctx, r600_src);
                if (r)
                        return r;
-               alu.src[2].chan = tgsi_chan(&inst->Src[0], 0);
-               alu.dst.sel = ctx->temp_reg;
-               alu.dst.chan = 0;
-               alu.dst.write = 1;
-               alu.is_op3 = 1;
-               alu.last = 1;
-               r = r600_bc_add_alu(ctx->bc, &alu);
+       }
+
+       /* dst.x = COS */
+       if (inst->Dst[0].Register.WriteMask & TGSI_WRITEMASK_X) {
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_COS);
+               r = tgsi_dst(ctx, &inst->Dst[0], 0, &alu.dst);
                if (r)
                        return r;
 
-               /* dst.z = exp(tmp.x) */
-               memset(&alu, 0, sizeof(struct r600_bc_alu));
-               alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_EXP_IEEE;
                alu.src[0].sel = ctx->temp_reg;
                alu.src[0].chan = 0;
-               r = tgsi_dst(ctx, &inst->Dst[0], 2, &alu.dst);
-               if (r)
-                       return r;
                alu.last = 1;
                r = r600_bc_add_alu(ctx->bc, &alu);
                if (r)
                        return r;
        }
+
+       /* dst.y = SIN */
+       if (inst->Dst[0].Register.WriteMask & TGSI_WRITEMASK_Y) {
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SIN);
+               r = tgsi_dst(ctx, &inst->Dst[0], 1, &alu.dst);
+               if (r)
+                       return r;
+
+               alu.src[0].sel = ctx->temp_reg;
+               alu.src[0].chan = 0;
+               alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+       }
+
+       /* dst.z = 0.0; */
+       if (inst->Dst[0].Register.WriteMask & TGSI_WRITEMASK_Z) {
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV);
+
+               r = tgsi_dst(ctx, &inst->Dst[0], 2, &alu.dst);
+               if (r)
+                       return r;
+
+               alu.src[0].sel = V_SQ_ALU_SRC_0;
+               alu.src[0].chan = 0;
+
+               alu.last = 1;
+
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+       }
+
+       /* dst.w = 1.0; */
+       if (inst->Dst[0].Register.WriteMask & TGSI_WRITEMASK_W) {
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV);
+
+               r = tgsi_dst(ctx, &inst->Dst[0], 3, &alu.dst);
+               if (r)
+                       return r;
+
+               alu.src[0].sel = V_SQ_ALU_SRC_1;
+               alu.src[0].chan = 0;
+
+               alu.last = 1;
+
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+       }
+
        return 0;
 }
 
-static int tgsi_trans(struct r600_shader_ctx *ctx)
+static int tgsi_kill(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
        struct r600_bc_alu alu;
-       int i, j, r;
+       int i, r;
 
        for (i = 0; i < 4; i++) {
                memset(&alu, 0, sizeof(struct r600_bc_alu));
-               if (inst->Dst[0].Register.WriteMask & (1 << i)) {
-                       alu.inst = ctx->inst_info->r600_opcode;
-                       for (j = 0; j < inst->Instruction.NumSrcRegs; j++) {
-                               r = tgsi_src(ctx, &inst->Src[j], &alu.src[j]);
-                               if (r)
-                                       return r;
-                               alu.src[j].chan = tgsi_chan(&inst->Src[j], i);
-                       }
-                       r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
+               alu.inst = ctx->inst_info->r600_opcode;
+
+               alu.dst.chan = i;
+
+               alu.src[0].sel = V_SQ_ALU_SRC_0;
+
+               if (ctx->inst_info->tgsi_opcode == TGSI_OPCODE_KILP) {
+                       alu.src[1].sel = V_SQ_ALU_SRC_1;
+                       alu.src[1].neg = 1;
+               } else {
+                       r = tgsi_src(ctx, &inst->Src[0], &alu.src[1]);
                        if (r)
                                return r;
+                       alu.src[1].chan = tgsi_chan(&inst->Src[0], i);
+               }
+               if (i == 3) {
                        alu.last = 1;
-                       r = r600_bc_add_alu(ctx->bc, &alu);
-                       if (r)
-                               return r;
                }
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
        }
+       r = r600_bc_add_literal(ctx->bc, ctx->value);
+       if (r)
+               return r;
+
+       /* kill must be last in ALU */
+       ctx->bc->force_add_cf = 1;
+       ctx->shader->uses_kill = TRUE;
        return 0;
 }
 
-static int tgsi_trans_srcx_replicate(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_bc_alu alu;
-       int i, j, r;
+       struct r600_bc_alu_src r600_src[3];
+       int r;
 
+       r = tgsi_split_constant(ctx, r600_src);
+       if (r)
+               return r;
+       r = tgsi_split_literal_constant(ctx, r600_src);
+       if (r)
+               return r;
+
+       /* dst.x, <- 1.0  */
        memset(&alu, 0, sizeof(struct r600_bc_alu));
-       alu.inst = ctx->inst_info->r600_opcode;
-       for (j = 0; j < inst->Instruction.NumSrcRegs; j++) {
-               r = tgsi_src(ctx, &inst->Src[j], &alu.src[j]);
-               if (r)
-                       return r;
-               alu.src[j].chan = tgsi_chan(&inst->Src[j], 0);
-       }
-       alu.dst.sel = ctx->temp_reg;
-       alu.dst.write = 1;
+       alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV);
+       alu.src[0].sel  = V_SQ_ALU_SRC_1; /*1.0*/
+       alu.src[0].chan = 0;
+       r = tgsi_dst(ctx, &inst->Dst[0], 0, &alu.dst);
+       if (r)
+               return r;
+       alu.dst.write = (inst->Dst[0].Register.WriteMask >> 0) & 1;
+       r = r600_bc_add_alu(ctx->bc, &alu);
+       if (r)
+               return r;
+
+       /* 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];
+       alu.src[1].sel  = V_SQ_ALU_SRC_0; /*0.0*/
+       alu.src[1].chan = 0;
+       r = tgsi_dst(ctx, &inst->Dst[0], 1, &alu.dst);
+       if (r)
+               return r;
+       alu.dst.write = (inst->Dst[0].Register.WriteMask >> 1) & 1;
+       r = r600_bc_add_alu(ctx->bc, &alu);
+       if (r)
+               return r;
+
+       /* dst.w, <- 1.0  */
+       memset(&alu, 0, sizeof(struct r600_bc_alu));
+       alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV);
+       alu.src[0].sel  = V_SQ_ALU_SRC_1;
+       alu.src[0].chan = 0;
+       r = tgsi_dst(ctx, &inst->Dst[0], 3, &alu.dst);
+       if (r)
+               return r;
+       alu.dst.write = (inst->Dst[0].Register.WriteMask >> 3) & 1;
        alu.last = 1;
        r = r600_bc_add_alu(ctx->bc, &alu);
        if (r)
                return r;
-       /* replicate result */
-       for (i = 0; i < 4; i++) {
+
+       r = r600_bc_add_literal(ctx->bc, ctx->value);
+       if (r)
+               return r;
+
+       if (inst->Dst[0].Register.WriteMask & (1 << 2))
+       {
+               int chan;
+               int sel;
+
+               /* 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);
+               r = tgsi_dst(ctx, &inst->Dst[0], 2, &alu.dst);
+               if (r)
+                       return r;
+               alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+
+               chan = alu.dst.chan;
+               sel = alu.dst.sel;
+
+               /* 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);
+               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);
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = 0;
+               alu.dst.write = 1;
+               alu.is_op3 = 1;
+               alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+               /* dst.z = exp(tmp.x) */
                memset(&alu, 0, sizeof(struct r600_bc_alu));
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_EXP_IEEE);
                alu.src[0].sel = ctx->temp_reg;
-               alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV;
-               alu.dst.chan = i;
-               r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
+               alu.src[0].chan = 0;
+               r = tgsi_dst(ctx, &inst->Dst[0], 2, &alu.dst);
                if (r)
                        return r;
-               alu.dst.write = (inst->Dst[0].Register.WriteMask >> i) & 1;
-               if (i == 3)
-                       alu.last = 1;
+               alu.last = 1;
                r = r600_bc_add_alu(ctx->bc, &alu);
                if (r)
                        return r;
@@ -919,67 +1180,300 @@ static int tgsi_trans_srcx_replicate(struct r600_shader_ctx *ctx)
        return 0;
 }
 
-static int tgsi_helper_copy(struct r600_shader_ctx *ctx, struct tgsi_full_instruction *inst)
+static int tgsi_rsq(struct r600_shader_ctx *ctx)
 {
+       struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
        struct r600_bc_alu alu;
        int i, r;
 
+       memset(&alu, 0, sizeof(struct r600_bc_alu));
+
+       /* FIXME:
+        * For state trackers other than OpenGL, we'll want to use
+        * _RECIPSQRT_IEEE instead.
+        */
+       alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_RECIPSQRT_CLAMPED);
+
+       for (i = 0; i < inst->Instruction.NumSrcRegs; i++) {
+               r = tgsi_src(ctx, &inst->Src[i], &alu.src[i]);
+               if (r)
+                       return r;
+               alu.src[i].chan = tgsi_chan(&inst->Src[i], 0);
+               alu.src[i].abs = 1;
+       }
+       alu.dst.sel = ctx->temp_reg;
+       alu.dst.write = 1;
+       alu.last = 1;
+       r = r600_bc_add_alu(ctx->bc, &alu);
+       if (r)
+               return r;
        r = r600_bc_add_literal(ctx->bc, ctx->value);
        if (r)
                return r;
+       /* replicate result */
+       return tgsi_helper_tempx_replicate(ctx);
+}
+
+static int tgsi_trans(struct r600_shader_ctx *ctx)
+{
+       struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_bc_alu alu;
+       int i, j, r;
+
        for (i = 0; i < 4; i++) {
                memset(&alu, 0, sizeof(struct r600_bc_alu));
-               if (!(inst->Dst[0].Register.WriteMask & (1 << i))) {
-                       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP;
-                       alu.dst.chan = i;
-               } else {
-                       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV;
+               if (inst->Dst[0].Register.WriteMask & (1 << i)) {
+                       alu.inst = ctx->inst_info->r600_opcode;
+                       for (j = 0; j < inst->Instruction.NumSrcRegs; j++) {
+                               r = tgsi_src(ctx, &inst->Src[j], &alu.src[j]);
+                               if (r)
+                                       return r;
+                               alu.src[j].chan = tgsi_chan(&inst->Src[j], i);
+                       }
                        r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
                        if (r)
                                return r;
-                       alu.src[0].sel = ctx->temp_reg;
-                       alu.src[0].chan = i;
-               }
-               if (i == 3) {
                        alu.last = 1;
+                       r = r600_bc_add_alu(ctx->bc, &alu);
+                       if (r)
+                               return r;
                }
-               r = r600_bc_add_alu(ctx->bc, &alu);
-               if (r)
-                       return r;
        }
        return 0;
 }
 
-static int tgsi_op3(struct r600_shader_ctx *ctx)
+static int tgsi_helper_tempx_replicate(struct r600_shader_ctx *ctx)
 {
        struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
-       struct r600_bc_alu_src r600_src[3];
        struct r600_bc_alu alu;
-       int i, j, r;
+       int i, r;
 
-       r = tgsi_split_constant(ctx, r600_src);
-       if (r)
-               return r;
-       /* do it in 2 step as op3 doesn't support writemask */
        for (i = 0; i < 4; i++) {
                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);
-               }
-               alu.dst.sel = ctx->temp_reg;
+               alu.src[0].sel = ctx->temp_reg;
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV);
                alu.dst.chan = i;
-               alu.dst.write = 1;
-               alu.is_op3 = 1;
-               if (i == 3) {
+               r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
+               if (r)
+                       return r;
+               alu.dst.write = (inst->Dst[0].Register.WriteMask >> i) & 1;
+               if (i == 3)
                        alu.last = 1;
-               }
                r = r600_bc_add_alu(ctx->bc, &alu);
                if (r)
                        return r;
        }
-       return tgsi_helper_copy(ctx, inst);
+       return 0;
+}
+
+static int tgsi_trans_srcx_replicate(struct r600_shader_ctx *ctx)
+{
+       struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       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++) {
+               r = tgsi_src(ctx, &inst->Src[i], &alu.src[i]);
+               if (r)
+                       return r;
+               alu.src[i].chan = tgsi_chan(&inst->Src[i], 0);
+       }
+       alu.dst.sel = ctx->temp_reg;
+       alu.dst.write = 1;
+       alu.last = 1;
+       r = r600_bc_add_alu(ctx->bc, &alu);
+       if (r)
+               return r;
+       r = r600_bc_add_literal(ctx->bc, ctx->value);
+       if (r)
+               return r;
+       /* replicate result */
+       return tgsi_helper_tempx_replicate(ctx);
+}
+
+static int tgsi_pow(struct r600_shader_ctx *ctx)
+{
+       struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_bc_alu alu;
+       int r;
+
+       /* LOG2(a) */
+       memset(&alu, 0, sizeof(struct r600_bc_alu));
+       alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_LOG_IEEE);
+       r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
+       if (r)
+               return r;
+       alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+       alu.dst.sel = ctx->temp_reg;
+       alu.dst.write = 1;
+       alu.last = 1;
+       r = r600_bc_add_alu(ctx->bc, &alu);
+       if (r)
+               return r;
+       r = r600_bc_add_literal(ctx->bc,ctx->value);
+       if (r)
+               return r;
+       /* b * LOG2(a) */
+       memset(&alu, 0, sizeof(struct r600_bc_alu));
+       alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL_IEEE);
+       r = tgsi_src(ctx, &inst->Src[1], &alu.src[0]);
+       if (r)
+               return r;
+       alu.src[0].chan = tgsi_chan(&inst->Src[1], 0);
+       alu.src[1].sel = ctx->temp_reg;
+       alu.dst.sel = ctx->temp_reg;
+       alu.dst.write = 1;
+       alu.last = 1;
+       r = r600_bc_add_alu(ctx->bc, &alu);
+       if (r)
+               return r;
+       r = r600_bc_add_literal(ctx->bc,ctx->value);
+       if (r)
+               return r;
+       /* POW(a,b) = EXP2(b * LOG2(a))*/
+       memset(&alu, 0, sizeof(struct r600_bc_alu));
+       alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_EXP_IEEE);
+       alu.src[0].sel = ctx->temp_reg;
+       alu.dst.sel = ctx->temp_reg;
+       alu.dst.write = 1;
+       alu.last = 1;
+       r = r600_bc_add_alu(ctx->bc, &alu);
+       if (r)
+               return r;
+       r = r600_bc_add_literal(ctx->bc,ctx->value);
+       if (r)
+               return r;
+       return tgsi_helper_tempx_replicate(ctx);
+}
+
+static int tgsi_ssg(struct r600_shader_ctx *ctx)
+{
+       struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_bc_alu alu;
+       struct r600_bc_alu_src r600_src[3];
+       int i, r;
+
+       r = tgsi_split_constant(ctx, r600_src);
+       if (r)
+               return r;
+
+       /* tmp = (src > 0 ? 1 : src) */
+       for (i = 0; i < 4; i++) {
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP3_SQ_OP3_INST_CNDGT);
+               alu.is_op3 = 1;
+
+               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);
+
+               alu.src[1].sel = V_SQ_ALU_SRC_1;
+
+               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);
+               if (r)
+                       return r;
+       }
+       r = r600_bc_add_literal(ctx->bc, ctx->value);
+       if (r)
+               return r;
+
+       /* dst = (-tmp > 0 ? -1 : tmp) */
+       for (i = 0; i < 4; i++) {
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP3_SQ_OP3_INST_CNDGT);
+               alu.is_op3 = 1;
+               r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
+               if (r)
+                       return r;
+
+               alu.src[0].sel = ctx->temp_reg;
+               alu.src[0].chan = i;
+               alu.src[0].neg = 1;
+
+               alu.src[1].sel = V_SQ_ALU_SRC_1;
+               alu.src[1].neg = 1;
+
+               alu.src[2].sel = ctx->temp_reg;
+               alu.src[2].chan = i;
+
+               if (i == 3)
+                       alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+       }
+       return 0;
+}
+
+static int tgsi_helper_copy(struct r600_shader_ctx *ctx, struct tgsi_full_instruction *inst)
+{
+       struct r600_bc_alu alu;
+       int i, r;
+
+       r = r600_bc_add_literal(ctx->bc, ctx->value);
+       if (r)
+               return r;
+       for (i = 0; i < 4; i++) {
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+               if (!(inst->Dst[0].Register.WriteMask & (1 << i))) {
+                       alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP);
+                       alu.dst.chan = i;
+               } else {
+                       alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV);
+                       r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
+                       if (r)
+                               return r;
+                       alu.src[0].sel = ctx->temp_reg;
+                       alu.src[0].chan = i;
+               }
+               if (i == 3) {
+                       alu.last = 1;
+               }
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+       }
+       return 0;
+}
+
+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_bc_alu alu;
+       int i, j, r;
+
+       r = tgsi_split_constant(ctx, r600_src);
+       if (r)
+               return r;
+       /* do it in 2 step as op3 doesn't support writemask */
+       for (i = 0; i < 4; i++) {
+               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);
+               }
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = i;
+               alu.dst.write = 1;
+               alu.is_op3 = 1;
+               if (i == 3) {
+                       alu.last = 1;
+               }
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+       }
+       return tgsi_helper_copy(ctx, inst);
 }
 
 static int tgsi_dp(struct r600_shader_ctx *ctx)
@@ -1006,222 +1500,1223 @@ static int tgsi_dp(struct r600_shader_ctx *ctx)
                switch (ctx->inst_info->tgsi_opcode) {
                case TGSI_OPCODE_DP2:
                        if (i > 1) {
-                               alu.src[0].sel = alu.src[1].sel = 248;
+                               alu.src[0].sel = alu.src[1].sel = V_SQ_ALU_SRC_0;
                                alu.src[0].chan = alu.src[1].chan = 0;
                        }
                        break;
                case TGSI_OPCODE_DP3:
                        if (i > 2) {
-                               alu.src[0].sel = alu.src[1].sel = 248;
+                               alu.src[0].sel = alu.src[1].sel = V_SQ_ALU_SRC_0;
                                alu.src[0].chan = alu.src[1].chan = 0;
                        }
                        break;
+               case TGSI_OPCODE_DPH:
+                       if (i == 3) {
+                               alu.src[0].sel = V_SQ_ALU_SRC_1;
+                               alu.src[0].chan = 0;
+                               alu.src[0].neg = 0;
+                       }
+                       break;
                default:
                        break;
                }
-               if (i == 3) {
-                       alu.last = 1;
+               if (i == 3) {
+                       alu.last = 1;
+               }
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+       }
+       return tgsi_helper_copy(ctx, inst);
+}
+
+static int tgsi_tex(struct r600_shader_ctx *ctx)
+{
+       struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_bc_tex tex;
+       struct r600_bc_alu alu;
+       unsigned src_gpr;
+       int r, i;
+       int opcode;
+       boolean src_not_temp = inst->Src[0].Register.File != TGSI_FILE_TEMPORARY;
+       uint32_t lit_vals[4];
+
+       src_gpr = ctx->file_offset[inst->Src[0].Register.File] + inst->Src[0].Register.Index;
+
+       if (inst->Instruction.Opcode == TGSI_OPCODE_TXP) {
+               /* 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);
+               r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
+               if (r)
+                       return r;
+
+               alu.src[0].chan = tgsi_chan(&inst->Src[0], 3);
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = 3;
+               alu.last = 1;
+               alu.dst.write = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+               
+               for (i = 0; i < 3; i++) {
+                       memset(&alu, 0, sizeof(struct r600_bc_alu));
+                       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;
+                       r = tgsi_src(ctx, &inst->Src[0], &alu.src[1]);
+                       if (r)
+                               return r;
+                       alu.src[1].chan = tgsi_chan(&inst->Src[0], i);
+                       alu.dst.sel = ctx->temp_reg;
+                       alu.dst.chan = i;
+                       alu.dst.write = 1;
+                       r = r600_bc_add_alu(ctx->bc, &alu);
+                       if (r)
+                               return r;
+               }
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV);
+               alu.src[0].sel = V_SQ_ALU_SRC_1;
+               alu.src[0].chan = 0;
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = 3;
+               alu.last = 1;
+               alu.dst.write = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+               src_not_temp = FALSE;
+               src_gpr = ctx->temp_reg;
+       }
+
+       if (inst->Texture.Texture == TGSI_TEXTURE_CUBE) {
+               int src_chan, src2_chan;
+
+               /* tmp1.xyzw = CUBE(R0.zzxy, R0.yxzz) */
+               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_CUBE);
+                       switch (i) {
+                       case 0:
+                               src_chan = 2;
+                               src2_chan = 1;
+                               break;
+                       case 1:
+                               src_chan = 2;
+                               src2_chan = 0;
+                               break;
+                       case 2:
+                               src_chan = 0;
+                               src2_chan = 2;
+                               break;
+                       case 3:
+                               src_chan = 1;
+                               src2_chan = 2;
+                               break;
+                       }
+                       r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
+                       if (r)
+                               return r;
+                       alu.src[0].chan = tgsi_chan(&inst->Src[0], src_chan);
+                       r = tgsi_src(ctx, &inst->Src[0], &alu.src[1]);
+                       if (r)
+                               return r;
+                       alu.src[1].chan = tgsi_chan(&inst->Src[0], src2_chan);
+                       alu.dst.sel = ctx->temp_reg;
+                       alu.dst.chan = i;
+                       if (i == 3)
+                               alu.last = 1;
+                       alu.dst.write = 1;
+                       r = r600_bc_add_alu(ctx->bc, &alu);
+                       if (r)
+                               return r;
+               }
+
+               /* tmp1.z = RCP_e(|tmp1.z|) */
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_RECIP_IEEE);
+               alu.src[0].sel = ctx->temp_reg;
+               alu.src[0].chan = 2;
+               alu.src[0].abs = 1;
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = 2;
+               alu.dst.write = 1;
+               alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+               
+               /* MULADD R0.x,  R0.x,  PS1,  (0x3FC00000, 1.5f).x
+                * MULADD R0.y,  R0.y,  PS1,  (0x3FC00000, 1.5f).x
+                * muladd has no writemask, have to use another temp 
+                */
+               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].sel = ctx->temp_reg;
+               alu.src[0].chan = 0;
+               alu.src[1].sel = ctx->temp_reg;
+               alu.src[1].chan = 2;
+               
+               alu.src[2].sel = V_SQ_ALU_SRC_LITERAL;
+               alu.src[2].chan = 0;
+
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = 0;
+               alu.dst.write = 1;
+
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+
+               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].sel = ctx->temp_reg;
+               alu.src[0].chan = 1;
+               alu.src[1].sel = ctx->temp_reg;
+               alu.src[1].chan = 2;
+               
+               alu.src[2].sel = V_SQ_ALU_SRC_LITERAL;
+               alu.src[2].chan = 0;
+
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = 1;
+               alu.dst.write = 1;
+
+               alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+
+               lit_vals[0] = fui(1.5f);
+
+               r = r600_bc_add_literal(ctx->bc, lit_vals);
+               if (r)
+                       return r;
+               src_not_temp = FALSE;
+               src_gpr = ctx->temp_reg;
+       }
+
+       if (src_not_temp) {
+               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);
+                       alu.src[0].sel = src_gpr;
+                       alu.src[0].chan = i;
+                       alu.dst.sel = ctx->temp_reg;
+                       alu.dst.chan = i;
+                       if (i == 3)
+                               alu.last = 1;
+                       alu.dst.write = 1;
+                       r = r600_bc_add_alu(ctx->bc, &alu);
+                       if (r)
+                               return r;
+               }
+               src_gpr = ctx->temp_reg;
+       }
+       
+       opcode = ctx->inst_info->r600_opcode;
+       if (opcode == SQ_TEX_INST_SAMPLE &&
+           (inst->Texture.Texture == TGSI_TEXTURE_SHADOW1D || inst->Texture.Texture == TGSI_TEXTURE_SHADOW2D))
+               opcode = SQ_TEX_INST_SAMPLE_C;
+
+       memset(&tex, 0, sizeof(struct r600_bc_tex));
+       tex.inst = opcode;
+       tex.resource_id = ctx->file_offset[inst->Src[1].Register.File] + inst->Src[1].Register.Index;
+       tex.sampler_id = tex.resource_id;
+       tex.src_gpr = src_gpr;
+       tex.dst_gpr = ctx->file_offset[inst->Dst[0].Register.File] + inst->Dst[0].Register.Index;
+       tex.dst_sel_x = 0;
+       tex.dst_sel_y = 1;
+       tex.dst_sel_z = 2;
+       tex.dst_sel_w = 3;
+       tex.src_sel_x = 0;
+       tex.src_sel_y = 1;
+       tex.src_sel_z = 2;
+       tex.src_sel_w = 3;
+
+       if (inst->Texture.Texture == TGSI_TEXTURE_CUBE) {
+               tex.src_sel_x = 1;
+               tex.src_sel_y = 0;
+               tex.src_sel_z = 3;
+               tex.src_sel_w = 1;
+       }
+
+       if (inst->Texture.Texture != TGSI_TEXTURE_RECT) {
+               tex.coord_type_x = 1;
+               tex.coord_type_y = 1;
+               tex.coord_type_z = 1;
+               tex.coord_type_w = 1;
+       }
+
+       if (inst->Texture.Texture == TGSI_TEXTURE_SHADOW1D || inst->Texture.Texture == TGSI_TEXTURE_SHADOW2D)
+               tex.src_sel_w = 2;
+
+       r = r600_bc_add_tex(ctx->bc, &tex);
+       if (r)
+               return r;
+
+       /* add shadow ambient support  - gallium doesn't do it yet */
+       return 0;
+       
+}
+
+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_bc_alu alu;
+       unsigned i;
+       int r;
+
+       r = tgsi_split_constant(ctx, r600_src);
+       if (r)
+               return r;
+       /* 1 - src0 */
+       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_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);
+               alu.src[1].neg = 1;
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = i;
+               if (i == 3) {
+                       alu.last = 1;
+               }
+               alu.dst.write = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+       }
+       r = r600_bc_add_literal(ctx->bc, ctx->value);
+       if (r)
+               return r;
+
+       /* (1 - src0) * src2 */
+       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_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);
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = i;
+               if (i == 3) {
+                       alu.last = 1;
+               }
+               alu.dst.write = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+       }
+       r = r600_bc_add_literal(ctx->bc, ctx->value);
+       if (r)
+               return r;
+
+       /* src0 * src1 + (1 - src0) * src2 */
+       for (i = 0; i < 4; i++) {
+               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);
+               alu.src[2].sel = ctx->temp_reg;
+               alu.src[2].chan = i;
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = i;
+               if (i == 3) {
+                       alu.last = 1;
+               }
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+       }
+       return tgsi_helper_copy(ctx, inst);
+}
+
+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_bc_alu alu;
+       int use_temp = 0;
+       int i, r;
+
+       r = tgsi_split_constant(ctx, r600_src);
+       if (r)
+               return r;
+
+       if (inst->Dst[0].Register.WriteMask != 0xf)
+               use_temp = 1;
+
+       for (i = 0; i < 4; i++) {
+               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);
+
+               if (use_temp)
+                       alu.dst.sel = ctx->temp_reg;
+               else {
+                       r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
+                       if (r)
+                               return r;
+               }
+               alu.dst.chan = i;
+               alu.dst.write = 1;
+               alu.is_op3 = 1;
+               if (i == 3)
+                       alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+       }       
+       if (use_temp)
+               return tgsi_helper_copy(ctx, inst);
+       return 0;
+}
+
+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_bc_alu alu;
+       uint32_t use_temp = 0;
+       int i, r;
+
+       if (inst->Dst[0].Register.WriteMask != 0xf)
+               use_temp = 1;
+
+       r = tgsi_split_constant(ctx, r600_src);
+       if (r)
+               return r;
+       
+       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_MUL);
+
+               alu.src[0] = r600_src[0];
+               switch (i) {
+               case 0:
+                       alu.src[0].chan = tgsi_chan(&inst->Src[0], 2);
+                       break;
+               case 1:
+                       alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+                       break;
+               case 2:
+                       alu.src[0].chan = tgsi_chan(&inst->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);
+                       break;
+               case 1:
+                       alu.src[1].chan = tgsi_chan(&inst->Src[1], 2);
+                       break;
+               case 2:
+                       alu.src[1].chan = tgsi_chan(&inst->Src[1], 0);
+                       break;
+               case 3:
+                       alu.src[1].sel = V_SQ_ALU_SRC_0;
+                       alu.src[1].chan = i;
+               }
+
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = i;
+               alu.dst.write = 1;
+
+               if (i == 3)
+                       alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+       }
+
+       for (i = 0; i < 4; i++) {
+               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);
+                       break;
+               case 1:
+                       alu.src[0].chan = tgsi_chan(&inst->Src[0], 2);
+                       break;
+               case 2:
+                       alu.src[0].chan = tgsi_chan(&inst->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);
+                       break;
+               case 1:
+                       alu.src[1].chan = tgsi_chan(&inst->Src[1], 0);
+                       break;
+               case 2:
+                       alu.src[1].chan = tgsi_chan(&inst->Src[1], 1);
+                       break;
+               case 3:
+                       alu.src[1].sel = V_SQ_ALU_SRC_0;
+                       alu.src[1].chan = i;
+               }
+
+               alu.src[2].sel = ctx->temp_reg;
+               alu.src[2].neg = 1;
+               alu.src[2].chan = i;
+
+               if (use_temp)
+                       alu.dst.sel = ctx->temp_reg;
+               else {
+                       r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
+                       if (r)
+                               return r;
+               }
+               alu.dst.chan = i;
+               alu.dst.write = 1;
+               alu.is_op3 = 1;
+               if (i == 3)
+                       alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+       }
+       if (use_temp)
+               return tgsi_helper_copy(ctx, inst);
+       return 0;
+}
+
+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];
+       struct r600_bc_alu alu;
+       int r;
+
+       /* 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);
+               r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
+               if (r)
+                       return r;
+
+               alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = 0;
+               alu.dst.write = 1;
+               alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_EXP_IEEE);
+               alu.src[0].sel = ctx->temp_reg;
+               alu.src[0].chan = 0;
+
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = 0;
+               alu.dst.write = 1;
+               alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+       }
+               
+       /* result.y = tmp - floor(tmp); */
+       if ((inst->Dst[0].Register.WriteMask >> 1) & 1) {
+               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];
+               r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
+               if (r)
+                       return r;
+               alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+
+               alu.dst.sel = ctx->temp_reg;
+//             r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
+//             if (r)
+//                     return r;
+               alu.dst.write = 1;
+               alu.dst.chan = 1;
+
+               alu.last = 1;
+
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+       }
+
+       /* result.z = RoughApprox2ToX(tmp);*/
+       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);
+               r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
+               if (r)
+                       return r;
+               alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.write = 1;
+               alu.dst.chan = 2;
+
+               alu.last = 1;
+
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+       }
+
+       /* result.w = 1.0;*/
+       if ((inst->Dst[0].Register.WriteMask >> 3) & 0x1) {
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV);
+               alu.src[0].sel = V_SQ_ALU_SRC_1;
+               alu.src[0].chan = 0;
+
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = 3;
+               alu.dst.write = 1;
+               alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+       }
+       return tgsi_helper_copy(ctx, inst);
+}
+
+static int tgsi_log(struct r600_shader_ctx *ctx)
+{
+       struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_bc_alu alu;
+       int r;
+
+       /* 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);
+               r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
+               if (r)
+                       return r;
+
+               alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = 0;
+               alu.dst.write = 1;
+               alu.last = 1;
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_FLOOR);
+               alu.src[0].sel = ctx->temp_reg;
+               alu.src[0].chan = 0;
+
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = 0;
+               alu.dst.write = 1;
+               alu.last = 1;
+
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+       }
+
+       /* result.y = src.x / (2 ^ floor(log2(src.x))); */
+       if ((inst->Dst[0].Register.WriteMask >> 1) & 1) {
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_LOG_IEEE);
+               r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
+               if (r)
+                       return r;
+
+               alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = 1;
+               alu.dst.write = 1;
+               alu.last = 1;
+
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_FLOOR);
+               alu.src[0].sel = ctx->temp_reg;
+               alu.src[0].chan = 1;
+
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = 1;
+               alu.dst.write = 1;
+               alu.last = 1;
+
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_EXP_IEEE);
+               alu.src[0].sel = ctx->temp_reg;
+               alu.src[0].chan = 1;
+
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = 1;
+               alu.dst.write = 1;
+               alu.last = 1;
+
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_RECIP_IEEE);
+               alu.src[0].sel = ctx->temp_reg;
+               alu.src[0].chan = 1;
+
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = 1;
+               alu.dst.write = 1;
+               alu.last = 1;
+
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL);
+
+               r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
+               if (r)
+                       return r;
+
+               alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+
+               alu.src[1].sel = ctx->temp_reg;
+               alu.src[1].chan = 1;
+
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = 1;
+               alu.dst.write = 1;
+               alu.last = 1;
+
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+       }
+
+       /* result.z = log2(src);*/
+       if ((inst->Dst[0].Register.WriteMask >> 2) & 1) {
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_LOG_IEEE);
+               r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
+               if (r)
+                       return r;
+
+               alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.write = 1;
+               alu.dst.chan = 2;
+               alu.last = 1;
+
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+       }
+
+       /* result.w = 1.0; */
+       if ((inst->Dst[0].Register.WriteMask >> 3) & 1) {
+               memset(&alu, 0, sizeof(struct r600_bc_alu));
+
+               alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV);
+               alu.src[0].sel = V_SQ_ALU_SRC_1;
+               alu.src[0].chan = 0;
+
+               alu.dst.sel = ctx->temp_reg;
+               alu.dst.chan = 3;
+               alu.dst.write = 1;
+               alu.last = 1;
+
+               r = r600_bc_add_alu(ctx->bc, &alu);
+               if (r)
+                       return r;
+
+               r = r600_bc_add_literal(ctx->bc, ctx->value);
+               if (r)
+                       return r;
+       }
+
+       return tgsi_helper_copy(ctx, inst);
+}
+
+/* r6/7 only for now */
+static int tgsi_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_bc_alu alu;
+       int r;
+       memset(&alu, 0, sizeof(struct r600_bc_alu));
+
+       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOVA_FLOOR;
+
+       r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
+       if (r)
+               return r;
+       alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+
+       alu.last = 1;
+
+       r = r600_bc_add_alu_type(ctx->bc, &alu, CTX_INST(V_SQ_CF_ALU_WORD1_SQ_CF_INST_ALU));
+       if (r)
+               return r;
+       ctx->bc->cf_last->r6xx_uses_waterfall = 1;
+       return 0;
+}
+
+static int tgsi_opdst(struct r600_shader_ctx *ctx)
+{
+       struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
+       struct r600_bc_alu alu;
+       int i, r = 0;
+
+       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_MUL);
+               r = tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
+               if (r)
+                       return r;
+       
+               if (i == 0 || i == 3) {
+                       alu.src[0].sel = V_SQ_ALU_SRC_1;
+               } else {
+                       r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
+                       if (r)
+                               return r;
+                       alu.src[0].chan = tgsi_chan(&inst->Src[0], i);
+               }
+
+               if (i == 0 || i == 2) {
+                       alu.src[1].sel = V_SQ_ALU_SRC_1;
+               } else {
+                       r = tgsi_src(ctx, &inst->Src[1], &alu.src[1]);
+                       if (r)
+                               return r;
+                       alu.src[1].chan = tgsi_chan(&inst->Src[1], i);
                }
+               if (i == 3)
+                       alu.last = 1;
                r = r600_bc_add_alu(ctx->bc, &alu);
                if (r)
                        return r;
        }
-       return tgsi_helper_copy(ctx, inst);
+       return 0;
 }
 
-static int tgsi_tex(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_bc_tex tex;
        struct r600_bc_alu alu;
-       unsigned src_gpr;
        int r;
 
-       src_gpr = ctx->file_offset[inst->Src[0].Register.File] + inst->Src[0].Register.Index;
-
-       /* Add perspective divide */
        memset(&alu, 0, sizeof(struct r600_bc_alu));
-       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_RECIP_IEEE;
-       alu.src[0].sel = src_gpr;
-       alu.src[0].chan = tgsi_chan(&inst->Src[0], 3);
-       alu.dst.sel = ctx->temp_reg;
-       alu.dst.chan = 3;
-       alu.last = 1;
-       alu.dst.write = 1;
-       r = r600_bc_add_alu(ctx->bc, &alu);
-       if (r)
-               return r;
+       alu.inst = opcode;
+       alu.predicate = 1;
 
-       memset(&alu, 0, sizeof(struct r600_bc_alu));
-       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL;
-       alu.src[0].sel = ctx->temp_reg;
-       alu.src[0].chan = 3;
-       alu.src[1].sel = src_gpr;
-       alu.src[1].chan = tgsi_chan(&inst->Src[0], 0);
-       alu.dst.sel = ctx->temp_reg;
-       alu.dst.chan = 0;
-       alu.dst.write = 1;
-       r = r600_bc_add_alu(ctx->bc, &alu);
-       if (r)
-               return r;
-       memset(&alu, 0, sizeof(struct r600_bc_alu));
-       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL;
-       alu.src[0].sel = ctx->temp_reg;
-       alu.src[0].chan = 3;
-       alu.src[1].sel = src_gpr;
-       alu.src[1].chan = tgsi_chan(&inst->Src[0], 1);
-       alu.dst.sel = ctx->temp_reg;
-       alu.dst.chan = 1;
-       alu.dst.write = 1;
-       r = r600_bc_add_alu(ctx->bc, &alu);
-       if (r)
-               return r;
-       memset(&alu, 0, sizeof(struct r600_bc_alu));
-       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL;
-       alu.src[0].sel = ctx->temp_reg;
-       alu.src[0].chan = 3;
-       alu.src[1].sel = src_gpr;
-       alu.src[1].chan = tgsi_chan(&inst->Src[0], 2);
        alu.dst.sel = ctx->temp_reg;
-       alu.dst.chan = 2;
        alu.dst.write = 1;
-       r = r600_bc_add_alu(ctx->bc, &alu);
+       alu.dst.chan = 0;
+
+       r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]);
        if (r)
                return r;
-       memset(&alu, 0, sizeof(struct r600_bc_alu));
-       alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV;
-       alu.src[0].sel = 249;
-       alu.src[0].chan = 0;
-       alu.dst.sel = ctx->temp_reg;
-       alu.dst.chan = 3;
+       alu.src[0].chan = tgsi_chan(&inst->Src[0], 0);
+       alu.src[1].sel = V_SQ_ALU_SRC_0;
+       alu.src[1].chan = 0;
+       
        alu.last = 1;
-       alu.dst.write = 1;
-       r = r600_bc_add_alu(ctx->bc, &alu);
+
+       r = r600_bc_add_alu_type(ctx->bc, &alu, CTX_INST(V_SQ_CF_ALU_WORD1_SQ_CF_INST_ALU_PUSH_BEFORE));
        if (r)
                return r;
-       src_gpr = ctx->temp_reg;
+       return 0;
+}
 
-       /* TODO use temp if src_gpr is not a temporary reg (File != TEMPORARY) */
-       memset(&tex, 0, sizeof(struct r600_bc_tex));
-       tex.inst = ctx->inst_info->r600_opcode;
-       tex.resource_id = ctx->file_offset[inst->Src[1].Register.File] + inst->Src[1].Register.Index;
-       tex.sampler_id = tex.resource_id;
-       tex.src_gpr = src_gpr;
-       tex.dst_gpr = ctx->file_offset[inst->Dst[0].Register.File] + inst->Dst[0].Register.Index;
-       tex.dst_sel_x = 0;
-       tex.dst_sel_y = 1;
-       tex.dst_sel_z = 2;
-       tex.dst_sel_w = 3;
-       tex.src_sel_x = 0;
-       tex.src_sel_y = 1;
-       tex.src_sel_z = 2;
-       tex.src_sel_w = 3;
+static int pops(struct r600_shader_ctx *ctx, int pops)
+{
+       r600_bc_add_cfinst(ctx->bc, CTX_INST(V_SQ_CF_WORD1_SQ_CF_INST_POP));
+       ctx->bc->cf_last->pop_count = pops;
+       return 0;
+}
 
-       if (inst->Texture.Texture != TGSI_TEXTURE_RECT) {
-               tex.coord_type_x = 1;
-               tex.coord_type_y = 1;
-               tex.coord_type_z = 1;
-               tex.coord_type_w = 1;
+static inline void callstack_decrease_current(struct r600_shader_ctx *ctx, unsigned reason)
+{
+       switch(reason) {
+       case FC_PUSH_VPM:
+               ctx->bc->callstack[ctx->bc->call_sp].current--;
+               break;
+       case FC_PUSH_WQM:
+       case FC_LOOP:
+               ctx->bc->callstack[ctx->bc->call_sp].current -= 4;
+               break;
+       case FC_REP:
+               /* TOODO : for 16 vp asic should -= 2; */
+               ctx->bc->callstack[ctx->bc->call_sp].current --;
+               break;
        }
-       return r600_bc_add_tex(ctx->bc, &tex);
 }
 
-static int tgsi_lrp(struct r600_shader_ctx *ctx)
+static inline void callstack_check_depth(struct r600_shader_ctx *ctx, unsigned reason, unsigned check_max_only)
 {
-       struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
-       struct r600_bc_alu_src r600_src[3];
-       struct r600_bc_alu alu;
-       unsigned i;
-       int r;
-
-       r = tgsi_split_constant(ctx, r600_src);
-       if (r)
-               return r;
-       /* 1 - src0 */
-       for (i = 0; i < 4; i++) {
-               memset(&alu, 0, sizeof(struct r600_bc_alu));
-               alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_ADD;
-               alu.src[0].sel = 249;
-               alu.src[0].chan = 0;
-               alu.src[1] = r600_src[0];
-               alu.src[1].chan = tgsi_chan(&inst->Src[0], i);
-               alu.src[1].neg = 1;
-               alu.dst.sel = ctx->temp_reg;
-               alu.dst.chan = i;
-               if (i == 3) {
-                       alu.last = 1;
+       if (check_max_only) {
+               int diff;
+               switch (reason) {
+               case FC_PUSH_VPM:
+                       diff = 1;
+                       break;
+               case FC_PUSH_WQM:
+                       diff = 4;
+                       break;
+               default:
+                       assert(0);
+                       diff = 0;
                }
-               alu.dst.write = 1;
-               r = r600_bc_add_alu(ctx->bc, &alu);
-               if (r)
-                       return r;
+               if ((ctx->bc->callstack[ctx->bc->call_sp].current + diff) >
+                   ctx->bc->callstack[ctx->bc->call_sp].max) {
+                       ctx->bc->callstack[ctx->bc->call_sp].max =
+                               ctx->bc->callstack[ctx->bc->call_sp].current + diff;
+               }
+               return;
+       }                                       
+       switch (reason) {
+       case FC_PUSH_VPM:
+               ctx->bc->callstack[ctx->bc->call_sp].current++;
+               break;
+       case FC_PUSH_WQM:
+       case FC_LOOP:
+               ctx->bc->callstack[ctx->bc->call_sp].current += 4;
+               break;
+       case FC_REP:
+               ctx->bc->callstack[ctx->bc->call_sp].current++;
+               break;
        }
-       r = r600_bc_add_literal(ctx->bc, ctx->value);
-       if (r)
-               return r;
 
-       /* (1 - src0) * src2 */
-       for (i = 0; i < 4; i++) {
-               memset(&alu, 0, sizeof(struct r600_bc_alu));
-               alu.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);
-               alu.dst.sel = ctx->temp_reg;
-               alu.dst.chan = i;
-               if (i == 3) {
-                       alu.last = 1;
-               }
-               alu.dst.write = 1;
-               r = r600_bc_add_alu(ctx->bc, &alu);
-               if (r)
-                       return r;
+       if ((ctx->bc->callstack[ctx->bc->call_sp].current) >
+           ctx->bc->callstack[ctx->bc->call_sp].max) {
+               ctx->bc->callstack[ctx->bc->call_sp].max =
+                       ctx->bc->callstack[ctx->bc->call_sp].current;
        }
-       r = r600_bc_add_literal(ctx->bc, ctx->value);
-       if (r)
-               return r;
+}
 
-       /* src0 * src1 + (1 - src0) * src2 */
-       for (i = 0; i < 4; i++) {
-               memset(&alu, 0, sizeof(struct r600_bc_alu));
-               alu.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);
-               alu.src[2].sel = ctx->temp_reg;
-               alu.src[2].chan = i;
-               alu.dst.sel = ctx->temp_reg;
-               alu.dst.chan = i;
-               if (i == 3) {
-                       alu.last = 1;
-               }
-               r = r600_bc_add_alu(ctx->bc, &alu);
-               if (r)
-                       return r;
+static void fc_set_mid(struct r600_shader_ctx *ctx, int fc_sp)
+{
+       struct r600_cf_stack_entry *sp = &ctx->bc->fc_stack[fc_sp];
+
+       sp->mid = (struct r600_bc_cf **)realloc((void *)sp->mid,
+                                               sizeof(struct r600_bc_cf *) * (sp->num_mid + 1));
+       sp->mid[sp->num_mid] = ctx->bc->cf_last;
+       sp->num_mid++;
+}
+
+static void fc_pushlevel(struct r600_shader_ctx *ctx, int type)
+{
+       ctx->bc->fc_sp++;
+       ctx->bc->fc_stack[ctx->bc->fc_sp].type = type;
+       ctx->bc->fc_stack[ctx->bc->fc_sp].start = ctx->bc->cf_last;
+}
+
+static void fc_poplevel(struct r600_shader_ctx *ctx)
+{
+       struct r600_cf_stack_entry *sp = &ctx->bc->fc_stack[ctx->bc->fc_sp];
+       if (sp->mid) {
+               free(sp->mid);
+               sp->mid = NULL;
        }
-       return tgsi_helper_copy(ctx, inst);
+       sp->num_mid = 0;
+       sp->start = NULL;
+       sp->type = 0;
+       ctx->bc->fc_sp--;
+}
+
+#if 0
+static int emit_return(struct r600_shader_ctx *ctx)
+{
+       r600_bc_add_cfinst(ctx->bc, V_SQ_CF_WORD1_SQ_CF_INST_RETURN);
+       return 0;
+}
+
+static int emit_jump_to_offset(struct r600_shader_ctx *ctx, int pops, int offset)
+{
+
+       r600_bc_add_cfinst(ctx->bc, V_SQ_CF_WORD1_SQ_CF_INST_JUMP);
+       ctx->bc->cf_last->pop_count = pops;
+       /* TODO work out offset */
+       return 0;
+}
+
+static int emit_setret_in_loop_flag(struct r600_shader_ctx *ctx, unsigned flag_value)
+{
+       return 0;
+}
+
+static void emit_testflag(struct r600_shader_ctx *ctx)
+{
+       
+}
+
+static void emit_return_on_flag(struct r600_shader_ctx *ctx, unsigned ifidx)
+{
+       emit_testflag(ctx);
+       emit_jump_to_offset(ctx, 1, 4);
+       emit_setret_in_loop_flag(ctx, V_SQ_ALU_SRC_0);
+       pops(ctx, ifidx + 1);
+       emit_return(ctx);
+}
+
+static void break_loop_on_flag(struct r600_shader_ctx *ctx, unsigned fc_sp)
+{
+       emit_testflag(ctx);
+
+       r600_bc_add_cfinst(ctx->bc, ctx->inst_info->r600_opcode);
+       ctx->bc->cf_last->pop_count = 1;
+
+       fc_set_mid(ctx, fc_sp);
+
+       pops(ctx, 1);
+}
+#endif
+
+static int tgsi_if(struct r600_shader_ctx *ctx)
+{
+       emit_logic_pred(ctx, CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETNE));
+
+       r600_bc_add_cfinst(ctx->bc, CTX_INST(V_SQ_CF_WORD1_SQ_CF_INST_JUMP));
+
+       fc_pushlevel(ctx, FC_IF);
+
+       callstack_check_depth(ctx, FC_PUSH_VPM, 0);
+       return 0;
+}
+
+static int tgsi_else(struct r600_shader_ctx *ctx)
+{
+       r600_bc_add_cfinst(ctx->bc, CTX_INST(V_SQ_CF_WORD1_SQ_CF_INST_ELSE));
+       ctx->bc->cf_last->pop_count = 1;
+
+       fc_set_mid(ctx, ctx->bc->fc_sp);
+       ctx->bc->fc_stack[ctx->bc->fc_sp].start->cf_addr = ctx->bc->cf_last->id;
+       return 0;
+}
+
+static int tgsi_endif(struct r600_shader_ctx *ctx)
+{
+       pops(ctx, 1);
+       if (ctx->bc->fc_stack[ctx->bc->fc_sp].type != FC_IF) {
+               R600_ERR("if/endif unbalanced in shader\n");
+               return -1;
+       }
+
+       if (ctx->bc->fc_stack[ctx->bc->fc_sp].mid == NULL) {
+               ctx->bc->fc_stack[ctx->bc->fc_sp].start->cf_addr = ctx->bc->cf_last->id + 2;
+               ctx->bc->fc_stack[ctx->bc->fc_sp].start->pop_count = 1;
+       } else {
+               ctx->bc->fc_stack[ctx->bc->fc_sp].mid[0]->cf_addr = ctx->bc->cf_last->id + 2;
+       }
+       fc_poplevel(ctx);
+
+       callstack_decrease_current(ctx, FC_PUSH_VPM);
+       return 0;
+}
+
+static int tgsi_bgnloop(struct r600_shader_ctx *ctx)
+{
+       r600_bc_add_cfinst(ctx->bc, CTX_INST(V_SQ_CF_WORD1_SQ_CF_INST_LOOP_START_NO_AL));
+
+       fc_pushlevel(ctx, FC_LOOP);
+
+       /* check stack depth */
+       callstack_check_depth(ctx, FC_LOOP, 0);
+       return 0;
+}
+
+static int tgsi_endloop(struct r600_shader_ctx *ctx)
+{
+       int i;
+
+       r600_bc_add_cfinst(ctx->bc, CTX_INST(V_SQ_CF_WORD1_SQ_CF_INST_LOOP_END));
+
+       if (ctx->bc->fc_stack[ctx->bc->fc_sp].type != FC_LOOP) {
+               R600_ERR("loop/endloop in shader code are not paired.\n");
+               return -EINVAL;
+       }
+
+       /* fixup loop pointers - from r600isa
+          LOOP END points to CF after LOOP START,
+          LOOP START point to CF after LOOP END
+          BRK/CONT point to LOOP END CF
+       */
+       ctx->bc->cf_last->cf_addr = ctx->bc->fc_stack[ctx->bc->fc_sp].start->id + 2;
+
+       ctx->bc->fc_stack[ctx->bc->fc_sp].start->cf_addr = ctx->bc->cf_last->id + 2;
+
+       for (i = 0; i < ctx->bc->fc_stack[ctx->bc->fc_sp].num_mid; i++) {
+               ctx->bc->fc_stack[ctx->bc->fc_sp].mid[i]->cf_addr = ctx->bc->cf_last->id;
+       }
+       /* TODO add LOOPRET support */
+       fc_poplevel(ctx);
+       callstack_decrease_current(ctx, FC_LOOP);
+       return 0;
+}
+
+static int tgsi_loop_brk_cont(struct r600_shader_ctx *ctx)
+{
+       unsigned int fscp;
+
+       for (fscp = ctx->bc->fc_sp; fscp > 0; fscp--)
+       {
+               if (FC_LOOP == ctx->bc->fc_stack[fscp].type)
+                       break;
+       }
+
+       if (fscp == 0) {
+               R600_ERR("Break not inside loop/endloop pair\n");
+               return -EINVAL;
+       }
+
+       r600_bc_add_cfinst(ctx->bc, ctx->inst_info->r600_opcode);
+       ctx->bc->cf_last->pop_count = 1;
+
+       fc_set_mid(ctx, fscp);
+
+       pops(ctx, 1);
+       callstack_check_depth(ctx, FC_PUSH_VPM, 1);
+       return 0;
 }
 
 static struct r600_shader_tgsi_instruction r600_shader_tgsi_instruction[] = {
-       {TGSI_OPCODE_ARL,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_ARL,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_arl},
        {TGSI_OPCODE_MOV,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV, tgsi_op2},
        {TGSI_OPCODE_LIT,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_lit},
-       {TGSI_OPCODE_RCP,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_RECIP_IEEE, tgsi_trans_srcx_replicate},
-       {TGSI_OPCODE_RSQ,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_RECIPSQRT_IEEE, tgsi_trans_srcx_replicate},
-       {TGSI_OPCODE_EXP,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_LOG,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+
+       /* FIXME:
+        * For state trackers other than OpenGL, we'll want to use
+        * _RECIP_IEEE instead.
+        */
+       {TGSI_OPCODE_RCP,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_RECIP_CLAMPED, tgsi_trans_srcx_replicate},
+
+       {TGSI_OPCODE_RSQ,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_rsq},
+       {TGSI_OPCODE_EXP,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_exp},
+       {TGSI_OPCODE_LOG,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_log},
        {TGSI_OPCODE_MUL,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL, tgsi_op2},
        {TGSI_OPCODE_ADD,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_ADD, tgsi_op2},
        {TGSI_OPCODE_DP3,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_DOT4, tgsi_dp},
        {TGSI_OPCODE_DP4,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_DOT4, tgsi_dp},
-       {TGSI_OPCODE_DST,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_DST,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_opdst},
        {TGSI_OPCODE_MIN,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MIN, tgsi_op2},
        {TGSI_OPCODE_MAX,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MAX, tgsi_op2},
-       {TGSI_OPCODE_SLT,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETGT, tgsi_slt},
-       {TGSI_OPCODE_SGE,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_SLT,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETGT, tgsi_op2_swap},
+       {TGSI_OPCODE_SGE,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETGE, tgsi_op2},
        {TGSI_OPCODE_MAD,       1, V_SQ_ALU_WORD1_OP3_SQ_OP3_INST_MULADD, tgsi_op3},
        {TGSI_OPCODE_SUB,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_ADD, tgsi_op2},
        {TGSI_OPCODE_LRP,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_lrp},
@@ -1232,38 +2727,38 @@ static struct r600_shader_tgsi_instruction r600_shader_tgsi_instruction[] = {
        /* gap */
        {22,                    0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {23,                    0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_FRC,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_FRC,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_FRACT, tgsi_op2},
        {TGSI_OPCODE_CLAMP,     0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_FLR,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_FLR,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_FLOOR, tgsi_op2},
        {TGSI_OPCODE_ROUND,     0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_EX2,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_EXP_IEEE, tgsi_trans_srcx_replicate},
-       {TGSI_OPCODE_LG2,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_POW,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_XPD,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_LG2,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_LOG_IEEE, tgsi_trans_srcx_replicate},
+       {TGSI_OPCODE_POW,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_pow},
+       {TGSI_OPCODE_XPD,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_xpd},
        /* gap */
        {32,                    0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_ABS,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV, tgsi_op2},
        {TGSI_OPCODE_RCC,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_DPH,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_COS,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_DDX,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_DDY,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_KILP,      0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},  /* predicated kill */
+       {TGSI_OPCODE_DPH,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_DOT4, tgsi_dp},
+       {TGSI_OPCODE_COS,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_COS, tgsi_trig},
+       {TGSI_OPCODE_DDX,       0, SQ_TEX_INST_GET_GRADIENTS_H, tgsi_tex},
+       {TGSI_OPCODE_DDY,       0, SQ_TEX_INST_GET_GRADIENTS_V, tgsi_tex},
+       {TGSI_OPCODE_KILP,      0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_KILLGT, tgsi_kill},  /* predicated kill */
        {TGSI_OPCODE_PK2H,      0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_PK2US,     0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_PK4B,      0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_PK4UB,     0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_RFL,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_SEQ,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_SEQ,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETE, tgsi_op2},
        {TGSI_OPCODE_SFL,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_SGT,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_SIN,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_SLE,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_SNE,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_SGT,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETGT, tgsi_op2},
+       {TGSI_OPCODE_SIN,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SIN, tgsi_trig},
+       {TGSI_OPCODE_SLE,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETGE, tgsi_op2_swap},
+       {TGSI_OPCODE_SNE,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETNE, tgsi_op2},
        {TGSI_OPCODE_STR,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_TEX,       0, 0x10, tgsi_tex},
+       {TGSI_OPCODE_TEX,       0, SQ_TEX_INST_SAMPLE, tgsi_tex},
        {TGSI_OPCODE_TXD,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_TXP,       0, 0x10, tgsi_tex},
+       {TGSI_OPCODE_TXP,       0, SQ_TEX_INST_SAMPLE, tgsi_tex},
        {TGSI_OPCODE_UP2H,      0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_UP2US,     0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_UP4B,      0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
@@ -1274,21 +2769,21 @@ static struct r600_shader_tgsi_instruction r600_shader_tgsi_instruction[] = {
        {TGSI_OPCODE_BRA,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_CAL,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_RET,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_SSG,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported}, /* SGN */
-       {TGSI_OPCODE_CMP,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_SCS,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_TXB,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_SSG,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_ssg},
+       {TGSI_OPCODE_CMP,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_cmp},
+       {TGSI_OPCODE_SCS,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_scs},
+       {TGSI_OPCODE_TXB,       0, SQ_TEX_INST_SAMPLE_L, tgsi_tex},
        {TGSI_OPCODE_NRM,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_DIV,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_DP2,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_DOT4, tgsi_dp},
        {TGSI_OPCODE_TXL,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_BRK,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_IF,        0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_BRK,       0, V_SQ_CF_WORD1_SQ_CF_INST_LOOP_BREAK, tgsi_loop_brk_cont},
+       {TGSI_OPCODE_IF,        0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_if},
        /* gap */
        {75,                    0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {76,                    0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_ELSE,      0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_ENDIF,     0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_ELSE,      0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_else},
+       {TGSI_OPCODE_ENDIF,     0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_endif},
        /* gap */
        {79,                    0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {80,                    0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
@@ -1297,7 +2792,7 @@ static struct r600_shader_tgsi_instruction r600_shader_tgsi_instruction[] = {
        {TGSI_OPCODE_CEIL,      0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_I2F,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_NOT,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_TRUNC,     0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_TRUNC,     0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_TRUNC, tgsi_trans_srcx_replicate},
        {TGSI_OPCODE_SHL,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        /* gap */
        {88,                    0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
@@ -1308,12 +2803,12 @@ static struct r600_shader_tgsi_instruction r600_shader_tgsi_instruction[] = {
        {TGSI_OPCODE_SAD,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_TXF,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_TXQ,       0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_CONT,      0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_CONT,      0, V_SQ_CF_WORD1_SQ_CF_INST_LOOP_CONTINUE, tgsi_loop_brk_cont},
        {TGSI_OPCODE_EMIT,      0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_ENDPRIM,   0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_BGNLOOP,   0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_BGNLOOP,   0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_bgnloop},
        {TGSI_OPCODE_BGNSUB,    0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
-       {TGSI_OPCODE_ENDLOOP,   0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_ENDLOOP,   0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_endloop},
        {TGSI_OPCODE_ENDSUB,    0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        /* gap */
        {103,                   0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
@@ -1362,3 +2857,161 @@ static struct r600_shader_tgsi_instruction r600_shader_tgsi_instruction[] = {
        {TGSI_OPCODE_ENDSWITCH, 0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
        {TGSI_OPCODE_LAST,      0, V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
 };
+
+static struct r600_shader_tgsi_instruction eg_shader_tgsi_instruction[] = {
+       {TGSI_OPCODE_ARL,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_MOV,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV, tgsi_op2},
+       {TGSI_OPCODE_LIT,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_lit},
+       {TGSI_OPCODE_RCP,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_RECIP_IEEE, tgsi_trans_srcx_replicate},
+       {TGSI_OPCODE_RSQ,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_RECIPSQRT_IEEE, tgsi_trans_srcx_replicate},
+       {TGSI_OPCODE_EXP,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_exp},
+       {TGSI_OPCODE_LOG,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_MUL,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL, tgsi_op2},
+       {TGSI_OPCODE_ADD,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_ADD, tgsi_op2},
+       {TGSI_OPCODE_DP3,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_DOT4, tgsi_dp},
+       {TGSI_OPCODE_DP4,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_DOT4, tgsi_dp},
+       {TGSI_OPCODE_DST,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_opdst},
+       {TGSI_OPCODE_MIN,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MIN, tgsi_op2},
+       {TGSI_OPCODE_MAX,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MAX, tgsi_op2},
+       {TGSI_OPCODE_SLT,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETGT, tgsi_op2_swap},
+       {TGSI_OPCODE_SGE,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETGE, tgsi_op2},
+       {TGSI_OPCODE_MAD,       1, EG_V_SQ_ALU_WORD1_OP3_SQ_OP3_INST_MULADD, tgsi_op3},
+       {TGSI_OPCODE_SUB,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_ADD, tgsi_op2},
+       {TGSI_OPCODE_LRP,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_lrp},
+       {TGSI_OPCODE_CND,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       /* gap */
+       {20,                    0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_DP2A,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       /* gap */
+       {22,                    0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {23,                    0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_FRC,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_FRACT, tgsi_op2},
+       {TGSI_OPCODE_CLAMP,     0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_FLR,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_FLOOR, tgsi_op2},
+       {TGSI_OPCODE_ROUND,     0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_EX2,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_EXP_IEEE, tgsi_trans_srcx_replicate},
+       {TGSI_OPCODE_LG2,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_LOG_IEEE, tgsi_trans_srcx_replicate},
+       {TGSI_OPCODE_POW,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_pow},
+       {TGSI_OPCODE_XPD,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_xpd},
+       /* gap */
+       {32,                    0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_ABS,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV, tgsi_op2},
+       {TGSI_OPCODE_RCC,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_DPH,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_DOT4, tgsi_dp},
+       {TGSI_OPCODE_COS,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_COS, tgsi_trig},
+       {TGSI_OPCODE_DDX,       0, SQ_TEX_INST_GET_GRADIENTS_H, tgsi_tex},
+       {TGSI_OPCODE_DDY,       0, SQ_TEX_INST_GET_GRADIENTS_V, tgsi_tex},
+       {TGSI_OPCODE_KILP,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_KILLGT, tgsi_kill},  /* predicated kill */
+       {TGSI_OPCODE_PK2H,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_PK2US,     0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_PK4B,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_PK4UB,     0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_RFL,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_SEQ,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETE, tgsi_op2},
+       {TGSI_OPCODE_SFL,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_SGT,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETGT, tgsi_op2},
+       {TGSI_OPCODE_SIN,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SIN, tgsi_trig},
+       {TGSI_OPCODE_SLE,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETGE, tgsi_op2_swap},
+       {TGSI_OPCODE_SNE,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_SETNE, tgsi_op2},
+       {TGSI_OPCODE_STR,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_TEX,       0, SQ_TEX_INST_SAMPLE, tgsi_tex},
+       {TGSI_OPCODE_TXD,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_TXP,       0, SQ_TEX_INST_SAMPLE, tgsi_tex},
+       {TGSI_OPCODE_UP2H,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_UP2US,     0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_UP4B,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_UP4UB,     0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_X2D,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_ARA,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_ARR,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_BRA,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_CAL,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_RET,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_SSG,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_ssg},
+       {TGSI_OPCODE_CMP,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_cmp},
+       {TGSI_OPCODE_SCS,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_scs},
+       {TGSI_OPCODE_TXB,       0, SQ_TEX_INST_SAMPLE_L, tgsi_tex},
+       {TGSI_OPCODE_NRM,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_DIV,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_DP2,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_DOT4, tgsi_dp},
+       {TGSI_OPCODE_TXL,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_BRK,       0, EG_V_SQ_CF_WORD1_SQ_CF_INST_LOOP_BREAK, tgsi_loop_brk_cont},
+       {TGSI_OPCODE_IF,        0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_if},
+       /* gap */
+       {75,                    0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {76,                    0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_ELSE,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_else},
+       {TGSI_OPCODE_ENDIF,     0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_endif},
+       /* gap */
+       {79,                    0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {80,                    0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_PUSHA,     0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_POPA,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_CEIL,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_I2F,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_NOT,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_TRUNC,     0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_TRUNC, tgsi_trans_srcx_replicate},
+       {TGSI_OPCODE_SHL,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       /* gap */
+       {88,                    0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_AND,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_OR,        0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_MOD,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_XOR,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_SAD,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_TXF,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_TXQ,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_CONT,      0, EG_V_SQ_CF_WORD1_SQ_CF_INST_LOOP_CONTINUE, tgsi_loop_brk_cont},
+       {TGSI_OPCODE_EMIT,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_ENDPRIM,   0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_BGNLOOP,   0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_bgnloop},
+       {TGSI_OPCODE_BGNSUB,    0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_ENDLOOP,   0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_endloop},
+       {TGSI_OPCODE_ENDSUB,    0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       /* gap */
+       {103,                   0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {104,                   0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {105,                   0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {106,                   0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_NOP,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       /* gap */
+       {108,                   0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {109,                   0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {110,                   0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {111,                   0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_NRM4,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_CALLNZ,    0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_IFC,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_BREAKC,    0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_KIL,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_KILLGT, tgsi_kill},  /* conditional kill */
+       {TGSI_OPCODE_END,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_end},  /* aka HALT */
+       /* gap */
+       {118,                   0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_F2I,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_IDIV,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_IMAX,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_IMIN,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_INEG,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_ISGE,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_ISHR,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_ISLT,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_F2U,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_U2F,       0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_UADD,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_UDIV,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_UMAD,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_UMAX,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_UMIN,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_UMOD,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_UMUL,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_USEQ,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_USGE,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_USHR,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_USLT,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_USNE,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_SWITCH,    0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_CASE,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_DEFAULT,   0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_ENDSWITCH, 0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+       {TGSI_OPCODE_LAST,      0, EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_NOP, tgsi_unsupported},
+};