diff options
| author | Tom Stellard <[email protected]> | 2012-08-13 21:29:46 +0000 |
|---|---|---|
| committer | Tom Stellard <[email protected]> | 2012-08-14 13:26:30 +0000 |
| commit | 2fae8227ad906a6d6290134368b62f5dd3a1858e (patch) | |
| tree | 17ea3f2dfd08b13d0cfcd215b88129459b774d88 | |
| parent | ea8dcfc90d5abbf699cd64be4dccd1e69fe82d75 (diff) | |
radeon/llvm: Use correct opcocde for BREAK_LOGICALNZ_i32
| -rw-r--r-- | src/gallium/drivers/r600/r600_shader.c | 26 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/R600CodeEmitter.cpp | 5 |
2 files changed, 19 insertions, 12 deletions
diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index 2422d0062f3..3c0fbc8bdcc 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -367,35 +367,35 @@ static unsigned r600_fc_from_byte_stream(struct r600_shader_ctx *ctx, bytes_read = r600_src_from_byte_stream(bytes, bytes_read, &alu, 0); inst = bytes[bytes_read++]; switch (inst) { - case 0: + case 0: /* FC_IF */ llvm_if(ctx, &alu, CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETNE)); break; - case 1: + case 1: /* FC_IF_INT */ llvm_if(ctx, &alu, CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETNE_INT)); break; - case 2: + case 2: /* FC_ELSE */ tgsi_else(ctx); break; - case 3: + case 3: /* FC_ENDIF */ tgsi_endif(ctx); break; - case 4: + case 4: /* FC_BGNLOOP */ tgsi_bgnloop(ctx); break; - case 5: + case 5: /* FC_ENDLOOP */ tgsi_endloop(ctx); break; - case 6: + case 6: /* FC_BREAK */ r600_break_from_byte_stream(ctx, &alu, CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETE_INT)); break; - case 7: + case 7: /* FC_BREAK_NZ_INT */ r600_break_from_byte_stream(ctx, &alu, - CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETNE)); + CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETNE_INT)); break; - case 8: + case 8: /* FC_CONTINUE */ { unsigned opcode = TGSI_OPCODE_CONT; if (ctx->bc->chip_class == CAYMAN) { @@ -411,10 +411,14 @@ static unsigned r600_fc_from_byte_stream(struct r600_shader_ctx *ctx, tgsi_loop_brk_cont(ctx); } break; - case 9: + case 9: /* FC_BREAK_Z_INT */ r600_break_from_byte_stream(ctx, &alu, CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETE_INT)); break; + case 10: /* FC_BREAK_NZ */ + r600_break_from_byte_stream(ctx, &alu, + CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETNE)); + break; } return bytes_read; diff --git a/src/gallium/drivers/radeon/R600CodeEmitter.cpp b/src/gallium/drivers/radeon/R600CodeEmitter.cpp index eb68c2d149c..06f8caa1df9 100644 --- a/src/gallium/drivers/radeon/R600CodeEmitter.cpp +++ b/src/gallium/drivers/radeon/R600CodeEmitter.cpp @@ -118,7 +118,8 @@ enum FCInstr { FC_BREAK, FC_BREAK_NZ_INT, FC_CONTINUE, - FC_BREAK_Z_INT + FC_BREAK_Z_INT, + FC_BREAK_NZ }; enum TextureTypes { @@ -525,6 +526,8 @@ void R600CodeEmitter::EmitFCInstr(MachineInstr &MI) instr = FC_BREAK; break; case AMDGPU::BREAK_LOGICALNZ_f32: + instr = FC_BREAK_NZ; + break; case AMDGPU::BREAK_LOGICALNZ_i32: instr = FC_BREAK_NZ_INT; break; |