Mesa (master): radeonsi: fix elimination of literal VS outputs

[Marek Olšák]

Module: Mesa
Branch: master
Commit: ab12a126fd7b549602ed24f5d7540e0acb0a56e3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ab12a126fd7b549602ed24f5d7540e0acb0a56e3

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Mon Mar  6 23:57:33 2017 +0100

radeonsi: fix elimination of literal VS outputs

broken when switched to the new intrinsics.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

---

 src/gallium/drivers/radeonsi/si_shader.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 1553fd4..4abea85 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -6484,6 +6484,9 @@ static void si_init_shader_ctx(struct si_shader_context *ctx,
 	bld_base->op_actions[TGSI_OPCODE_BARRIER].emit = si_llvm_emit_barrier;
 }
 
+#define EXP_TARGET (HAVE_LLVM >= 0x0500 ? 0 : 3)
+#define EXP_OUT0 (HAVE_LLVM >= 0x0500 ? 2 : 5)
+
 /* Return true if the PARAM export has been eliminated. */
 static bool si_eliminate_const_output(struct si_shader_context *ctx,
 				      LLVMValueRef inst, unsigned offset)
@@ -6495,7 +6498,7 @@ static bool si_eliminate_const_output(struct si_shader_context *ctx,
 
 	for (i = 0; i < 4; i++) {
 		LLVMBool loses_info;
-		LLVMValueRef p = LLVMGetOperand(inst, (HAVE_LLVM >= 0x0500 ? 2 : 5) + i);
+		LLVMValueRef p = LLVMGetOperand(inst, EXP_OUT0 + i);
 
 		/* It's a constant expression. Undef outputs are eliminated too. */
 		if (LLVMIsUndef(p)) {
@@ -6581,10 +6584,10 @@ static void si_eliminate_const_vs_outputs(struct si_shader_context *ctx)
 			/* Check if this is an export instruction. */
 			if ((num_args != 9 && num_args != 8) ||
 			    (strcmp(name, "llvm.SI.export") &&
-			     strcmp(name, "llvm.amdgcn.exp.")))
+			     strcmp(name, "llvm.amdgcn.exp.f32")))
 				continue;
 
-			LLVMValueRef arg = LLVMGetOperand(cur, HAVE_LLVM >= 0x0500 ? 0 : 3);
+			LLVMValueRef arg = LLVMGetOperand(cur, EXP_TARGET);
 			unsigned target = LLVMConstIntGetZExtValue(arg);
 
 			if (target < V_008DFC_SQ_EXP_PARAM)
@@ -6626,7 +6629,7 @@ static void si_eliminate_const_vs_outputs(struct si_shader_context *ctx)
 				if (current_offset[out] != offset)
 					continue;
 
-				LLVMSetOperand(exports.inst[i], 3,
+				LLVMSetOperand(exports.inst[i], EXP_TARGET,
 					       LLVMConstInt(ctx->i32,
 							    V_008DFC_SQ_EXP_PARAM + new_count, 0));
 				shader->info.vs_output_param_offset[out] = new_count;