From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Fri, 9 Feb 2018 06:15:54 +0000 (+1100)
Subject: ac: fix some 64bit unpack asserts
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1b1e5f8edfb16b8c8d5170bdd110f730352b6137;p=mesa.git

ac: fix some 64bit unpack asserts

Previously the asserts did not take swizzles into account.

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

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 3691555208b..396627bf1b7 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -2042,7 +2042,7 @@ static void visit_alu(struct ac_nir_context *ctx, const nir_alu_instr *instr)
 		break;
 
 	case nir_op_unpack_64_2x32_split_x: {
-		assert(instr->src[0].src.ssa->num_components == 1);
+		assert(ac_get_llvm_num_components(src[0]) == 1);
 		LLVMValueRef tmp = LLVMBuildBitCast(ctx->ac.builder, src[0],
 						    ctx->ac.v2i32,
 						    "");
@@ -2052,7 +2052,7 @@ static void visit_alu(struct ac_nir_context *ctx, const nir_alu_instr *instr)
 	}
 
 	case nir_op_unpack_64_2x32_split_y: {
-		assert(instr->src[0].src.ssa->num_components == 1);
+		assert(ac_get_llvm_num_components(src[0]) == 1);
 		LLVMValueRef tmp = LLVMBuildBitCast(ctx->ac.builder, src[0],
 						    ctx->ac.v2i32,
 						    "");