summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/freedreno
diff options
context:
space:
mode:
authorJonathan Marek <[email protected]>2019-06-20 23:22:02 -0400
committerJonathan Marek <[email protected]>2019-06-26 15:26:10 -0400
commita70ff70158a22003948f449343a55ad47ce73996 (patch)
tree8c63961a7b3efc65e8cc4203d9a42d83e306c2c3 /src/gallium/drivers/freedreno
parent0b5a483baaefa9a7e39c76607d8f0f435aa46315 (diff)
nir: remove fnot/fxor/fand/for opcodes
There doesn't seem to be any reason to keep these opcodes around: * fnot/fxor are not used at all. * fand/for are only used in lower_alu_to_scalar, but easily replaced Signed-off-by: Jonathan Marek <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/gallium/drivers/freedreno')
-rw-r--r--src/gallium/drivers/freedreno/a2xx/ir2_nir.c4
-rw-r--r--src/gallium/drivers/freedreno/a2xx/ir2_nir_lower_scalar.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/src/gallium/drivers/freedreno/a2xx/ir2_nir.c b/src/gallium/drivers/freedreno/a2xx/ir2_nir.c
index 36f3a679ff6..5becd522615 100644
--- a/src/gallium/drivers/freedreno/a2xx/ir2_nir.c
+++ b/src/gallium/drivers/freedreno/a2xx/ir2_nir.c
@@ -286,10 +286,6 @@ instr_create_alu(struct ir2_context *ctx, nir_op opcode, unsigned ncomp)
[nir_op_mov] = {MAXs, MAXv},
[nir_op_fsign] = {-1, CNDGTEv},
- [nir_op_fnot] = {SETEs, SETEv},
- [nir_op_for] = {MAXs, MAXv},
- [nir_op_fand] = {MINs, MINv},
- [nir_op_fxor] = {-1, SETNEv},
[nir_op_fadd] = {ADDs, ADDv},
[nir_op_fsub] = {ADDs, ADDv},
[nir_op_fmul] = {MULs, MULv},
diff --git a/src/gallium/drivers/freedreno/a2xx/ir2_nir_lower_scalar.c b/src/gallium/drivers/freedreno/a2xx/ir2_nir_lower_scalar.c
index 2b72a86b3e1..1af211e759e 100644
--- a/src/gallium/drivers/freedreno/a2xx/ir2_nir_lower_scalar.c
+++ b/src/gallium/drivers/freedreno/a2xx/ir2_nir_lower_scalar.c
@@ -93,8 +93,8 @@ static bool lower_scalar(nir_alu_instr * instr, nir_builder * b)
switch (instr->op) {
/* TODO: handle these instead of lowering */
- LOWER_REDUCTION(nir_op_fall_equal, nir_op_seq, nir_op_fand);
- LOWER_REDUCTION(nir_op_fany_nequal, nir_op_sne, nir_op_for);
+ LOWER_REDUCTION(nir_op_fall_equal, nir_op_seq, nir_op_fmin);
+ LOWER_REDUCTION(nir_op_fany_nequal, nir_op_sne, nir_op_fmax);
default:
return false;