2014-12-12 19:13:10 +00:00
|
|
|
#
|
|
|
|
|
# Copyright (C) 2014 Intel Corporation
|
|
|
|
|
#
|
|
|
|
|
# Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
|
# copy of this software and associated documentation files (the "Software"),
|
|
|
|
|
# to deal in the Software without restriction, including without limitation
|
|
|
|
|
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
|
# and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
|
# Software is furnished to do so, subject to the following conditions:
|
|
|
|
|
#
|
|
|
|
|
# The above copyright notice and this permission notice (including the next
|
|
|
|
|
# paragraph) shall be included in all copies or substantial portions of the
|
|
|
|
|
# Software.
|
|
|
|
|
#
|
|
|
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
|
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
|
|
|
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
|
|
|
# IN THE SOFTWARE.
|
|
|
|
|
#
|
|
|
|
|
# Authors:
|
|
|
|
|
# Jason Ekstrand (jason@jlekstrand.net)
|
|
|
|
|
|
|
|
|
|
import nir_algebraic
|
|
|
|
|
|
|
|
|
|
# Convenience variables
|
|
|
|
|
a = 'a'
|
|
|
|
|
b = 'b'
|
|
|
|
|
c = 'c'
|
|
|
|
|
d = 'd'
|
|
|
|
|
|
|
|
|
|
# Written in the form (<search>, <replace>) where <search> is an expression
|
|
|
|
|
# and <replace> is either an expression or a value. An expression is
|
2016-03-17 18:04:49 +00:00
|
|
|
# defined as a tuple of the form ([~]<op>, <src0>, <src1>, <src2>, <src3>)
|
2014-12-12 19:13:10 +00:00
|
|
|
# where each source is either an expression or a value. A value can be
|
2015-01-29 00:42:20 +00:00
|
|
|
# either a numeric constant or a string representing a variable name.
|
|
|
|
|
#
|
2016-03-17 18:04:49 +00:00
|
|
|
# If the opcode in a search expression is prefixed by a '~' character, this
|
|
|
|
|
# indicates that the operation is inexact. Such operations will only get
|
|
|
|
|
# applied to SSA values that do not have the exact bit set. This should be
|
|
|
|
|
# used by by any optimizations that are not bit-for-bit exact. It should not,
|
|
|
|
|
# however, be used for backend-requested lowering operations as those need to
|
|
|
|
|
# happen regardless of precision.
|
|
|
|
|
#
|
2016-05-07 18:01:24 +01:00
|
|
|
# Variable names are specified as "[#]name[@type][(cond)]" where "#" inicates
|
|
|
|
|
# that the given variable will only match constants and the type indicates that
|
2015-01-29 00:42:20 +00:00
|
|
|
# the given variable will only match values from ALU instructions with the
|
2016-05-07 18:01:24 +01:00
|
|
|
# given output type, and (cond) specifies an additional condition function
|
|
|
|
|
# (see nir_search_helpers.h).
|
2015-01-29 00:42:20 +00:00
|
|
|
#
|
|
|
|
|
# For constants, you have to be careful to make sure that it is the right
|
|
|
|
|
# type because python is unaware of the source and destination types of the
|
2014-12-12 19:13:10 +00:00
|
|
|
# opcodes.
|
2016-04-25 20:23:38 +01:00
|
|
|
#
|
|
|
|
|
# All expression types can have a bit-size specified. For opcodes, this
|
|
|
|
|
# looks like "op@32", for variables it is "a@32" or "a@uint32" to specify a
|
2016-04-25 20:41:44 +01:00
|
|
|
# type and size, and for literals, you can write "2.0@32". In the search half
|
|
|
|
|
# of the expression this indicates that it should only match that particular
|
|
|
|
|
# bit-size. In the replace half of the expression this indicates that the
|
|
|
|
|
# constructed value should have that bit-size.
|
2014-12-12 19:13:10 +00:00
|
|
|
|
|
|
|
|
optimizations = [
|
2016-05-07 18:01:24 +01:00
|
|
|
|
|
|
|
|
(('imul', a, '#b@32(is_pos_power_of_two)'), ('ishl', a, ('find_lsb', b))),
|
|
|
|
|
(('imul', a, '#b@32(is_neg_power_of_two)'), ('ineg', ('ishl', a, ('find_lsb', ('iabs', b))))),
|
2016-10-19 16:53:10 +01:00
|
|
|
(('udiv', a, 1), a),
|
|
|
|
|
(('idiv', a, 1), a),
|
|
|
|
|
(('umod', a, 1), 0),
|
|
|
|
|
(('imod', a, 1), 0),
|
2016-05-07 18:01:24 +01:00
|
|
|
(('udiv', a, '#b@32(is_pos_power_of_two)'), ('ushr', a, ('find_lsb', b))),
|
|
|
|
|
(('idiv', a, '#b@32(is_pos_power_of_two)'), ('imul', ('isign', a), ('ushr', ('iabs', a), ('find_lsb', b))), 'options->lower_idiv'),
|
|
|
|
|
(('idiv', a, '#b@32(is_neg_power_of_two)'), ('ineg', ('imul', ('isign', a), ('ushr', ('iabs', a), ('find_lsb', ('iabs', b))))), 'options->lower_idiv'),
|
|
|
|
|
(('umod', a, '#b(is_pos_power_of_two)'), ('iand', a, ('isub', b, 1))),
|
|
|
|
|
|
2014-12-12 19:13:10 +00:00
|
|
|
(('fneg', ('fneg', a)), a),
|
|
|
|
|
(('ineg', ('ineg', a)), a),
|
|
|
|
|
(('fabs', ('fabs', a)), ('fabs', a)),
|
|
|
|
|
(('fabs', ('fneg', a)), ('fabs', a)),
|
2017-03-08 03:54:37 +00:00
|
|
|
(('fabs', ('u2f32', a)), ('u2f32', a)),
|
2014-12-12 19:13:10 +00:00
|
|
|
(('iabs', ('iabs', a)), ('iabs', a)),
|
|
|
|
|
(('iabs', ('ineg', a)), ('iabs', a)),
|
2016-03-17 18:31:48 +00:00
|
|
|
(('~fadd', a, 0.0), a),
|
2014-12-12 19:13:10 +00:00
|
|
|
(('iadd', a, 0), a),
|
2015-08-19 06:38:34 +01:00
|
|
|
(('usadd_4x8', a, 0), a),
|
|
|
|
|
(('usadd_4x8', a, ~0), ~0),
|
2016-03-17 18:31:48 +00:00
|
|
|
(('~fadd', ('fmul', a, b), ('fmul', a, c)), ('fmul', a, ('fadd', b, c))),
|
2015-02-28 19:32:31 +00:00
|
|
|
(('iadd', ('imul', a, b), ('imul', a, c)), ('imul', a, ('iadd', b, c))),
|
2016-03-17 18:31:48 +00:00
|
|
|
(('~fadd', ('fneg', a), a), 0.0),
|
2015-02-28 19:32:32 +00:00
|
|
|
(('iadd', ('ineg', a), a), 0),
|
2015-12-15 01:44:23 +00:00
|
|
|
(('iadd', ('ineg', a), ('iadd', a, b)), b),
|
|
|
|
|
(('iadd', a, ('iadd', ('ineg', a), b)), b),
|
2016-03-17 18:31:48 +00:00
|
|
|
(('~fadd', ('fneg', a), ('fadd', a, b)), b),
|
|
|
|
|
(('~fadd', a, ('fadd', ('fneg', a), b)), b),
|
|
|
|
|
(('~fmul', a, 0.0), 0.0),
|
2014-12-12 19:13:10 +00:00
|
|
|
(('imul', a, 0), 0),
|
2015-08-19 06:38:34 +01:00
|
|
|
(('umul_unorm_4x8', a, 0), 0),
|
|
|
|
|
(('umul_unorm_4x8', a, ~0), a),
|
2014-12-12 19:13:10 +00:00
|
|
|
(('fmul', a, 1.0), a),
|
|
|
|
|
(('imul', a, 1), a),
|
|
|
|
|
(('fmul', a, -1.0), ('fneg', a)),
|
|
|
|
|
(('imul', a, -1), ('ineg', a)),
|
2016-03-17 18:31:48 +00:00
|
|
|
(('~ffma', 0.0, a, b), b),
|
|
|
|
|
(('~ffma', a, 0.0, b), b),
|
|
|
|
|
(('~ffma', a, b, 0.0), ('fmul', a, b)),
|
2014-12-12 19:13:10 +00:00
|
|
|
(('ffma', a, 1.0, b), ('fadd', a, b)),
|
|
|
|
|
(('ffma', 1.0, a, b), ('fadd', a, b)),
|
2016-03-17 18:31:48 +00:00
|
|
|
(('~flrp', a, b, 0.0), a),
|
|
|
|
|
(('~flrp', a, b, 1.0), b),
|
|
|
|
|
(('~flrp', a, a, b), a),
|
|
|
|
|
(('~flrp', 0.0, a, b), ('fmul', a, b)),
|
2016-04-28 06:13:10 +01:00
|
|
|
(('~flrp', a, b, ('b2f', c)), ('bcsel', c, b, a), 'options->lower_flrp32'),
|
2017-01-03 10:10:33 +00:00
|
|
|
(('~flrp', a, 0.0, c), ('fadd', ('fmul', ('fneg', a), c), a)),
|
2016-04-26 08:35:30 +01:00
|
|
|
(('flrp@32', a, b, c), ('fadd', ('fmul', c, ('fsub', b, a)), a), 'options->lower_flrp32'),
|
|
|
|
|
(('flrp@64', a, b, c), ('fadd', ('fmul', c, ('fsub', b, a)), a), 'options->lower_flrp64'),
|
2015-09-14 16:13:19 +01:00
|
|
|
(('ffract', a), ('fsub', a, ('ffloor', a)), 'options->lower_ffract'),
|
2016-04-28 06:13:10 +01:00
|
|
|
(('~fadd', ('fmul', a, ('fadd', 1.0, ('fneg', ('b2f', c)))), ('fmul', b, ('b2f', c))), ('bcsel', c, b, a), 'options->lower_flrp32'),
|
2016-04-26 08:35:30 +01:00
|
|
|
(('~fadd@32', ('fmul', a, ('fadd', 1.0, ('fneg', c ))), ('fmul', b, c )), ('flrp', a, b, c), '!options->lower_flrp32'),
|
|
|
|
|
(('~fadd@64', ('fmul', a, ('fadd', 1.0, ('fneg', c ))), ('fmul', b, c )), ('flrp', a, b, c), '!options->lower_flrp64'),
|
2016-04-28 06:13:10 +01:00
|
|
|
(('~fadd', a, ('fmul', ('b2f', c), ('fadd', b, ('fneg', a)))), ('bcsel', c, b, a), 'options->lower_flrp32'),
|
2016-04-26 08:35:30 +01:00
|
|
|
(('~fadd@32', a, ('fmul', c , ('fadd', b, ('fneg', a)))), ('flrp', a, b, c), '!options->lower_flrp32'),
|
|
|
|
|
(('~fadd@64', a, ('fmul', c , ('fadd', b, ('fneg', a)))), ('flrp', a, b, c), '!options->lower_flrp64'),
|
2015-01-30 21:49:48 +00:00
|
|
|
(('ffma', a, b, c), ('fadd', ('fmul', a, b), c), 'options->lower_ffma'),
|
2016-05-06 00:58:44 +01:00
|
|
|
(('~fadd', ('fmul', a, b), c), ('ffma', a, b, c), 'options->fuse_ffma'),
|
nir/algebraic: Optimize common array indexing sequence
Some shaders include code that looks like:
uniform int i;
uniform vec4 bones[...];
foo(bones[i * 3], bones[i * 3 + 1], bones[i * 3 + 2]);
CSE would do some work on this:
x = i * 3
foo(bones[x], bones[x + 1], bones[x + 2]);
The compiler may then add '<< 4 + base' to the index calculations.
This results in expressions like
x = i * 3
foo(bones[x << 4], bones[(x + 1) << 4], bones[(x + 2) << 4]);
Just rearranging the math to produce (i * 48) + 16 saves an
instruction, and it allows CSE to do more work.
x = i * 48;
foo(bones[x], bones[x + 16], bones[x + 32]);
So, ~6 instructions becomes ~3.
Some individual shader-db results look pretty bad. However, I have a
really, really hard time believing the change in estimated cycles in,
for example, 3dmmes-taiji/51.shader_test after looking that change in
the generated code.
G45
total instructions in shared programs: 4020840 -> 4010070 (-0.27%)
instructions in affected programs: 177460 -> 166690 (-6.07%)
helped: 894
HURT: 0
total cycles in shared programs: 98829000 -> 98784990 (-0.04%)
cycles in affected programs: 3936648 -> 3892638 (-1.12%)
helped: 894
HURT: 0
Ironlake
total instructions in shared programs: 6418887 -> 6408117 (-0.17%)
instructions in affected programs: 177460 -> 166690 (-6.07%)
helped: 894
HURT: 0
total cycles in shared programs: 143504542 -> 143460532 (-0.03%)
cycles in affected programs: 3936648 -> 3892638 (-1.12%)
helped: 894
HURT: 0
Sandy Bridge
total instructions in shared programs: 8357887 -> 8339251 (-0.22%)
instructions in affected programs: 432715 -> 414079 (-4.31%)
helped: 2795
HURT: 0
total cycles in shared programs: 118284184 -> 118207412 (-0.06%)
cycles in affected programs: 6114626 -> 6037854 (-1.26%)
helped: 2478
HURT: 317
Ivy Bridge
total instructions in shared programs: 7669390 -> 7653822 (-0.20%)
instructions in affected programs: 388234 -> 372666 (-4.01%)
helped: 2795
HURT: 0
total cycles in shared programs: 68381982 -> 68263684 (-0.17%)
cycles in affected programs: 1972658 -> 1854360 (-6.00%)
helped: 2458
HURT: 307
Haswell
total instructions in shared programs: 7082636 -> 7067068 (-0.22%)
instructions in affected programs: 388234 -> 372666 (-4.01%)
helped: 2795
HURT: 0
total cycles in shared programs: 68282020 -> 68164158 (-0.17%)
cycles in affected programs: 1891820 -> 1773958 (-6.23%)
helped: 2459
HURT: 261
Broadwell
total instructions in shared programs: 9002466 -> 8985875 (-0.18%)
instructions in affected programs: 658784 -> 642193 (-2.52%)
helped: 2795
HURT: 5
total cycles in shared programs: 78503092 -> 78450404 (-0.07%)
cycles in affected programs: 2873304 -> 2820616 (-1.83%)
helped: 2275
HURT: 415
Skylake
total instructions in shared programs: 9156978 -> 9140387 (-0.18%)
instructions in affected programs: 682625 -> 666034 (-2.43%)
helped: 2795
HURT: 5
total cycles in shared programs: 75591392 -> 75550574 (-0.05%)
cycles in affected programs: 3192120 -> 3151302 (-1.28%)
helped: 2271
HURT: 425
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Thomas Helland <thomashelland90@gmail.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
2016-07-20 01:47:38 +01:00
|
|
|
|
|
|
|
|
# (a * #b + #c) << #d
|
|
|
|
|
# ((a * #b) << #d) + (#c << #d)
|
|
|
|
|
# (a * (#b << #d)) + (#c << #d)
|
|
|
|
|
(('ishl', ('iadd', ('imul', a, '#b'), '#c'), '#d'),
|
|
|
|
|
('iadd', ('imul', a, ('ishl', b, d)), ('ishl', c, d))),
|
|
|
|
|
|
|
|
|
|
# (a * #b) << #c
|
|
|
|
|
# a * (#b << #c)
|
|
|
|
|
(('ishl', ('imul', a, '#b'), '#c'), ('imul', a, ('ishl', b, c))),
|
|
|
|
|
|
2015-01-22 07:36:01 +00:00
|
|
|
# Comparison simplifications
|
2016-03-17 18:31:48 +00:00
|
|
|
(('~inot', ('flt', a, b)), ('fge', a, b)),
|
|
|
|
|
(('~inot', ('fge', a, b)), ('flt', a, b)),
|
|
|
|
|
(('~inot', ('feq', a, b)), ('fne', a, b)),
|
|
|
|
|
(('~inot', ('fne', a, b)), ('feq', a, b)),
|
2015-01-22 07:36:01 +00:00
|
|
|
(('inot', ('ilt', a, b)), ('ige', a, b)),
|
|
|
|
|
(('inot', ('ige', a, b)), ('ilt', a, b)),
|
2015-05-06 06:54:59 +01:00
|
|
|
(('inot', ('ieq', a, b)), ('ine', a, b)),
|
|
|
|
|
(('inot', ('ine', a, b)), ('ieq', a, b)),
|
2016-03-02 23:18:34 +00:00
|
|
|
|
|
|
|
|
# 0.0 >= b2f(a)
|
|
|
|
|
# b2f(a) <= 0.0
|
|
|
|
|
# b2f(a) == 0.0 because b2f(a) can only be 0 or 1
|
|
|
|
|
# inot(a)
|
|
|
|
|
(('fge', 0.0, ('b2f', a)), ('inot', a)),
|
|
|
|
|
|
2017-01-04 05:21:34 +00:00
|
|
|
(('fge', ('fneg', ('b2f', a)), 0.0), ('inot', a)),
|
|
|
|
|
|
2018-01-31 19:11:02 +00:00
|
|
|
# fmin(-b2f(a), b) >= 0.0
|
|
|
|
|
# -b2f(a) >= 0.0 && b >= 0.0
|
|
|
|
|
# -b2f(a) == 0.0 && b >= 0.0 -b2f can only be 0 or -1, never >0
|
|
|
|
|
# b2f(a) == 0.0 && b >= 0.0
|
|
|
|
|
# a == False && b >= 0.0
|
|
|
|
|
# !a && b >= 0.0
|
|
|
|
|
#
|
|
|
|
|
# The fge in the second replacement is not a typo. I leave the proof that
|
|
|
|
|
# "fmin(-b2f(a), b) >= 0 <=> fmin(-b2f(a), b) == 0" as an exercise for the
|
|
|
|
|
# reader.
|
|
|
|
|
(('fge', ('fmin', ('fneg', ('b2f', a)), b), 0.0), ('iand', ('inot', a), ('fge', b, 0.0))),
|
|
|
|
|
(('feq', ('fmin', ('fneg', ('b2f', a)), b), 0.0), ('iand', ('inot', a), ('fge', b, 0.0))),
|
|
|
|
|
|
2016-03-02 23:36:14 +00:00
|
|
|
# 0.0 < fabs(a)
|
|
|
|
|
# fabs(a) > 0.0
|
|
|
|
|
# fabs(a) != 0.0 because fabs(a) must be >= 0
|
|
|
|
|
# a != 0.0
|
|
|
|
|
(('flt', 0.0, ('fabs', a)), ('fne', a, 0.0)),
|
|
|
|
|
|
2016-03-08 19:11:00 +00:00
|
|
|
(('fmax', ('b2f(is_used_once)', a), ('b2f', b)), ('b2f', ('ior', a, b))),
|
|
|
|
|
(('fmax', ('fneg(is_used_once)', ('b2f(is_used_once)', a)), ('fneg', ('b2f', b))), ('fneg', ('b2f', ('ior', a, b)))),
|
|
|
|
|
(('fmin', ('b2f(is_used_once)', a), ('b2f', b)), ('b2f', ('iand', a, b))),
|
|
|
|
|
(('fmin', ('fneg(is_used_once)', ('b2f(is_used_once)', a)), ('fneg', ('b2f', b))), ('fneg', ('b2f', ('iand', a, b)))),
|
|
|
|
|
|
2018-02-03 01:39:54 +00:00
|
|
|
# fmin(b2f(a), b)
|
|
|
|
|
# bcsel(a, fmin(b2f(a), b), fmin(b2f(a), b))
|
|
|
|
|
# bcsel(a, fmin(b2f(True), b), fmin(b2f(False), b))
|
|
|
|
|
# bcsel(a, fmin(1.0, b), fmin(0.0, b))
|
|
|
|
|
#
|
|
|
|
|
# Since b is a constant, constant folding will eliminate the fmin and the
|
|
|
|
|
# fmax. If b is > 1.0, the bcsel will be replaced with a b2f.
|
|
|
|
|
(('fmin', ('b2f', a), '#b'), ('bcsel', a, ('fmin', b, 1.0), ('fmin', b, 0.0))),
|
|
|
|
|
|
2017-01-12 06:01:03 +00:00
|
|
|
# ignore this opt when the result is used by a bcsel or if so we can make
|
|
|
|
|
# use of conditional modifiers on supported hardware.
|
|
|
|
|
(('flt(is_not_used_by_conditional)', ('fadd(is_used_once)', a, ('fneg', b)), 0.0), ('flt', a, b)),
|
|
|
|
|
|
2014-12-12 19:13:10 +00:00
|
|
|
(('fge', ('fneg', ('fabs', a)), 0.0), ('feq', a, 0.0)),
|
2018-02-26 22:49:47 +00:00
|
|
|
(('~bcsel', ('flt', b, a), b, a), ('fmin', a, b)),
|
|
|
|
|
(('~bcsel', ('flt', a, b), b, a), ('fmax', a, b)),
|
2018-01-22 09:29:48 +00:00
|
|
|
(('~bcsel', ('fge', a, b), b, a), ('fmin', a, b)),
|
|
|
|
|
(('~bcsel', ('fge', b, a), b, a), ('fmax', a, b)),
|
2016-08-17 23:03:01 +01:00
|
|
|
(('bcsel', ('inot', a), b, c), ('bcsel', a, c, b)),
|
2015-02-20 09:20:34 +00:00
|
|
|
(('bcsel', a, ('bcsel', a, b, c), d), ('bcsel', a, b, d)),
|
nir: Simplify a bcsel to logical-or
Oddly, this did not affect the shader where I first noticed the pattern.
That particular shader doesn't get its if-statement converted to a bcsel
because there are two assignments in the else-statement. This led to me
submitting https://bugs.freedesktop.org/show_bug.cgi?id=94747.
shader-db results:
Sandy Bridge
total instructions in shared programs: 8467384 -> 8467069 (-0.00%)
instructions in affected programs: 36594 -> 36279 (-0.86%)
helped: 46
HURT: 0
total cycles in shared programs: 117573448 -> 117568518 (-0.00%)
cycles in affected programs: 339114 -> 334184 (-1.45%)
helped: 46
HURT: 0
Ivy Bridge / Haswell / Broadwell / Skylake:
total instructions in shared programs: 7774258 -> 7773999 (-0.00%)
instructions in affected programs: 30874 -> 30615 (-0.84%)
helped: 46
HURT: 0
total cycles in shared programs: 65739190 -> 65734530 (-0.01%)
cycles in affected programs: 180380 -> 175720 (-2.58%)
helped: 45
HURT: 1
No change on G45 or Ironlake.
I also tried these expressions, but none of them affected any shaders in
shader-db:
(('bcsel', a, 'a@bool', 'b@bool'), ('ior', a, b)),
(('bcsel', a, 'b@bool', False), ('iand', a, b)),
(('bcsel', a, 'b@bool', 'a@bool'), ('iand', a, b)),
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2016-03-29 23:25:04 +01:00
|
|
|
(('bcsel', a, True, 'b@bool'), ('ior', a, b)),
|
2015-05-06 04:20:30 +01:00
|
|
|
(('fmin', a, a), a),
|
|
|
|
|
(('fmax', a, a), a),
|
|
|
|
|
(('imin', a, a), a),
|
|
|
|
|
(('imax', a, a), a),
|
|
|
|
|
(('umin', a, a), a),
|
|
|
|
|
(('umax', a, a), a),
|
2017-01-18 11:23:22 +00:00
|
|
|
(('fmin', a, ('fneg', a)), ('fneg', ('fabs', a))),
|
|
|
|
|
(('imin', a, ('ineg', a)), ('ineg', ('iabs', a))),
|
|
|
|
|
(('fmin', a, ('fneg', ('fabs', a))), ('fneg', ('fabs', a))),
|
|
|
|
|
(('imin', a, ('ineg', ('iabs', a))), ('ineg', ('iabs', a))),
|
|
|
|
|
(('fmin', a, ('fabs', a)), a),
|
|
|
|
|
(('imin', a, ('iabs', a)), a),
|
|
|
|
|
(('fmax', a, ('fneg', ('fabs', a))), a),
|
|
|
|
|
(('imax', a, ('ineg', ('iabs', a))), a),
|
|
|
|
|
(('fmax', a, ('fabs', a)), ('fabs', a)),
|
|
|
|
|
(('imax', a, ('iabs', a)), ('iabs', a)),
|
|
|
|
|
(('fmax', a, ('fneg', a)), ('fabs', a)),
|
|
|
|
|
(('imax', a, ('ineg', a)), ('iabs', a)),
|
2016-03-17 18:31:48 +00:00
|
|
|
(('~fmin', ('fmax', a, 0.0), 1.0), ('fsat', a), '!options->lower_fsat'),
|
|
|
|
|
(('~fmax', ('fmin', a, 1.0), 0.0), ('fsat', a), '!options->lower_fsat'),
|
2015-01-30 21:53:39 +00:00
|
|
|
(('fsat', a), ('fmin', ('fmax', a, 0.0), 1.0), 'options->lower_fsat'),
|
2015-01-30 22:10:58 +00:00
|
|
|
(('fsat', ('fsat', a)), ('fsat', a)),
|
2016-04-09 02:31:16 +01:00
|
|
|
(('fmin', ('fmax', ('fmin', ('fmax', a, b), c), b), c), ('fmin', ('fmax', a, b), c)),
|
|
|
|
|
(('imin', ('imax', ('imin', ('imax', a, b), c), b), c), ('imin', ('imax', a, b), c)),
|
|
|
|
|
(('umin', ('umax', ('umin', ('umax', a, b), c), b), c), ('umin', ('umax', a, b), c)),
|
2016-11-30 01:33:30 +00:00
|
|
|
(('fmax', ('fsat', a), '#b@32(is_zero_to_one)'), ('fsat', ('fmax', a, b))),
|
|
|
|
|
(('fmin', ('fsat', a), '#b@32(is_zero_to_one)'), ('fsat', ('fmin', a, b))),
|
2016-04-09 02:31:16 +01:00
|
|
|
(('extract_u8', ('imin', ('imax', a, 0), 0xff), 0), ('imin', ('imax', a, 0), 0xff)),
|
2018-01-04 21:30:49 +00:00
|
|
|
(('~ior', ('flt(is_used_once)', a, b), ('flt', a, c)), ('flt', a, ('fmax', b, c))),
|
|
|
|
|
(('~ior', ('flt(is_used_once)', a, c), ('flt', b, c)), ('flt', ('fmin', a, b), c)),
|
|
|
|
|
(('~ior', ('fge(is_used_once)', a, b), ('fge', a, c)), ('fge', a, ('fmin', b, c))),
|
|
|
|
|
(('~ior', ('fge(is_used_once)', a, c), ('fge', b, c)), ('fge', ('fmax', a, b), c)),
|
|
|
|
|
(('~ior', ('flt', a, '#b'), ('flt', a, '#c')), ('flt', a, ('fmax', b, c))),
|
|
|
|
|
(('~ior', ('flt', '#a', c), ('flt', '#b', c)), ('flt', ('fmin', a, b), c)),
|
|
|
|
|
(('~ior', ('fge', a, '#b'), ('fge', a, '#c')), ('fge', a, ('fmin', b, c))),
|
|
|
|
|
(('~ior', ('fge', '#a', c), ('fge', '#b', c)), ('fge', ('fmax', a, b), c)),
|
2018-01-04 23:21:30 +00:00
|
|
|
(('~iand', ('flt(is_used_once)', a, b), ('flt', a, c)), ('flt', a, ('fmin', b, c))),
|
|
|
|
|
(('~iand', ('flt(is_used_once)', a, c), ('flt', b, c)), ('flt', ('fmax', a, b), c)),
|
|
|
|
|
(('~iand', ('fge(is_used_once)', a, b), ('fge', a, c)), ('fge', a, ('fmax', b, c))),
|
|
|
|
|
(('~iand', ('fge(is_used_once)', a, c), ('fge', b, c)), ('fge', ('fmin', a, b), c)),
|
|
|
|
|
(('~iand', ('flt', a, '#b'), ('flt', a, '#c')), ('flt', a, ('fmin', b, c))),
|
|
|
|
|
(('~iand', ('flt', '#a', c), ('flt', '#b', c)), ('flt', ('fmax', a, b), c)),
|
|
|
|
|
(('~iand', ('fge', a, '#b'), ('fge', a, '#c')), ('fge', a, ('fmax', b, c))),
|
|
|
|
|
(('~iand', ('fge', '#a', c), ('fge', '#b', c)), ('fge', ('fmin', a, b), c)),
|
2018-01-04 21:30:49 +00:00
|
|
|
|
2018-01-05 21:20:46 +00:00
|
|
|
(('ior', ('ilt(is_used_once)', a, b), ('ilt', a, c)), ('ilt', a, ('imax', b, c))),
|
|
|
|
|
(('ior', ('ilt(is_used_once)', a, c), ('ilt', b, c)), ('ilt', ('imin', a, b), c)),
|
|
|
|
|
(('ior', ('ige(is_used_once)', a, b), ('ige', a, c)), ('ige', a, ('imin', b, c))),
|
|
|
|
|
(('ior', ('ige(is_used_once)', a, c), ('ige', b, c)), ('ige', ('imax', a, b), c)),
|
|
|
|
|
(('ior', ('ult(is_used_once)', a, b), ('ult', a, c)), ('ult', a, ('umax', b, c))),
|
|
|
|
|
(('ior', ('ult(is_used_once)', a, c), ('ult', b, c)), ('ult', ('umin', a, b), c)),
|
|
|
|
|
(('ior', ('uge(is_used_once)', a, b), ('uge', a, c)), ('uge', a, ('umin', b, c))),
|
|
|
|
|
(('ior', ('uge(is_used_once)', a, c), ('uge', b, c)), ('uge', ('umax', a, b), c)),
|
|
|
|
|
(('iand', ('ilt(is_used_once)', a, b), ('ilt', a, c)), ('ilt', a, ('imin', b, c))),
|
|
|
|
|
(('iand', ('ilt(is_used_once)', a, c), ('ilt', b, c)), ('ilt', ('imax', a, b), c)),
|
|
|
|
|
(('iand', ('ige(is_used_once)', a, b), ('ige', a, c)), ('ige', a, ('imax', b, c))),
|
|
|
|
|
(('iand', ('ige(is_used_once)', a, c), ('ige', b, c)), ('ige', ('imin', a, b), c)),
|
|
|
|
|
(('iand', ('ult(is_used_once)', a, b), ('ult', a, c)), ('ult', a, ('umin', b, c))),
|
|
|
|
|
(('iand', ('ult(is_used_once)', a, c), ('ult', b, c)), ('ult', ('umax', a, b), c)),
|
|
|
|
|
(('iand', ('uge(is_used_once)', a, b), ('uge', a, c)), ('uge', a, ('umax', b, c))),
|
|
|
|
|
(('iand', ('uge(is_used_once)', a, c), ('uge', b, c)), ('uge', ('umin', a, b), c)),
|
|
|
|
|
|
2018-01-05 21:29:26 +00:00
|
|
|
# These patterns can result when (a < b || a < c) => (a < min(b, c))
|
|
|
|
|
# transformations occur before constant propagation and loop-unrolling.
|
|
|
|
|
(('~flt', a, ('fmax', b, a)), ('flt', a, b)),
|
|
|
|
|
(('~flt', ('fmin', a, b), a), ('flt', b, a)),
|
|
|
|
|
(('~fge', a, ('fmin', b, a)), True),
|
|
|
|
|
(('~fge', ('fmax', a, b), a), True),
|
|
|
|
|
(('~flt', a, ('fmin', b, a)), False),
|
|
|
|
|
(('~flt', ('fmax', a, b), a), False),
|
|
|
|
|
|
2018-01-05 21:20:46 +00:00
|
|
|
(('ilt', a, ('imax', b, a)), ('ilt', a, b)),
|
|
|
|
|
(('ilt', ('imin', a, b), a), ('ilt', b, a)),
|
|
|
|
|
(('ige', a, ('imin', b, a)), True),
|
|
|
|
|
(('ige', ('imax', a, b), a), True),
|
|
|
|
|
(('ult', a, ('umax', b, a)), ('ult', a, b)),
|
|
|
|
|
(('ult', ('umin', a, b), a), ('ult', b, a)),
|
|
|
|
|
(('uge', a, ('umin', b, a)), True),
|
|
|
|
|
(('uge', ('umax', a, b), a), True),
|
|
|
|
|
|
|
|
|
|
(('ilt', '#a', ('imin', '#b', c)), ('iand', ('ilt', a, b), ('ilt', a, c))),
|
|
|
|
|
(('ilt', ('imax', '#a', b), '#c'), ('iand', ('ilt', a, c), ('ilt', b, c))),
|
|
|
|
|
(('ige', '#a', ('imax', '#b', c)), ('iand', ('ige', a, b), ('ige', a, c))),
|
|
|
|
|
(('ige', ('imin', '#a', b), '#c'), ('iand', ('ige', a, c), ('ige', b, c))),
|
|
|
|
|
(('ult', '#a', ('umin', '#b', c)), ('iand', ('ult', a, b), ('ult', a, c))),
|
|
|
|
|
(('ult', ('umax', '#a', b), '#c'), ('iand', ('ult', a, c), ('ult', b, c))),
|
|
|
|
|
(('uge', '#a', ('umax', '#b', c)), ('iand', ('uge', a, b), ('uge', a, c))),
|
|
|
|
|
(('uge', ('umin', '#a', b), '#c'), ('iand', ('uge', a, c), ('uge', b, c))),
|
|
|
|
|
|
2016-03-02 21:47:56 +00:00
|
|
|
(('fabs', ('slt', a, b)), ('slt', a, b)),
|
|
|
|
|
(('fabs', ('sge', a, b)), ('sge', a, b)),
|
|
|
|
|
(('fabs', ('seq', a, b)), ('seq', a, b)),
|
|
|
|
|
(('fabs', ('sne', a, b)), ('sne', a, b)),
|
2015-03-31 16:25:19 +01:00
|
|
|
(('slt', a, b), ('b2f', ('flt', a, b)), 'options->lower_scmp'),
|
|
|
|
|
(('sge', a, b), ('b2f', ('fge', a, b)), 'options->lower_scmp'),
|
|
|
|
|
(('seq', a, b), ('b2f', ('feq', a, b)), 'options->lower_scmp'),
|
|
|
|
|
(('sne', a, b), ('b2f', ('fne', a, b)), 'options->lower_scmp'),
|
2015-08-06 12:36:04 +01:00
|
|
|
(('fne', ('fneg', a), a), ('fne', a, 0.0)),
|
2015-08-06 12:36:05 +01:00
|
|
|
(('feq', ('fneg', a), a), ('feq', a, 0.0)),
|
2015-03-18 06:30:32 +00:00
|
|
|
# Emulating booleans
|
2015-05-06 03:50:58 +01:00
|
|
|
(('imul', ('b2i', a), ('b2i', b)), ('b2i', ('iand', a, b))),
|
2015-03-18 06:30:32 +00:00
|
|
|
(('fmul', ('b2f', a), ('b2f', b)), ('b2f', ('iand', a, b))),
|
2015-03-18 06:30:43 +00:00
|
|
|
(('fsat', ('fadd', ('b2f', a), ('b2f', b))), ('b2f', ('ior', a, b))),
|
2015-03-30 06:59:39 +01:00
|
|
|
(('iand', 'a@bool', 1.0), ('b2f', a)),
|
2016-08-09 01:05:18 +01:00
|
|
|
# True/False are ~0 and 0 in NIR. b2i of True is 1, and -1 is ~0 (True).
|
2017-03-08 03:54:37 +00:00
|
|
|
(('ineg', ('b2i@32', a)), a),
|
2015-03-30 07:04:21 +01:00
|
|
|
(('flt', ('fneg', ('b2f', a)), 0), a), # Generated by TGSI KILL_IF.
|
|
|
|
|
(('flt', ('fsub', 0.0, ('b2f', a)), 0), a), # Generated by TGSI KILL_IF.
|
2015-02-07 01:12:59 +00:00
|
|
|
# Comparison with the same args. Note that these are not done for
|
|
|
|
|
# the float versions because NaN always returns false on float
|
|
|
|
|
# inequalities.
|
|
|
|
|
(('ilt', a, a), False),
|
|
|
|
|
(('ige', a, a), True),
|
|
|
|
|
(('ieq', a, a), True),
|
|
|
|
|
(('ine', a, a), False),
|
|
|
|
|
(('ult', a, a), False),
|
|
|
|
|
(('uge', a, a), True),
|
2015-01-19 22:57:38 +00:00
|
|
|
# Logical and bit operations
|
|
|
|
|
(('fand', a, 0.0), 0.0),
|
|
|
|
|
(('iand', a, a), a),
|
2015-07-31 17:12:48 +01:00
|
|
|
(('iand', a, ~0), a),
|
2015-01-19 22:57:38 +00:00
|
|
|
(('iand', a, 0), 0),
|
|
|
|
|
(('ior', a, a), a),
|
|
|
|
|
(('ior', a, 0), a),
|
2016-07-06 23:00:45 +01:00
|
|
|
(('ior', a, True), True),
|
2015-01-19 22:57:38 +00:00
|
|
|
(('fxor', a, a), 0.0),
|
|
|
|
|
(('ixor', a, a), 0),
|
2016-02-02 00:34:46 +00:00
|
|
|
(('ixor', a, 0), a),
|
2015-01-19 22:57:38 +00:00
|
|
|
(('inot', ('inot', a)), a),
|
|
|
|
|
# DeMorgan's Laws
|
|
|
|
|
(('iand', ('inot', a), ('inot', b)), ('inot', ('ior', a, b))),
|
|
|
|
|
(('ior', ('inot', a), ('inot', b)), ('inot', ('iand', a, b))),
|
2015-01-22 07:25:56 +00:00
|
|
|
# Shift optimizations
|
|
|
|
|
(('ishl', 0, a), 0),
|
|
|
|
|
(('ishl', a, 0), a),
|
|
|
|
|
(('ishr', 0, a), 0),
|
|
|
|
|
(('ishr', a, 0), a),
|
|
|
|
|
(('ushr', 0, a), 0),
|
2015-04-14 16:40:22 +01:00
|
|
|
(('ushr', a, 0), a),
|
2017-08-01 02:26:49 +01:00
|
|
|
(('iand', 0xff, ('ushr@32', a, 24)), ('ushr', a, 24)),
|
|
|
|
|
(('iand', 0xffff, ('ushr@32', a, 16)), ('ushr', a, 16)),
|
2015-01-22 07:47:06 +00:00
|
|
|
# Exponential/logarithmic identities
|
2016-03-17 18:31:48 +00:00
|
|
|
(('~fexp2', ('flog2', a)), a), # 2^lg2(a) = a
|
|
|
|
|
(('~flog2', ('fexp2', a)), a), # lg2(2^a) = a
|
2015-01-28 18:32:57 +00:00
|
|
|
(('fpow', a, b), ('fexp2', ('fmul', ('flog2', a), b)), 'options->lower_fpow'), # a^b = 2^(lg2(a)*b)
|
2016-03-17 18:31:48 +00:00
|
|
|
(('~fexp2', ('fmul', ('flog2', a), b)), ('fpow', a, b), '!options->lower_fpow'), # 2^(lg2(a)*b) = a^b
|
|
|
|
|
(('~fexp2', ('fadd', ('fmul', ('flog2', a), b), ('fmul', ('flog2', c), d))),
|
|
|
|
|
('~fmul', ('fpow', a, b), ('fpow', c, d)), '!options->lower_fpow'), # 2^(lg2(a) * b + lg2(c) + d) = a^b * c^d
|
2018-02-05 14:08:03 +00:00
|
|
|
(('~fexp2', ('fmul', ('flog2', a), 2.0)), ('fmul', a, a)),
|
|
|
|
|
(('~fexp2', ('fmul', ('flog2', a), 4.0)), ('fmul', ('fmul', a, a), ('fmul', a, a))),
|
2016-03-17 18:31:48 +00:00
|
|
|
(('~fpow', a, 1.0), a),
|
|
|
|
|
(('~fpow', a, 2.0), ('fmul', a, a)),
|
|
|
|
|
(('~fpow', a, 4.0), ('fmul', ('fmul', a, a), ('fmul', a, a))),
|
|
|
|
|
(('~fpow', 2.0, a), ('fexp2', a)),
|
|
|
|
|
(('~fpow', ('fpow', a, 2.2), 0.454545), a),
|
|
|
|
|
(('~fpow', ('fabs', ('fpow', a, 2.2)), 0.454545), ('fabs', a)),
|
|
|
|
|
(('~fsqrt', ('fexp2', a)), ('fexp2', ('fmul', 0.5, a))),
|
|
|
|
|
(('~frcp', ('fexp2', a)), ('fexp2', ('fneg', a))),
|
|
|
|
|
(('~frsq', ('fexp2', a)), ('fexp2', ('fmul', -0.5, a))),
|
|
|
|
|
(('~flog2', ('fsqrt', a)), ('fmul', 0.5, ('flog2', a))),
|
|
|
|
|
(('~flog2', ('frcp', a)), ('fneg', ('flog2', a))),
|
|
|
|
|
(('~flog2', ('frsq', a)), ('fmul', -0.5, ('flog2', a))),
|
|
|
|
|
(('~flog2', ('fpow', a, b)), ('fmul', b, ('flog2', a))),
|
2018-02-05 15:07:45 +00:00
|
|
|
(('~fmul', ('fexp2(is_used_once)', a), ('fexp2(is_used_once)', b)), ('fexp2', ('fadd', a, b))),
|
2015-01-22 07:52:17 +00:00
|
|
|
# Division and reciprocal
|
2016-03-17 18:31:48 +00:00
|
|
|
(('~fdiv', 1.0, a), ('frcp', a)),
|
nir: Add a lower_fdiv option, turn fdiv into fmul/frcp.
The nir_opt_algebraic rule
(('fadd', ('flog2', a), ('fneg', ('flog2', b))), ('flog2', ('fdiv', a, b))),
can produce new fdiv operations, which need to be lowered on i965,
as we don't actually implement fdiv. (Normally, we handle this in
GLSL IR's lower_instructions pass, but in the above case we introduce
an fdiv after that point. So, make NIR do it for us.)
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Cc: mesa-stable@lists.freedesktop.org
2016-01-05 13:09:46 +00:00
|
|
|
(('fdiv', a, b), ('fmul', a, ('frcp', b)), 'options->lower_fdiv'),
|
2016-03-17 18:31:48 +00:00
|
|
|
(('~frcp', ('frcp', a)), a),
|
|
|
|
|
(('~frcp', ('fsqrt', a)), ('frsq', a)),
|
2015-01-28 18:39:29 +00:00
|
|
|
(('fsqrt', a), ('frcp', ('frsq', a)), 'options->lower_fsqrt'),
|
2016-03-17 18:31:48 +00:00
|
|
|
(('~frcp', ('frsq', a)), ('fsqrt', a), '!options->lower_fsqrt'),
|
2015-01-29 00:55:03 +00:00
|
|
|
# Boolean simplifications
|
2015-12-02 00:13:11 +00:00
|
|
|
(('ieq', 'a@bool', True), a),
|
2017-01-08 12:52:59 +00:00
|
|
|
(('ine(is_not_used_by_if)', 'a@bool', True), ('inot', a)),
|
2015-12-02 00:13:11 +00:00
|
|
|
(('ine', 'a@bool', False), a),
|
2017-01-08 12:52:59 +00:00
|
|
|
(('ieq(is_not_used_by_if)', 'a@bool', False), ('inot', 'a')),
|
2016-08-17 23:03:01 +01:00
|
|
|
(('bcsel', a, True, False), a),
|
|
|
|
|
(('bcsel', a, False, True), ('inot', a)),
|
2016-08-09 09:44:38 +01:00
|
|
|
(('bcsel@32', a, 1.0, 0.0), ('b2f', a)),
|
|
|
|
|
(('bcsel@32', a, 0.0, 1.0), ('b2f', ('inot', a))),
|
|
|
|
|
(('bcsel@32', a, -1.0, -0.0), ('fneg', ('b2f', a))),
|
|
|
|
|
(('bcsel@32', a, -0.0, -1.0), ('fneg', ('b2f', ('inot', a)))),
|
2015-01-29 00:53:51 +00:00
|
|
|
(('bcsel', True, b, c), b),
|
|
|
|
|
(('bcsel', False, b, c), c),
|
2018-02-01 23:33:04 +00:00
|
|
|
(('bcsel', a, ('b2f(is_used_once)', b), ('b2f', c)), ('b2f', ('bcsel', a, b, c))),
|
2015-01-29 00:53:51 +00:00
|
|
|
# The result of this should be hit by constant propagation and, in the
|
|
|
|
|
# next round of opt_algebraic, get picked up by one of the above two.
|
|
|
|
|
(('bcsel', '#a', b, c), ('bcsel', ('ine', 'a', 0), b, c)),
|
2015-01-19 22:57:38 +00:00
|
|
|
|
2015-01-29 23:50:18 +00:00
|
|
|
(('bcsel', a, b, b), b),
|
|
|
|
|
(('fcsel', a, b, b), b),
|
|
|
|
|
|
2015-03-26 17:09:42 +00:00
|
|
|
# Conversions
|
2015-05-06 03:56:27 +01:00
|
|
|
(('i2b', ('b2i', a)), a),
|
2017-03-08 03:54:37 +00:00
|
|
|
(('f2i32', ('ftrunc', a)), ('f2i32', a)),
|
|
|
|
|
(('f2u32', ('ftrunc', a)), ('f2u32', a)),
|
2016-03-02 02:59:57 +00:00
|
|
|
(('i2b', ('ineg', a)), ('i2b', a)),
|
|
|
|
|
(('i2b', ('iabs', a)), ('i2b', a)),
|
2016-03-02 21:46:50 +00:00
|
|
|
(('fabs', ('b2f', a)), ('b2f', a)),
|
|
|
|
|
(('iabs', ('b2i', a)), ('b2i', a)),
|
2015-03-26 17:09:42 +00:00
|
|
|
|
2017-02-15 06:22:36 +00:00
|
|
|
# Packing and then unpacking does nothing
|
|
|
|
|
(('unpack_64_2x32_split_x', ('pack_64_2x32_split', a, b)), a),
|
|
|
|
|
(('unpack_64_2x32_split_y', ('pack_64_2x32_split', a, b)), b),
|
|
|
|
|
(('pack_64_2x32_split', ('unpack_64_2x32_split_x', a),
|
|
|
|
|
('unpack_64_2x32_split_y', a)), a),
|
|
|
|
|
|
nir: Recognize open-coded extract_u8.
Two shaders that appear in Unigine benchmarks (Heaven and Valley) unpack
three bytes from an integer and convert each into a float:
float((val >> 16u) & 0xffu)
float((val >> 8u) & 0xffu)
float((val >> 0u) & 0xffu)
Instead of shifting, masking, and type converting like this:
shr(8) g15<1>UD g25<8,8,1>UD 0x00000010UD
and(8) g16<1>UD g15<8,8,1>UD 0x000000ffUD
mov(8) g17<1>F g16<8,8,1>UD
shr(8) g18<1>UD g25<8,8,1>UD 0x00000008UD
and(8) g19<1>UD g18<8,8,1>UD 0x000000ffUD
mov(8) g20<1>F g19<8,8,1>UD
and(8) g21<1>UD g25<8,8,1>UD 0x000000ffUD
mov(8) g22<1>F g21<8,8,1>UD
i965 can simply extract a byte and convert to float in a single
instruction:
mov(8) g17<1>F g25.2<32,8,4>UB
mov(8) g20<1>F g25.1<32,8,4>UB
mov(8) g22<1>F g25.0<32,8,4>UB
This patch implements the first step: recognizing byte extraction. A
later patch will optimize out the conversion to float.
instructions in affected programs: 28568 -> 27450 (-3.91%)
helped: 7
cycles in affected programs: 210076 -> 203144 (-3.30%)
helped: 7
This patch decreases the number of instructions in the two Unigine
programs by:
#1721: 4520 -> 4374 instructions (-3.23%)
#1706: 3752 -> 3582 instructions (-4.53%)
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
2016-01-21 17:09:48 +00:00
|
|
|
# Byte extraction
|
|
|
|
|
(('ushr', a, 24), ('extract_u8', a, 3), '!options->lower_extract_byte'),
|
|
|
|
|
(('iand', 0xff, ('ushr', a, 16)), ('extract_u8', a, 2), '!options->lower_extract_byte'),
|
|
|
|
|
(('iand', 0xff, ('ushr', a, 8)), ('extract_u8', a, 1), '!options->lower_extract_byte'),
|
|
|
|
|
(('iand', 0xff, a), ('extract_u8', a, 0), '!options->lower_extract_byte'),
|
|
|
|
|
|
2016-02-03 22:28:31 +00:00
|
|
|
# Word extraction
|
|
|
|
|
(('ushr', a, 16), ('extract_u16', a, 1), '!options->lower_extract_word'),
|
|
|
|
|
(('iand', 0xffff, a), ('extract_u16', a, 0), '!options->lower_extract_word'),
|
|
|
|
|
|
2015-01-28 18:52:53 +00:00
|
|
|
# Subtracts
|
2016-03-17 18:31:48 +00:00
|
|
|
(('~fsub', a, ('fsub', 0.0, b)), ('fadd', a, b)),
|
2015-02-20 08:00:27 +00:00
|
|
|
(('isub', a, ('isub', 0, b)), ('iadd', a, b)),
|
2015-08-19 06:38:34 +01:00
|
|
|
(('ussub_4x8', a, 0), a),
|
|
|
|
|
(('ussub_4x8', a, ~0), 0),
|
2015-04-04 13:13:44 +01:00
|
|
|
(('fsub', a, b), ('fadd', a, ('fneg', b)), 'options->lower_sub'),
|
|
|
|
|
(('isub', a, b), ('iadd', a, ('ineg', b)), 'options->lower_sub'),
|
2015-01-28 18:52:53 +00:00
|
|
|
(('fneg', a), ('fsub', 0.0, a), 'options->lower_negate'),
|
|
|
|
|
(('ineg', a), ('isub', 0, a), 'options->lower_negate'),
|
2016-03-17 18:31:48 +00:00
|
|
|
(('~fadd', a, ('fsub', 0.0, b)), ('fsub', a, b)),
|
2015-01-28 18:52:53 +00:00
|
|
|
(('iadd', a, ('isub', 0, b)), ('isub', a, b)),
|
|
|
|
|
(('fabs', ('fsub', 0.0, a)), ('fabs', a)),
|
|
|
|
|
(('iabs', ('isub', 0, a)), ('iabs', a)),
|
2016-01-06 23:30:38 +00:00
|
|
|
|
2016-02-22 23:16:49 +00:00
|
|
|
# Propagate negation up multiplication chains
|
|
|
|
|
(('fmul', ('fneg', a), b), ('fneg', ('fmul', a, b))),
|
2016-03-31 03:18:16 +01:00
|
|
|
(('imul', ('ineg', a), b), ('ineg', ('imul', a, b))),
|
2016-02-22 23:16:49 +00:00
|
|
|
|
2017-01-12 02:10:55 +00:00
|
|
|
# Propagate constants up multiplication chains
|
|
|
|
|
(('~fmul(is_used_once)', ('fmul(is_used_once)', 'a(is_not_const)', 'b(is_not_const)'), '#c'), ('fmul', ('fmul', a, c), b)),
|
|
|
|
|
(('imul(is_used_once)', ('imul(is_used_once)', 'a(is_not_const)', 'b(is_not_const)'), '#c'), ('imul', ('imul', a, c), b)),
|
|
|
|
|
(('~fadd(is_used_once)', ('fadd(is_used_once)', 'a(is_not_const)', 'b(is_not_const)'), '#c'), ('fadd', ('fadd', a, c), b)),
|
|
|
|
|
(('iadd(is_used_once)', ('iadd(is_used_once)', 'a(is_not_const)', 'b(is_not_const)'), '#c'), ('iadd', ('iadd', a, c), b)),
|
|
|
|
|
|
2016-04-07 06:34:39 +01:00
|
|
|
# Reassociate constants in add/mul chains so they can be folded together.
|
2017-01-12 02:10:55 +00:00
|
|
|
# For now, we mostly only handle cases where the constants are separated by
|
2016-04-07 06:34:39 +01:00
|
|
|
# a single non-constant. We could do better eventually.
|
|
|
|
|
(('~fmul', '#a', ('fmul', b, '#c')), ('fmul', ('fmul', a, c), b)),
|
|
|
|
|
(('imul', '#a', ('imul', b, '#c')), ('imul', ('imul', a, c), b)),
|
2018-01-09 23:32:47 +00:00
|
|
|
(('~fadd', '#a', ('fadd', b, '#c')), ('fadd', ('fadd', a, c), b)),
|
|
|
|
|
(('~fadd', '#a', ('fneg', ('fadd', b, '#c'))), ('fadd', ('fadd', a, ('fneg', c)), ('fneg', b))),
|
2016-04-07 06:34:39 +01:00
|
|
|
(('iadd', '#a', ('iadd', b, '#c')), ('iadd', ('iadd', a, c), b)),
|
|
|
|
|
|
2017-06-30 23:48:19 +01:00
|
|
|
# By definition...
|
|
|
|
|
(('bcsel', ('ige', ('find_lsb', a), 0), ('find_lsb', a), -1), ('find_lsb', a)),
|
|
|
|
|
(('bcsel', ('ige', ('ifind_msb', a), 0), ('ifind_msb', a), -1), ('ifind_msb', a)),
|
|
|
|
|
(('bcsel', ('ige', ('ufind_msb', a), 0), ('ufind_msb', a), -1), ('ufind_msb', a)),
|
|
|
|
|
|
|
|
|
|
(('bcsel', ('ine', a, 0), ('find_lsb', a), -1), ('find_lsb', a)),
|
|
|
|
|
(('bcsel', ('ine', a, 0), ('ifind_msb', a), -1), ('ifind_msb', a)),
|
|
|
|
|
(('bcsel', ('ine', a, 0), ('ufind_msb', a), -1), ('ufind_msb', a)),
|
|
|
|
|
|
|
|
|
|
(('bcsel', ('ine', a, -1), ('ifind_msb', a), -1), ('ifind_msb', a)),
|
|
|
|
|
|
2016-01-06 23:30:38 +00:00
|
|
|
# Misc. lowering
|
2016-04-28 11:19:13 +01:00
|
|
|
(('fmod@32', a, b), ('fsub', a, ('fmul', b, ('ffloor', ('fdiv', a, b)))), 'options->lower_fmod32'),
|
|
|
|
|
(('fmod@64', a, b), ('fsub', a, ('fmul', b, ('ffloor', ('fdiv', a, b)))), 'options->lower_fmod64'),
|
|
|
|
|
(('frem', a, b), ('fsub', a, ('fmul', b, ('ftrunc', ('fdiv', a, b)))), 'options->lower_fmod32'),
|
2016-04-26 04:59:06 +01:00
|
|
|
(('uadd_carry@32', a, b), ('b2i', ('ult', ('iadd', a, b), a)), 'options->lower_uadd_carry'),
|
|
|
|
|
(('usub_borrow@32', a, b), ('b2i', ('ult', a, b)), 'options->lower_usub_borrow'),
|
2016-01-13 19:08:37 +00:00
|
|
|
|
|
|
|
|
(('bitfield_insert', 'base', 'insert', 'offset', 'bits'),
|
|
|
|
|
('bcsel', ('ilt', 31, 'bits'), 'insert',
|
|
|
|
|
('bfi', ('bfm', 'bits', 'offset'), 'insert', 'base')),
|
|
|
|
|
'options->lower_bitfield_insert'),
|
2016-01-13 19:09:11 +00:00
|
|
|
|
|
|
|
|
(('ibitfield_extract', 'value', 'offset', 'bits'),
|
|
|
|
|
('bcsel', ('ilt', 31, 'bits'), 'value',
|
|
|
|
|
('ibfe', 'value', 'offset', 'bits')),
|
|
|
|
|
'options->lower_bitfield_extract'),
|
|
|
|
|
|
|
|
|
|
(('ubitfield_extract', 'value', 'offset', 'bits'),
|
|
|
|
|
('bcsel', ('ult', 31, 'bits'), 'value',
|
|
|
|
|
('ubfe', 'value', 'offset', 'bits')),
|
|
|
|
|
'options->lower_bitfield_extract'),
|
2016-01-21 17:09:29 +00:00
|
|
|
|
nir: Shift count for shift opcodes is always 32-bits
Previously both sources were unsized. This caused problems when the
thing being shifted was 64-bit but the shift count was 32-bit. The
expectation in NIR is that all unsized sources (and destination) will
ultimately have the same size.
The changes in nir_opt_algebraic.py are to prevent errors like:
Failed to parse transformation:
03:12:25 (('extract_i8', 'a', 'b'), ('ishr', ('ishl', 'a', ('imul', ('isub', 3, 'b'), 8)), 24), 'options->lower_extract_byte')
03:12:25 Traceback (most recent call last):
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 610, in __init__
03:12:25 xform = SearchAndReplace(xform)
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 495, in __init__
03:12:25 BitSizeValidator(varset).validate(self.search, self.replace)
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 311, in validate
03:12:25 validate_dst_class = self._validate_bit_class_up(replace)
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 414, in _validate_bit_class_up
03:12:25 src_class = self._validate_bit_class_up(val.sources[i])
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 420, in _validate_bit_class_up
03:12:25 assert src_class == src_type_bits
03:12:25 AssertionError
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Suggested-by: Connor Abbott <cwabbott0@gmail.com>
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
Cc: Jason Ekstrand <jason@jlekstrand.net>
2016-10-27 11:02:58 +01:00
|
|
|
(('extract_i8', a, 'b@32'),
|
2016-01-21 17:09:29 +00:00
|
|
|
('ishr', ('ishl', a, ('imul', ('isub', 3, b), 8)), 24),
|
|
|
|
|
'options->lower_extract_byte'),
|
|
|
|
|
|
nir: Shift count for shift opcodes is always 32-bits
Previously both sources were unsized. This caused problems when the
thing being shifted was 64-bit but the shift count was 32-bit. The
expectation in NIR is that all unsized sources (and destination) will
ultimately have the same size.
The changes in nir_opt_algebraic.py are to prevent errors like:
Failed to parse transformation:
03:12:25 (('extract_i8', 'a', 'b'), ('ishr', ('ishl', 'a', ('imul', ('isub', 3, 'b'), 8)), 24), 'options->lower_extract_byte')
03:12:25 Traceback (most recent call last):
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 610, in __init__
03:12:25 xform = SearchAndReplace(xform)
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 495, in __init__
03:12:25 BitSizeValidator(varset).validate(self.search, self.replace)
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 311, in validate
03:12:25 validate_dst_class = self._validate_bit_class_up(replace)
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 414, in _validate_bit_class_up
03:12:25 src_class = self._validate_bit_class_up(val.sources[i])
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 420, in _validate_bit_class_up
03:12:25 assert src_class == src_type_bits
03:12:25 AssertionError
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Suggested-by: Connor Abbott <cwabbott0@gmail.com>
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
Cc: Jason Ekstrand <jason@jlekstrand.net>
2016-10-27 11:02:58 +01:00
|
|
|
(('extract_u8', a, 'b@32'),
|
2016-01-21 17:09:29 +00:00
|
|
|
('iand', ('ushr', a, ('imul', b, 8)), 0xff),
|
|
|
|
|
'options->lower_extract_byte'),
|
|
|
|
|
|
nir: Shift count for shift opcodes is always 32-bits
Previously both sources were unsized. This caused problems when the
thing being shifted was 64-bit but the shift count was 32-bit. The
expectation in NIR is that all unsized sources (and destination) will
ultimately have the same size.
The changes in nir_opt_algebraic.py are to prevent errors like:
Failed to parse transformation:
03:12:25 (('extract_i8', 'a', 'b'), ('ishr', ('ishl', 'a', ('imul', ('isub', 3, 'b'), 8)), 24), 'options->lower_extract_byte')
03:12:25 Traceback (most recent call last):
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 610, in __init__
03:12:25 xform = SearchAndReplace(xform)
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 495, in __init__
03:12:25 BitSizeValidator(varset).validate(self.search, self.replace)
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 311, in validate
03:12:25 validate_dst_class = self._validate_bit_class_up(replace)
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 414, in _validate_bit_class_up
03:12:25 src_class = self._validate_bit_class_up(val.sources[i])
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 420, in _validate_bit_class_up
03:12:25 assert src_class == src_type_bits
03:12:25 AssertionError
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Suggested-by: Connor Abbott <cwabbott0@gmail.com>
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
Cc: Jason Ekstrand <jason@jlekstrand.net>
2016-10-27 11:02:58 +01:00
|
|
|
(('extract_i16', a, 'b@32'),
|
2016-01-21 17:09:29 +00:00
|
|
|
('ishr', ('ishl', a, ('imul', ('isub', 1, b), 16)), 16),
|
|
|
|
|
'options->lower_extract_word'),
|
|
|
|
|
|
nir: Shift count for shift opcodes is always 32-bits
Previously both sources were unsized. This caused problems when the
thing being shifted was 64-bit but the shift count was 32-bit. The
expectation in NIR is that all unsized sources (and destination) will
ultimately have the same size.
The changes in nir_opt_algebraic.py are to prevent errors like:
Failed to parse transformation:
03:12:25 (('extract_i8', 'a', 'b'), ('ishr', ('ishl', 'a', ('imul', ('isub', 3, 'b'), 8)), 24), 'options->lower_extract_byte')
03:12:25 Traceback (most recent call last):
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 610, in __init__
03:12:25 xform = SearchAndReplace(xform)
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 495, in __init__
03:12:25 BitSizeValidator(varset).validate(self.search, self.replace)
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 311, in validate
03:12:25 validate_dst_class = self._validate_bit_class_up(replace)
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 414, in _validate_bit_class_up
03:12:25 src_class = self._validate_bit_class_up(val.sources[i])
03:12:25 File "/home/jenkins/workspace/Leeroy_2/repos/mesa/src/compiler/nir/nir_algebraic.py", line 420, in _validate_bit_class_up
03:12:25 assert src_class == src_type_bits
03:12:25 AssertionError
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Suggested-by: Connor Abbott <cwabbott0@gmail.com>
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
Cc: Jason Ekstrand <jason@jlekstrand.net>
2016-10-27 11:02:58 +01:00
|
|
|
(('extract_u16', a, 'b@32'),
|
2016-01-21 17:09:29 +00:00
|
|
|
('iand', ('ushr', a, ('imul', b, 16)), 0xffff),
|
|
|
|
|
'options->lower_extract_word'),
|
2016-01-25 19:05:52 +00:00
|
|
|
|
|
|
|
|
(('pack_unorm_2x16', 'v'),
|
|
|
|
|
('pack_uvec2_to_uint',
|
2017-03-08 03:54:37 +00:00
|
|
|
('f2u32', ('fround_even', ('fmul', ('fsat', 'v'), 65535.0)))),
|
2016-01-25 19:05:52 +00:00
|
|
|
'options->lower_pack_unorm_2x16'),
|
|
|
|
|
|
|
|
|
|
(('pack_unorm_4x8', 'v'),
|
|
|
|
|
('pack_uvec4_to_uint',
|
2017-03-08 03:54:37 +00:00
|
|
|
('f2u32', ('fround_even', ('fmul', ('fsat', 'v'), 255.0)))),
|
2016-01-25 19:05:52 +00:00
|
|
|
'options->lower_pack_unorm_4x8'),
|
|
|
|
|
|
|
|
|
|
(('pack_snorm_2x16', 'v'),
|
|
|
|
|
('pack_uvec2_to_uint',
|
2017-03-08 03:54:37 +00:00
|
|
|
('f2i32', ('fround_even', ('fmul', ('fmin', 1.0, ('fmax', -1.0, 'v')), 32767.0)))),
|
2016-01-25 19:05:52 +00:00
|
|
|
'options->lower_pack_snorm_2x16'),
|
|
|
|
|
|
|
|
|
|
(('pack_snorm_4x8', 'v'),
|
|
|
|
|
('pack_uvec4_to_uint',
|
2017-03-08 03:54:37 +00:00
|
|
|
('f2i32', ('fround_even', ('fmul', ('fmin', 1.0, ('fmax', -1.0, 'v')), 127.0)))),
|
2016-01-25 19:05:52 +00:00
|
|
|
'options->lower_pack_snorm_4x8'),
|
2016-01-25 19:07:02 +00:00
|
|
|
|
|
|
|
|
(('unpack_unorm_2x16', 'v'),
|
2017-03-08 03:54:37 +00:00
|
|
|
('fdiv', ('u2f32', ('vec2', ('extract_u16', 'v', 0),
|
|
|
|
|
('extract_u16', 'v', 1))),
|
2016-01-25 19:07:02 +00:00
|
|
|
65535.0),
|
|
|
|
|
'options->lower_unpack_unorm_2x16'),
|
|
|
|
|
|
|
|
|
|
(('unpack_unorm_4x8', 'v'),
|
2017-03-08 03:54:37 +00:00
|
|
|
('fdiv', ('u2f32', ('vec4', ('extract_u8', 'v', 0),
|
|
|
|
|
('extract_u8', 'v', 1),
|
|
|
|
|
('extract_u8', 'v', 2),
|
|
|
|
|
('extract_u8', 'v', 3))),
|
2016-01-25 19:07:02 +00:00
|
|
|
255.0),
|
|
|
|
|
'options->lower_unpack_unorm_4x8'),
|
|
|
|
|
|
|
|
|
|
(('unpack_snorm_2x16', 'v'),
|
2017-03-08 03:54:37 +00:00
|
|
|
('fmin', 1.0, ('fmax', -1.0, ('fdiv', ('i2f32', ('vec2', ('extract_i16', 'v', 0),
|
|
|
|
|
('extract_i16', 'v', 1))),
|
2016-01-25 19:07:02 +00:00
|
|
|
32767.0))),
|
|
|
|
|
'options->lower_unpack_snorm_2x16'),
|
|
|
|
|
|
|
|
|
|
(('unpack_snorm_4x8', 'v'),
|
2017-03-08 03:54:37 +00:00
|
|
|
('fmin', 1.0, ('fmax', -1.0, ('fdiv', ('i2f32', ('vec4', ('extract_i8', 'v', 0),
|
|
|
|
|
('extract_i8', 'v', 1),
|
|
|
|
|
('extract_i8', 'v', 2),
|
|
|
|
|
('extract_i8', 'v', 3))),
|
2016-01-25 19:07:02 +00:00
|
|
|
127.0))),
|
|
|
|
|
'options->lower_unpack_snorm_4x8'),
|
2014-12-12 19:13:10 +00:00
|
|
|
]
|
|
|
|
|
|
2016-04-27 19:18:04 +01:00
|
|
|
def fexp2i(exp, bits):
|
|
|
|
|
# We assume that exp is already in the right range.
|
|
|
|
|
if bits == 32:
|
|
|
|
|
return ('ishl', ('iadd', exp, 127), 23)
|
|
|
|
|
elif bits == 64:
|
2017-02-15 06:15:16 +00:00
|
|
|
return ('pack_64_2x32_split', 0, ('ishl', ('iadd', exp, 1023), 20))
|
2016-04-27 19:18:04 +01:00
|
|
|
else:
|
|
|
|
|
assert False
|
|
|
|
|
|
|
|
|
|
def ldexp(f, exp, bits):
|
2016-03-25 19:12:38 +00:00
|
|
|
# First, we clamp exp to a reasonable range. The maximum possible range
|
|
|
|
|
# for a normal exponent is [-126, 127] and, throwing in denormals, you get
|
|
|
|
|
# a maximum range of [-149, 127]. This means that we can potentially have
|
|
|
|
|
# a swing of +-276. If you start with FLT_MAX, you actually have to do
|
|
|
|
|
# ldexp(FLT_MAX, -278) to get it to flush all the way to zero. The GLSL
|
|
|
|
|
# spec, on the other hand, only requires that we handle an exponent value
|
|
|
|
|
# in the range [-126, 128]. This implementation is *mostly* correct; it
|
|
|
|
|
# handles a range on exp of [-252, 254] which allows you to create any
|
|
|
|
|
# value (including denorms if the hardware supports it) and to adjust the
|
|
|
|
|
# exponent of any normal value to anything you want.
|
2016-04-27 19:18:04 +01:00
|
|
|
if bits == 32:
|
|
|
|
|
exp = ('imin', ('imax', exp, -252), 254)
|
|
|
|
|
elif bits == 64:
|
|
|
|
|
exp = ('imin', ('imax', exp, -2044), 2046)
|
|
|
|
|
else:
|
|
|
|
|
assert False
|
2016-03-25 19:12:38 +00:00
|
|
|
|
|
|
|
|
# Now we compute two powers of 2, one for exp/2 and one for exp-exp/2.
|
|
|
|
|
# (We use ishr which isn't the same for -1, but the -1 case still works
|
|
|
|
|
# since we use exp-exp/2 as the second exponent.) While the spec
|
|
|
|
|
# technically defines ldexp as f * 2.0^exp, simply multiplying once doesn't
|
|
|
|
|
# work with denormals and doesn't allow for the full swing in exponents
|
|
|
|
|
# that you can get with normalized values. Instead, we create two powers
|
|
|
|
|
# of two and multiply by them each in turn. That way the effective range
|
|
|
|
|
# of our exponent is doubled.
|
2016-04-27 19:18:04 +01:00
|
|
|
pow2_1 = fexp2i(('ishr', exp, 1), bits)
|
|
|
|
|
pow2_2 = fexp2i(('isub', exp, ('ishr', exp, 1)), bits)
|
2016-03-25 19:12:38 +00:00
|
|
|
return ('fmul', ('fmul', f, pow2_1), pow2_2)
|
|
|
|
|
|
2016-04-27 19:18:04 +01:00
|
|
|
optimizations += [
|
2018-02-27 08:19:21 +00:00
|
|
|
(('ldexp@32', 'x', 'exp'), ldexp('x', 'exp', 32), 'options->lower_ldexp'),
|
|
|
|
|
(('ldexp@64', 'x', 'exp'), ldexp('x', 'exp', 64), 'options->lower_ldexp'),
|
2016-04-27 19:18:04 +01:00
|
|
|
]
|
2016-03-25 19:12:38 +00:00
|
|
|
|
2016-02-02 00:44:18 +00:00
|
|
|
# Unreal Engine 4 demo applications open-codes bitfieldReverse()
|
|
|
|
|
def bitfield_reverse(u):
|
|
|
|
|
step1 = ('ior', ('ishl', u, 16), ('ushr', u, 16))
|
|
|
|
|
step2 = ('ior', ('ishl', ('iand', step1, 0x00ff00ff), 8), ('ushr', ('iand', step1, 0xff00ff00), 8))
|
|
|
|
|
step3 = ('ior', ('ishl', ('iand', step2, 0x0f0f0f0f), 4), ('ushr', ('iand', step2, 0xf0f0f0f0), 4))
|
|
|
|
|
step4 = ('ior', ('ishl', ('iand', step3, 0x33333333), 2), ('ushr', ('iand', step3, 0xcccccccc), 2))
|
|
|
|
|
step5 = ('ior', ('ishl', ('iand', step4, 0x55555555), 1), ('ushr', ('iand', step4, 0xaaaaaaaa), 1))
|
|
|
|
|
|
|
|
|
|
return step5
|
|
|
|
|
|
2016-04-26 04:59:06 +01:00
|
|
|
optimizations += [(bitfield_reverse('x@32'), ('bitfield_reverse', 'x'))]
|
2016-02-02 00:44:18 +00:00
|
|
|
|
2016-12-20 05:29:51 +00:00
|
|
|
# For any float comparison operation, "cmp", if you have "a == a && a cmp b"
|
|
|
|
|
# then the "a == a" is redundant because it's equivalent to "a is not NaN"
|
|
|
|
|
# and, if a is a NaN then the second comparison will fail anyway.
|
|
|
|
|
for op in ['flt', 'fge', 'feq']:
|
|
|
|
|
optimizations += [
|
|
|
|
|
(('iand', ('feq', a, a), (op, a, b)), (op, a, b)),
|
|
|
|
|
(('iand', ('feq', a, a), (op, b, a)), (op, b, a)),
|
|
|
|
|
]
|
2016-02-02 00:44:18 +00:00
|
|
|
|
2015-01-29 00:53:51 +00:00
|
|
|
# Add optimizations to handle the case where the result of a ternary is
|
|
|
|
|
# compared to a constant. This way we can take things like
|
|
|
|
|
#
|
|
|
|
|
# (a ? 0 : 1) > 0
|
|
|
|
|
#
|
|
|
|
|
# and turn it into
|
|
|
|
|
#
|
|
|
|
|
# a ? (0 > 0) : (1 > 0)
|
|
|
|
|
#
|
|
|
|
|
# which constant folding will eat for lunch. The resulting ternary will
|
|
|
|
|
# further get cleaned up by the boolean reductions above and we will be
|
|
|
|
|
# left with just the original variable "a".
|
|
|
|
|
for op in ['flt', 'fge', 'feq', 'fne',
|
|
|
|
|
'ilt', 'ige', 'ieq', 'ine', 'ult', 'uge']:
|
|
|
|
|
optimizations += [
|
|
|
|
|
((op, ('bcsel', 'a', '#b', '#c'), '#d'),
|
|
|
|
|
('bcsel', 'a', (op, 'b', 'd'), (op, 'c', 'd'))),
|
|
|
|
|
((op, '#d', ('bcsel', a, '#b', '#c')),
|
|
|
|
|
('bcsel', 'a', (op, 'd', 'b'), (op, 'd', 'c'))),
|
|
|
|
|
]
|
|
|
|
|
|
2016-03-02 23:39:09 +00:00
|
|
|
|
|
|
|
|
# For example, this converts things like
|
|
|
|
|
#
|
|
|
|
|
# 1 + mix(0, a - 1, condition)
|
|
|
|
|
#
|
|
|
|
|
# into
|
|
|
|
|
#
|
|
|
|
|
# mix(1, (a-1)+1, condition)
|
|
|
|
|
#
|
|
|
|
|
# Other optimizations will rearrange the constants.
|
|
|
|
|
for op in ['fadd', 'fmul', 'iadd', 'imul']:
|
|
|
|
|
optimizations += [
|
|
|
|
|
((op, ('bcsel(is_used_once)', a, '#b', c), '#d'), ('bcsel', a, (op, b, d), (op, c, d)))
|
|
|
|
|
]
|
|
|
|
|
|
2017-01-13 06:25:11 +00:00
|
|
|
# This section contains "late" optimizations that should be run before
|
|
|
|
|
# creating ffmas and calling regular optimizations for the final time.
|
|
|
|
|
# Optimizations should go here if they help code generation and conflict
|
|
|
|
|
# with the regular optimizations.
|
|
|
|
|
before_ffma_optimizations = [
|
|
|
|
|
# Propagate constants down multiplication chains
|
|
|
|
|
(('~fmul(is_used_once)', ('fmul(is_used_once)', 'a(is_not_const)', '#b'), 'c(is_not_const)'), ('fmul', ('fmul', a, c), b)),
|
|
|
|
|
(('imul(is_used_once)', ('imul(is_used_once)', 'a(is_not_const)', '#b'), 'c(is_not_const)'), ('imul', ('imul', a, c), b)),
|
|
|
|
|
(('~fadd(is_used_once)', ('fadd(is_used_once)', 'a(is_not_const)', '#b'), 'c(is_not_const)'), ('fadd', ('fadd', a, c), b)),
|
|
|
|
|
(('iadd(is_used_once)', ('iadd(is_used_once)', 'a(is_not_const)', '#b'), 'c(is_not_const)'), ('iadd', ('iadd', a, c), b)),
|
|
|
|
|
|
|
|
|
|
(('~fadd', ('fmul', a, b), ('fmul', a, c)), ('fmul', a, ('fadd', b, c))),
|
|
|
|
|
(('iadd', ('imul', a, b), ('imul', a, c)), ('imul', a, ('iadd', b, c))),
|
|
|
|
|
(('~fadd', ('fneg', a), a), 0.0),
|
|
|
|
|
(('iadd', ('ineg', a), a), 0),
|
|
|
|
|
(('iadd', ('ineg', a), ('iadd', a, b)), b),
|
|
|
|
|
(('iadd', a, ('iadd', ('ineg', a), b)), b),
|
|
|
|
|
(('~fadd', ('fneg', a), ('fadd', a, b)), b),
|
|
|
|
|
(('~fadd', a, ('fadd', ('fneg', a), b)), b),
|
|
|
|
|
]
|
|
|
|
|
|
2015-03-24 00:11:49 +00:00
|
|
|
# This section contains "late" optimizations that should be run after the
|
|
|
|
|
# regular optimizations have finished. Optimizations should go here if
|
|
|
|
|
# they help code generation but do not necessarily produce code that is
|
|
|
|
|
# more easily optimizable.
|
|
|
|
|
late_optimizations = [
|
2016-03-17 18:31:48 +00:00
|
|
|
# Most of these optimizations aren't quite safe when you get infinity or
|
|
|
|
|
# Nan involved but the first one should be fine.
|
2018-01-09 23:32:47 +00:00
|
|
|
(('flt', ('fadd', a, b), 0.0), ('flt', a, ('fneg', b))),
|
|
|
|
|
(('flt', ('fneg', ('fadd', a, b)), 0.0), ('flt', ('fneg', a), b)),
|
|
|
|
|
(('~fge', ('fadd', a, b), 0.0), ('fge', a, ('fneg', b))),
|
|
|
|
|
(('~fge', ('fneg', ('fadd', a, b)), 0.0), ('fge', ('fneg', a), b)),
|
2016-03-17 18:31:48 +00:00
|
|
|
(('~feq', ('fadd', a, b), 0.0), ('feq', a, ('fneg', b))),
|
|
|
|
|
(('~fne', ('fadd', a, b), 0.0), ('fne', a, ('fneg', b))),
|
|
|
|
|
|
2018-01-11 22:14:25 +00:00
|
|
|
(('~fge', ('fmin(is_used_once)', ('fadd(is_used_once)', a, b), ('fadd', c, d)), 0.0), ('iand', ('fge', a, ('fneg', b)), ('fge', c, ('fneg', d)))),
|
|
|
|
|
|
2015-09-10 18:51:46 +01:00
|
|
|
(('fdot2', a, b), ('fdot_replicated2', a, b), 'options->fdot_replicates'),
|
|
|
|
|
(('fdot3', a, b), ('fdot_replicated3', a, b), 'options->fdot_replicates'),
|
|
|
|
|
(('fdot4', a, b), ('fdot_replicated4', a, b), 'options->fdot_replicates'),
|
2015-09-23 00:54:27 +01:00
|
|
|
(('fdph', a, b), ('fdph_replicated', a, b), 'options->fdot_replicates'),
|
2017-01-03 11:54:48 +00:00
|
|
|
|
|
|
|
|
(('b2f(is_used_more_than_once)', ('inot', a)), ('bcsel', a, 0.0, 1.0)),
|
|
|
|
|
(('fneg(is_used_more_than_once)', ('b2f', ('inot', a))), ('bcsel', a, -0.0, -1.0)),
|
2017-01-12 10:51:56 +00:00
|
|
|
|
|
|
|
|
# we do these late so that we don't get in the way of creating ffmas
|
|
|
|
|
(('fmin', ('fadd(is_used_once)', '#c', a), ('fadd(is_used_once)', '#c', b)), ('fadd', c, ('fmin', a, b))),
|
|
|
|
|
(('fmax', ('fadd(is_used_once)', '#c', a), ('fadd(is_used_once)', '#c', b)), ('fadd', c, ('fmax', a, b))),
|
2015-03-24 00:11:49 +00:00
|
|
|
]
|
|
|
|
|
|
2014-12-12 19:13:10 +00:00
|
|
|
print nir_algebraic.AlgebraicPass("nir_opt_algebraic", optimizations).render()
|
2017-01-13 06:25:11 +00:00
|
|
|
print nir_algebraic.AlgebraicPass("nir_opt_algebraic_before_ffma",
|
|
|
|
|
before_ffma_optimizations).render()
|
2015-03-24 00:11:49 +00:00
|
|
|
print nir_algebraic.AlgebraicPass("nir_opt_algebraic_late",
|
|
|
|
|
late_optimizations).render()
|
