AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium: redefine ATOMINC_WRAP to be more hardware-friendly

Browse Source 
Both AMD and NVIDIA hardware define it this way. Instead of replicating
the logic everywhere, just fix it up in one place.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Ilia Mirkin
2019-08-06 21:59:44 -04:00
parent 582c86346d
commit a2bb7b26a1
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/docs/source/tgsi.rst
+1 -1
View File
@@ -2846,7 +2846,7 @@ These atomic operations may only be used with 32-bit integer image formats.
dst_x = resource[offset] + 1
resource[offset] = dst_x < src_x ? dst_x : 0
resource[offset] = dst_x <= src_x ? dst_x : 0
.. opcode:: ATOMDEC_WRAP - Atomic decrement + wrap around
src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c
-12
View File
@@ -828,18 +828,6 @@ static void atomic_emit(
args.data[num_data++] =
ac_to_integer(&ctx->ac, lp_build_emit_fetch(bld_base, inst, 2, 0));
if (inst->Instruction.Opcode == TGSI_OPCODE_ATOMINC_WRAP) {
/* ATOMIC_INC instruction does:
* value = (value + 1) % (data + 1)
* but we want:
* value = (value + 1) % data
* So replace 'data' by 'data - 1'.
*/
args.data[0] = LLVMBuildSub(ctx->ac.builder,
args.data[0],
ctx->ac.i32_1, "");
}
args.cache_policy = get_cache_policy(ctx, inst, true, false, false);
if (inst->Src[0].Register.File == TGSI_FILE_BUFFER) {
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+10 -1
View File
@@ -3938,9 +3938,18 @@ glsl_to_tgsi_visitor::visit_image_intrinsic(ir_call *ir)
case ir_intrinsic_image_atomic_comp_swap:
opcode = TGSI_OPCODE_ATOMCAS;
break;
case ir_intrinsic_image_atomic_inc_wrap:
case ir_intrinsic_image_atomic_inc_wrap: {
/* There's a bit of disagreement between GLSL and the hardware. The
* hardware wants to wrap after the given wrap value, while GLSL
* wants to wrap at the value. Subtract 1 to make up the difference.
*/
st_src_reg wrap = get_temp(glsl_type::uint_type);
emit_asm(ir, TGSI_OPCODE_ADD, st_dst_reg(wrap),
arg1, st_src_reg_for_int(-1));
arg1 = wrap;
opcode = TGSI_OPCODE_ATOMINC_WRAP;
break;
}
case ir_intrinsic_image_atomic_dec_wrap:
opcode = TGSI_OPCODE_ATOMDEC_WRAP;
break;