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

pan/mdg: Implement b2f16 

...as iand

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5151>
This commit is contained in:
Alyssa Rosenzweig 2020-05-08 17:42:40 -04:00 committed by Marge Bot
parent 1108eaa90d
commit 6b023b3545
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/panfrost/midgard/midgard_compile.c
View File

@ -581,7 +581,7 @@ nir_accepts_inot(nir_op op, unsigned src)
{
switch (op) {
case nir_op_ior:
case nir_op_iand:
case nir_op_iand: /* TODO: b2f16 */
case nir_op_ixor:
return true;
case nir_op_b32csel:
@ -766,6 +766,7 @@ emit_alu(compiler_context *ctx, nir_alu_instr *instr)
*/
ALU_CASE_CMP(b2f32, iand, true);
ALU_CASE_CMP(b2f16, iand, true);
ALU_CASE_CMP(b2i32, iand, true);
/* Likewise, we don't have a dedicated f2b32 instruction, but
@ -1016,13 +1017,6 @@ emit_alu(compiler_context *ctx, nir_alu_instr *instr)
ins.alu = alu;
/* Arrange for creation of iandnot/iornot */
if (ins.src_invert[0] && !ins.src_invert[1]) {
mir_flip(&ins);
ins.src_invert[0] = false;
ins.src_invert[1] = true;
}
/* Late fixup for emulated instructions */
if (instr->op == nir_op_b2f32 || instr->op == nir_op_b2i32) {
@ -1041,6 +1035,14 @@ emit_alu(compiler_context *ctx, nir_alu_instr *instr)
else
ins.constants.i32[0] = 1;
for (unsigned c = 0; c < 16; ++c)
ins.swizzle[1][c] = 0;
} else if (instr->op == nir_op_b2f16) {
ins.src[1] = SSA_FIXED_REGISTER(REGISTER_CONSTANT);
ins.src_types[1] = nir_type_float16;
ins.has_constants = true;
ins.constants.i16[0] = _mesa_float_to_half(1.0);
for (unsigned c = 0; c < 16; ++c)
ins.swizzle[1][c] = 0;
} else if (nr_inputs == 1 && !quirk_flipped_r24) {
@ -1055,6 +1057,13 @@ emit_alu(compiler_context *ctx, nir_alu_instr *instr)
ins.swizzle[1][c] = 0;
}
/* Arrange for creation of iandnot/iornot */
if (ins.src_invert[0] && !ins.src_invert[1]) {
mir_flip(&ins);
ins.src_invert[0] = false;
ins.src_invert[1] = true;
}
if ((opcode_props & UNITS_ALL) == UNIT_VLUT) {
/* To avoid duplicating the lookup tables (probably), true LUT
* instructions can only operate as if they were scalars. Lower