Mesa (master): nir: Delete all traces of nir_op_flog

[Ian Romanick]

Module: Mesa
Branch: master
Commit: 3bdbc1e436828606d0b549b9480e7cc28b42d159
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3bdbc1e436828606d0b549b9480e7cc28b42d159

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Wed May  6 17:04:15 2015 -0700

nir: Delete all traces of nir_op_flog

Nothing produces it, and nothing can consume it.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Acked-by: Jason Ekstrand <jason.ekstrand at intel.com>

---

 src/glsl/nir/nir_opcodes.py              |    1 -
 src/glsl/nir/nir_opt_algebraic.py        |    6 ------
 src/mesa/drivers/dri/i965/brw_fs_nir.cpp |    3 ---
 3 files changed, 10 deletions(-)

diff --git a/src/glsl/nir/nir_opcodes.py b/src/glsl/nir/nir_opcodes.py
index 10bab43..56e96d9 100644
--- a/src/glsl/nir/nir_opcodes.py
+++ b/src/glsl/nir/nir_opcodes.py
@@ -153,7 +153,6 @@ unop("fsat", tfloat, "(src0 > 1.0f) ? 1.0f : ((src0 <= 0.0f) ? 0.0f : src0)")
 unop("frcp", tfloat, "1.0f / src0")
 unop("frsq", tfloat, "1.0f / sqrtf(src0)")
 unop("fsqrt", tfloat, "sqrtf(src0)")
-unop("flog", tfloat, "logf(src0)") # log base e
 unop("fexp2", tfloat, "exp2f(src0)")
 unop("flog2", tfloat, "log2f(src0)")
 unop_convert("f2i", tfloat, tint, "src0") # Float-to-integer conversion.
diff --git a/src/glsl/nir/nir_opt_algebraic.py b/src/glsl/nir/nir_opt_algebraic.py
index 5ce388e..fa03922 100644
--- a/src/glsl/nir/nir_opt_algebraic.py
+++ b/src/glsl/nir/nir_opt_algebraic.py
@@ -160,17 +160,11 @@ optimizations = [
    (('frcp', ('fexp2', a)), ('fexp2', ('fneg', a))),
    (('frsq', ('fexp2', a)), ('fexp2', ('fmul', -0.5, a))),
    (('flog2', ('fsqrt', a)), ('fmul', 0.5, ('flog2', a))),
-   (('flog', ('fsqrt', a)), ('fmul', 0.5, ('flog', a))),
    (('flog2', ('frcp', a)), ('fneg', ('flog2', a))),
-   (('flog', ('frcp', a)), ('fneg', ('flog', a))),
    (('flog2', ('frsq', a)), ('fmul', -0.5, ('flog2', a))),
-   (('flog', ('frsq', a)), ('fmul', -0.5, ('flog', a))),
    (('flog2', ('fpow', a, b)), ('fmul', b, ('flog2', a))),
-   (('flog', ('fpow', a, b)), ('fmul', b, ('flog', a))),
    (('fadd', ('flog2', a), ('flog2', b)), ('flog2', ('fmul', a, b))),
-   (('fadd', ('flog', a), ('flog', b)), ('flog', ('fmul', a, b))),
    (('fadd', ('flog2', a), ('fneg', ('flog2', b))), ('flog2', ('fdiv', a, b))),
-   (('fadd', ('flog', a), ('fneg', ('flog', b))), ('flog', ('fdiv', a, b))),
    (('fmul', ('fexp2', a), ('fexp2', b)), ('fexp2', ('fadd', a, b))),
    # Division and reciprocal
    (('fdiv', 1.0, a), ('frcp', a)),
diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
index 164d0f8..9cfd0e7 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
@@ -722,9 +722,6 @@ fs_visitor::nir_emit_alu(nir_alu_instr *instr)
       inst->saturate = instr->dest.saturate;
       break;
 
-   case nir_op_flog:
-      unreachable("not reached: should be handled by ir_explog_to_explog2");
-
    case nir_op_fsin:
       inst = emit_math(SHADER_OPCODE_SIN, result, op[0]);
       inst->saturate = instr->dest.saturate;