OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/spirv: Translate SPIR-V to NIR for new INTEL_shader_integer_functions2 opcodes

Browse Source 
v2: Rebase on 272e927d0e ("nir/spirv: initial handling of OpenCL.std
extension opcodes")

v3: Add missing SpvOpUCountTrailingZerosINTEL case to switch in
vtn_handle_body_instruction. Remove stray semicolon in
vtn_nir_alu_op_for_spirv_opcode. Use umin instead of umax for
SpvOpUCountTrailingZerosINTEL "lowering" in vtn_handle_alu.

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/767>
This commit is contained in:
Ian Romanick
2018-09-21 00:35:18 -07:00
committed by Marge Bot
parent de6c0f8487
commit 44471a76e9
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler/spirv/spirv_to_nir.c
View File

@@ -4925,6 +4925,20 @@ vtn_handle_body_instruction(struct vtn_builder *b, SpvOp opcode,
case SpvOpVectorTimesMatrix:
case SpvOpMatrixTimesVector:
case SpvOpMatrixTimesMatrix:
case SpvOpUCountLeadingZerosINTEL:
case SpvOpUCountTrailingZerosINTEL:
case SpvOpAbsISubINTEL:
case SpvOpAbsUSubINTEL:
case SpvOpIAddSatINTEL:
case SpvOpUAddSatINTEL:
case SpvOpIAverageINTEL:
case SpvOpUAverageINTEL:
case SpvOpIAverageRoundedINTEL:
case SpvOpUAverageRoundedINTEL:
case SpvOpISubSatINTEL:
case SpvOpUSubSatINTEL:
case SpvOpIMul32x16INTEL:
case SpvOpUMul32x16INTEL:
vtn_handle_alu(b, opcode, w, count);
break;

21
src/compiler/spirv/vtn_alu.c
View File

@@ -261,6 +261,21 @@ vtn_nir_alu_op_for_spirv_opcode(struct vtn_builder *b,
case SpvOpBitReverse: return nir_op_bitfield_reverse;
case SpvOpBitCount: return nir_op_bit_count;
case SpvOpUCountLeadingZerosINTEL: return nir_op_uclz;
/* SpvOpUCountTrailingZerosINTEL is handled elsewhere. */
case SpvOpAbsISubINTEL: return nir_op_uabs_isub;
case SpvOpAbsUSubINTEL: return nir_op_uabs_usub;
case SpvOpIAddSatINTEL: return nir_op_iadd_sat;
case SpvOpUAddSatINTEL: return nir_op_uadd_sat;
case SpvOpIAverageINTEL: return nir_op_ihadd;
case SpvOpUAverageINTEL: return nir_op_uhadd;
case SpvOpIAverageRoundedINTEL: return nir_op_irhadd;
case SpvOpUAverageRoundedINTEL: return nir_op_urhadd;
case SpvOpISubSatINTEL: return nir_op_isub_sat;
case SpvOpUSubSatINTEL: return nir_op_usub_sat;
case SpvOpIMul32x16INTEL: return nir_op_imul_32x16;
case SpvOpUMul32x16INTEL: return nir_op_umul_32x16;
/* The ordered / unordered operators need special implementation besides
* the logical operator to use since they also need to check if operands are
* ordered.
@@ -640,6 +655,12 @@ vtn_handle_alu(struct vtn_builder *b, SpvOp opcode,
break;
}
case SpvOpUCountTrailingZerosINTEL:
val->ssa->def = nir_umin(&b->nb,
nir_find_lsb(&b->nb, src[0]),
nir_imm_int(&b->nb, 32u));
break;
default: {
bool swap;
unsigned src_bit_size = glsl_get_bit_size(vtn_src[0]->type);