2020-01-22 19:59:56 +00:00
|
|
|
/*
|
|
|
|
|
* Copyright © 2020 Valve 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.
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
#include "helpers.h"
|
|
|
|
|
|
|
|
|
|
using namespace aco;
|
|
|
|
|
|
|
|
|
|
BEGIN_TEST(optimize.neg)
|
|
|
|
|
for (unsigned i = GFX9; i <= GFX10; i++) {
|
|
|
|
|
//>> v1: %a, v1: %b, s1: %c, s1: %d, s2: %_:exec = p_startpgm
|
|
|
|
|
if (!setup_cs("v1 v1 s1 s1", (chip_class)i))
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
//! v1: %res0 = v_mul_f32 %a, -%b
|
|
|
|
|
//! p_unit_test 0, %res0
|
|
|
|
|
Temp neg_b = bld.vop2(aco_opcode::v_xor_b32, bld.def(v1), Operand(0x80000000u), inputs[1]);
|
|
|
|
|
writeout(0, bld.vop2(aco_opcode::v_mul_f32, bld.def(v1), inputs[0], neg_b));
|
|
|
|
|
|
|
|
|
|
//! v1: %neg_a = v_xor_b32 0x80000000, %a
|
|
|
|
|
//~gfx[6-9]! v1: %res1 = v_mul_f32 0x123456, %neg_a
|
|
|
|
|
//~gfx10! v1: %res1 = v_mul_f32 0x123456, -%a
|
|
|
|
|
//! p_unit_test 1, %res1
|
|
|
|
|
Temp neg_a = bld.vop2(aco_opcode::v_xor_b32, bld.def(v1), Operand(0x80000000u), inputs[0]);
|
|
|
|
|
writeout(1, bld.vop2(aco_opcode::v_mul_f32, bld.def(v1), Operand(0x123456u), neg_a));
|
|
|
|
|
|
|
|
|
|
//! v1: %res2 = v_mul_f32 %a, %b
|
|
|
|
|
//! p_unit_test 2, %res2
|
|
|
|
|
Temp neg_neg_a = bld.vop2(aco_opcode::v_xor_b32, bld.def(v1), Operand(0x80000000u), neg_a);
|
|
|
|
|
writeout(2, bld.vop2(aco_opcode::v_mul_f32, bld.def(v1), neg_neg_a, inputs[1]));
|
|
|
|
|
|
|
|
|
|
/* we could optimize this case into just an abs(), but NIR already does this */
|
|
|
|
|
//! v1: %res3 = v_mul_f32 |%neg_a|, %b
|
|
|
|
|
//! p_unit_test 3, %res3
|
|
|
|
|
Temp abs_neg_a = bld.vop2(aco_opcode::v_and_b32, bld.def(v1), Operand(0x7FFFFFFFu), neg_a);
|
|
|
|
|
writeout(3, bld.vop2(aco_opcode::v_mul_f32, bld.def(v1), abs_neg_a, inputs[1]));
|
|
|
|
|
|
|
|
|
|
//! v1: %res4 = v_mul_f32 -|%a|, %b
|
|
|
|
|
//! p_unit_test 4, %res4
|
|
|
|
|
Temp abs_a = bld.vop2(aco_opcode::v_and_b32, bld.def(v1), Operand(0x7FFFFFFFu), inputs[0]);
|
|
|
|
|
Temp neg_abs_a = bld.vop2(aco_opcode::v_xor_b32, bld.def(v1), Operand(0x80000000u), abs_a);
|
|
|
|
|
writeout(4, bld.vop2(aco_opcode::v_mul_f32, bld.def(v1), neg_abs_a, inputs[1]));
|
|
|
|
|
|
|
|
|
|
//! v1: %res5 = v_mul_f32 -%a, %b row_shl:1 bound_ctrl:1
|
|
|
|
|
//! p_unit_test 5, %res5
|
|
|
|
|
writeout(5, bld.vop2_dpp(aco_opcode::v_mul_f32, bld.def(v1), neg_a, inputs[1], dpp_row_sl(1)));
|
|
|
|
|
|
|
|
|
|
//! v1: %res6 = v_subrev_f32 %a, %b
|
|
|
|
|
//! p_unit_test 6, %res6
|
|
|
|
|
writeout(6, bld.vop2(aco_opcode::v_add_f32, bld.def(v1), neg_a, inputs[1]));
|
|
|
|
|
|
|
|
|
|
//! v1: %res7 = v_sub_f32 %b, %a
|
|
|
|
|
//! p_unit_test 7, %res7
|
|
|
|
|
writeout(7, bld.vop2(aco_opcode::v_add_f32, bld.def(v1), inputs[1], neg_a));
|
|
|
|
|
|
|
|
|
|
//! v1: %res8 = v_mul_f32 %a, -%c
|
|
|
|
|
//! p_unit_test 8, %res8
|
|
|
|
|
Temp neg_c = bld.vop2(aco_opcode::v_xor_b32, bld.def(v1), Operand(0x80000000u), bld.copy(bld.def(v1), inputs[2]));
|
|
|
|
|
writeout(8, bld.vop2(aco_opcode::v_mul_f32, bld.def(v1), inputs[0], neg_c));
|
|
|
|
|
|
|
|
|
|
finish_opt_test();
|
|
|
|
|
}
|
|
|
|
|
END_TEST
|
aco: optimize v_and(a, v_subbrev_co(0, 0, vcc)) -> v_cndmask(0, a, vcc)
fossils-db (Vega10):
Totals from 7786 (5.70% of 136546) affected shaders:
SGPRs: 517778 -> 518626 (+0.16%); split: -0.01%, +0.17%
VGPRs: 488252 -> 488084 (-0.03%); split: -0.04%, +0.01%
CodeSize: 42282068 -> 42250152 (-0.08%); split: -0.16%, +0.09%
MaxWaves: 35697 -> 35716 (+0.05%); split: +0.06%, -0.01%
Instrs: 8319309 -> 8304792 (-0.17%); split: -0.18%, +0.00%
Cycles: 88619440 -> 88489636 (-0.15%); split: -0.16%, +0.01%
VMEM: 2788278 -> 2780431 (-0.28%); split: +0.06%, -0.35%
SMEM: 570364 -> 569370 (-0.17%); split: +0.12%, -0.30%
VClause: 144906 -> 144908 (+0.00%); split: -0.05%, +0.05%
SClause: 302143 -> 302055 (-0.03%); split: -0.04%, +0.01%
Copies: 579124 -> 578779 (-0.06%); split: -0.14%, +0.08%
PreSGPRs: 327695 -> 328845 (+0.35%); split: -0.00%, +0.35%
PreVGPRs: 434280 -> 433954 (-0.08%)
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7438>
2020-11-03 18:50:32 +01:00
|
|
|
|
|
|
|
|
Temp create_subbrev_co(Operand op0, Operand op1, Operand op2)
|
|
|
|
|
{
|
|
|
|
|
return bld.vop2_e64(aco_opcode::v_subbrev_co_u32, bld.def(v1), bld.hint_vcc(bld.def(bld.lm)), op0, op1, op2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BEGIN_TEST(optimize.cndmask)
|
|
|
|
|
for (unsigned i = GFX9; i <= GFX10; i++) {
|
|
|
|
|
//>> v1: %a, s1: %b, s2: %c, s2: %_:exec = p_startpgm
|
|
|
|
|
if (!setup_cs("v1 s1 s2", (chip_class)i))
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
Temp subbrev;
|
|
|
|
|
|
|
|
|
|
//! v1: %res0 = v_cndmask_b32 0, %a, %c
|
|
|
|
|
//! p_unit_test 0, %res0
|
|
|
|
|
subbrev = create_subbrev_co(Operand(0u), Operand(0u), Operand(inputs[2]));
|
|
|
|
|
writeout(0, bld.vop2(aco_opcode::v_and_b32, bld.def(v1), inputs[0], subbrev));
|
|
|
|
|
|
|
|
|
|
//! v1: %res1 = v_cndmask_b32 0, 42, %c
|
|
|
|
|
//! p_unit_test 1, %res1
|
|
|
|
|
subbrev = create_subbrev_co(Operand(0u), Operand(0u), Operand(inputs[2]));
|
|
|
|
|
writeout(1, bld.vop2(aco_opcode::v_and_b32, bld.def(v1), Operand(42u), subbrev));
|
|
|
|
|
|
|
|
|
|
//~gfx9! v1: %subbrev, s2: %_ = v_subbrev_co_u32 0, 0, %c
|
|
|
|
|
//~gfx9! v1: %res2 = v_and_b32 %b, %subbrev
|
|
|
|
|
//~gfx10! v1: %res2 = v_cndmask_b32 0, %b, %c
|
|
|
|
|
//! p_unit_test 2, %res2
|
|
|
|
|
subbrev = create_subbrev_co(Operand(0u), Operand(0u), Operand(inputs[2]));
|
|
|
|
|
writeout(2, bld.vop2(aco_opcode::v_and_b32, bld.def(v1), inputs[1], subbrev));
|
|
|
|
|
|
|
|
|
|
//! v1: %subbrev1, s2: %_ = v_subbrev_co_u32 0, 0, %c
|
|
|
|
|
//! v1: %xor = v_xor_b32 %a, %subbrev1
|
|
|
|
|
//! v1: %res3 = v_cndmask_b32 0, %xor, %c
|
|
|
|
|
//! p_unit_test 3, %res3
|
|
|
|
|
subbrev = create_subbrev_co(Operand(0u), Operand(0u), Operand(inputs[2]));
|
|
|
|
|
Temp xor_a = bld.vop2(aco_opcode::v_xor_b32, bld.def(v1), inputs[0], subbrev);
|
|
|
|
|
writeout(3, bld.vop2(aco_opcode::v_and_b32, bld.def(v1), xor_a, subbrev));
|
|
|
|
|
|
|
|
|
|
finish_opt_test();
|
|
|
|
|
}
|
|
|
|
|
END_TEST
|