Commit a54695dd authored by Jesse Natalie's avatar Jesse Natalie Committed by Marge Bot
Browse files

nir: Add bit_count to lower_int64 pass


Reviewed-by: Boris Brezillon's avatarBoris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Jason Ekstrand's avatarJason Ekstrand <jason@jlekstrand.net>
Part-of: <!6313>
parent d91f85f1
......@@ -2998,6 +2998,7 @@ typedef enum {
nir_lower_imul_2x32_64 = (1 << 12),
nir_lower_extract64 = (1 << 13),
nir_lower_ufind_msb64 = (1 << 14),
nir_lower_bit_count64 = (1 << 15),
} nir_lower_int64_options;
typedef enum {
......
......@@ -785,6 +785,16 @@ lower_f2(nir_builder *b, nir_ssa_def *x, bool dst_is_signed)
return res;
}
static nir_ssa_def *
lower_bit_count64(nir_builder *b, nir_ssa_def *x)
{
nir_ssa_def *x_lo = nir_unpack_64_2x32_split_x(b, x);
nir_ssa_def *x_hi = nir_unpack_64_2x32_split_y(b, x);
nir_ssa_def *lo_count = nir_bit_count(b, x_lo);
nir_ssa_def *hi_count = nir_bit_count(b, x_hi);
return nir_iadd(b, lo_count, hi_count);
}
nir_lower_int64_options
nir_lower_int64_op_to_options_mask(nir_op opcode)
{
......@@ -859,6 +869,8 @@ nir_lower_int64_op_to_options_mask(nir_op opcode)
return nir_lower_extract64;
case nir_op_ufind_msb:
return nir_lower_ufind_msb64;
case nir_op_bit_count:
return nir_lower_bit_count64;
default:
return 0;
}
......@@ -963,6 +975,8 @@ lower_int64_alu_instr(nir_builder *b, nir_instr *instr, void *_state)
return lower_extract(b, alu->op, src[0], src[1]);
case nir_op_ufind_msb:
return lower_ufind_msb64(b, src[0]);
case nir_op_bit_count:
return lower_bit_count64(b, src[0]);
case nir_op_i2f64:
case nir_op_i2f32:
case nir_op_i2f16:
......@@ -1028,6 +1042,7 @@ should_lower_int64_alu_instr(const nir_instr *instr, const void *_data)
return false;
break;
case nir_op_ufind_msb:
case nir_op_bit_count:
assert(alu->src[0].src.is_ssa);
if (alu->src[0].src.ssa->bit_size != 64)
return false;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment