From 1c83ec979f58974dd769a1caa10b402bbee5c7d2 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Tue, 4 Aug 2020 17:22:32 +1000 Subject: [PATCH] aco: use UINT64_C on 64 bit constant arguments avoids errors seen when building on OpenBSD/amd64 ../src/amd/compiler/aco_instruction_selection.cpp:1677:62: error: ambiguous conversion for functional-style cast from 'unsigned long' to 'aco::Operand' bld.vop3(aco_opcode::v_mul_f64, Definition(dst), Operand(0x3FF0000000000000lu), tmp); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ glibc uses unsigned long for uint64_t on LP64 archs and unsigned long long for uint64_t on ILP32 archs. On OpenBSD unsigned long long is used for uint64_t on all archs. The Operand constructors are uint8_t uint16_t uint32_t uint64_t use UINT64_C so lu or llu suffix will be used as needed. Fixes: df645fa369d ("aco: implement VK_KHR_shader_float_controls") Signed-off-by: Jonathan Gray Reviewed-by: Tony Wasserka Part-of: (cherry picked from commit ebfb9e181737e7ff7be638134410b919145a0f95) --- .pick_status.json | 2 +- src/amd/compiler/aco_instruction_selection.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 1b5add5613b..361ce3267a8 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -67,7 +67,7 @@ "description": "aco: use UINT64_C on 64 bit constant arguments", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "df645fa369d12be4d5e0fd9e4f6d4455caf2f4c3" }, diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp index a321c560926..bcd289fa9b5 100644 --- a/src/amd/compiler/aco_instruction_selection.cpp +++ b/src/amd/compiler/aco_instruction_selection.cpp @@ -808,7 +808,7 @@ void emit_vop3a_instruction(isel_context *ctx, nir_alu_instr *instr, aco_opcode if (dst.size() == 1) bld.vop2(aco_opcode::v_mul_f32, Definition(dst), Operand(0x3f800000u), tmp); else - bld.vop3(aco_opcode::v_mul_f64, Definition(dst), Operand(0x3FF0000000000000lu), tmp); + bld.vop3(aco_opcode::v_mul_f64, Definition(dst), Operand(UINT64_C(0x3FF0000000000000)), tmp); } else if (num_sources == 3) { bld.vop3(op, Definition(dst), src[0], src[1], src[2]); } else { @@ -1900,7 +1900,7 @@ void visit_alu_instr(isel_context *ctx, nir_alu_instr *instr) bld.vop2(aco_opcode::v_xor_b32, Definition(dst), Operand(0x80000000u), as_vgpr(ctx, src)); } else if (dst.regClass() == v2) { if (ctx->block->fp_mode.must_flush_denorms16_64) - src = bld.vop3(aco_opcode::v_mul_f64, bld.def(v2), Operand(0x3FF0000000000000lu), as_vgpr(ctx, src)); + src = bld.vop3(aco_opcode::v_mul_f64, bld.def(v2), Operand(UINT64_C(0x3FF0000000000000)), as_vgpr(ctx, src)); Temp upper = bld.tmp(v1), lower = bld.tmp(v1); bld.pseudo(aco_opcode::p_split_vector, Definition(lower), Definition(upper), src); upper = bld.vop2(aco_opcode::v_xor_b32, bld.def(v1), Operand(0x80000000u), upper); @@ -1922,7 +1922,7 @@ void visit_alu_instr(isel_context *ctx, nir_alu_instr *instr) bld.vop2(aco_opcode::v_and_b32, Definition(dst), Operand(0x7FFFFFFFu), as_vgpr(ctx, src)); } else if (dst.regClass() == v2) { if (ctx->block->fp_mode.must_flush_denorms16_64) - src = bld.vop3(aco_opcode::v_mul_f64, bld.def(v2), Operand(0x3FF0000000000000lu), as_vgpr(ctx, src)); + src = bld.vop3(aco_opcode::v_mul_f64, bld.def(v2), Operand(UINT64_C(0x3FF0000000000000)), as_vgpr(ctx, src)); Temp upper = bld.tmp(v1), lower = bld.tmp(v1); bld.pseudo(aco_opcode::p_split_vector, Definition(lower), Definition(upper), src); upper = bld.vop2(aco_opcode::v_and_b32, bld.def(v1), Operand(0x7FFFFFFFu), upper);