From 8da28e563b87a3ca5e342b33dd675a7410526b60 Mon Sep 17 00:00:00 2001 From: Alex Smith Date: Mon, 15 Oct 2018 15:50:20 +0100 Subject: [PATCH] ac/nir: Use context-specific LLVM types LLVMInt*Type() return types from the global context and therefore are not safe for use in other contexts. Use types from our own context instead. Fixes frequent crashes seen when doing multithreaded pipeline creation. Fixes: 4d0b02bb5a "ac: add support for 16bit load_push_constant" Fixes: 7e7ee82698 "ac: add support for 16bit buffer loads" Cc: "18.2" Signed-off-by: Alex Smith Reviewed-by: Bas Nieuwenhuizen Reviewed-by: Samuel Pitoiset (cherry picked from commit ca83d51cfb154af12ee6e17a533df6cbbc890e22) --- src/amd/common/ac_nir_to_llvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index d552d032df9..b00f3c85a02 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -1400,7 +1400,7 @@ static LLVMValueRef visit_load_push_constant(struct ac_nir_context *ctx, if (instr->dest.ssa.bit_size == 16) { unsigned load_dwords = instr->dest.ssa.num_components / 2 + 1; - LLVMTypeRef vec_type = LLVMVectorType(LLVMInt16Type(), 2 * load_dwords); + LLVMTypeRef vec_type = LLVMVectorType(LLVMInt16TypeInContext(ctx->ac.context), 2 * load_dwords); ptr = ac_cast_ptr(&ctx->ac, ptr, vec_type); LLVMValueRef res = LLVMBuildLoad(ctx->ac.builder, ptr, ""); res = LLVMBuildBitCast(ctx->ac.builder, res, vec_type, ""); @@ -1673,7 +1673,7 @@ static LLVMValueRef visit_load_buffer(struct ac_nir_context *ctx, }; results[idx] = ac_build_intrinsic(&ctx->ac, load_name, data_type, params, 5, 0); unsigned num_elems = ac_get_type_size(data_type) / elem_size_bytes; - LLVMTypeRef resTy = LLVMVectorType(LLVMIntType(instr->dest.ssa.bit_size), num_elems); + LLVMTypeRef resTy = LLVMVectorType(LLVMIntTypeInContext(ctx->ac.context, instr->dest.ssa.bit_size), num_elems); results[idx] = LLVMBuildBitCast(ctx->ac.builder, results[idx], resTy, ""); } }