2016-11-28 10:48:53 -08:00
|
|
|
/*
|
|
|
|
|
* Copyright © 2016 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.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
|
#include "brw_fs.h"
|
2023-11-21 09:58:55 -08:00
|
|
|
#include "brw_fs_builder.h"
|
2016-11-28 10:48:53 -08:00
|
|
|
#include "brw_cfg.h"
|
|
|
|
|
|
|
|
|
|
using namespace brw;
|
|
|
|
|
|
|
|
|
|
class copy_propagation_test : public ::testing::Test {
|
2023-11-20 22:51:03 -08:00
|
|
|
protected:
|
|
|
|
|
copy_propagation_test();
|
|
|
|
|
~copy_propagation_test() override;
|
2016-11-28 10:48:53 -08:00
|
|
|
|
|
|
|
|
struct brw_compiler *compiler;
|
2023-07-14 02:10:20 +03:00
|
|
|
struct brw_compile_params params;
|
2021-04-05 13:19:39 -07:00
|
|
|
struct intel_device_info *devinfo;
|
2021-02-10 16:43:08 +01:00
|
|
|
void *ctx;
|
2016-11-28 10:48:53 -08:00
|
|
|
struct brw_wm_prog_data *prog_data;
|
|
|
|
|
struct gl_shader_program *shader_prog;
|
|
|
|
|
fs_visitor *v;
|
2023-11-20 23:02:46 -08:00
|
|
|
fs_builder bld;
|
2016-11-28 10:48:53 -08:00
|
|
|
};
|
|
|
|
|
|
2023-11-20 22:51:03 -08:00
|
|
|
copy_propagation_test::copy_propagation_test()
|
2023-11-20 23:02:46 -08:00
|
|
|
: bld(NULL, 0)
|
2016-11-28 10:48:53 -08:00
|
|
|
{
|
2021-02-10 16:43:08 +01:00
|
|
|
ctx = ralloc_context(NULL);
|
|
|
|
|
compiler = rzalloc(ctx, struct brw_compiler);
|
2021-04-05 13:19:39 -07:00
|
|
|
devinfo = rzalloc(ctx, struct intel_device_info);
|
2016-11-28 10:48:53 -08:00
|
|
|
compiler->devinfo = devinfo;
|
|
|
|
|
|
2023-07-14 02:10:20 +03:00
|
|
|
params = {};
|
|
|
|
|
params.mem_ctx = ctx;
|
|
|
|
|
|
2021-02-10 16:43:08 +01:00
|
|
|
prog_data = ralloc(ctx, struct brw_wm_prog_data);
|
2016-11-28 10:48:53 -08:00
|
|
|
nir_shader *shader =
|
2021-02-10 16:43:08 +01:00
|
|
|
nir_shader_create(ctx, MESA_SHADER_FRAGMENT, NULL, NULL);
|
2016-11-28 10:48:53 -08:00
|
|
|
|
2025-01-17 09:25:29 -08:00
|
|
|
v = new fs_visitor(compiler, ¶ms, NULL, &prog_data->base, shader,
|
|
|
|
|
8, false, false);
|
2016-11-28 10:48:53 -08:00
|
|
|
|
2023-11-21 10:12:09 -08:00
|
|
|
bld = fs_builder(v).at_end();
|
2023-11-20 23:02:46 -08:00
|
|
|
|
2024-02-15 15:22:53 -08:00
|
|
|
devinfo->ver = 9;
|
2021-03-29 14:41:58 -07:00
|
|
|
devinfo->verx10 = devinfo->ver * 10;
|
2016-11-28 10:48:53 -08:00
|
|
|
}
|
|
|
|
|
|
2023-11-20 22:51:03 -08:00
|
|
|
copy_propagation_test::~copy_propagation_test()
|
2021-02-10 16:43:08 +01:00
|
|
|
{
|
|
|
|
|
delete v;
|
|
|
|
|
v = NULL;
|
|
|
|
|
|
|
|
|
|
ralloc_free(ctx);
|
|
|
|
|
ctx = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2016-11-28 10:48:53 -08:00
|
|
|
static fs_inst *
|
|
|
|
|
instruction(bblock_t *block, int num)
|
|
|
|
|
{
|
|
|
|
|
fs_inst *inst = (fs_inst *)block->start();
|
|
|
|
|
for (int i = 0; i < num; i++) {
|
|
|
|
|
inst = (fs_inst *)inst->next;
|
|
|
|
|
}
|
|
|
|
|
return inst;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool
|
|
|
|
|
copy_propagation(fs_visitor *v)
|
|
|
|
|
{
|
|
|
|
|
const bool print = getenv("TEST_DEBUG");
|
|
|
|
|
|
|
|
|
|
if (print) {
|
|
|
|
|
fprintf(stderr, "= Before =\n");
|
2020-03-06 13:34:13 -08:00
|
|
|
v->cfg->dump();
|
2016-11-28 10:48:53 -08:00
|
|
|
}
|
|
|
|
|
|
2024-12-06 11:37:57 -08:00
|
|
|
bool ret = brw_opt_copy_propagation(*v);
|
2016-11-28 10:48:53 -08:00
|
|
|
|
|
|
|
|
if (print) {
|
|
|
|
|
fprintf(stderr, "\n= After =\n");
|
2020-03-06 13:34:13 -08:00
|
|
|
v->cfg->dump();
|
2016-11-28 10:48:53 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TEST_F(copy_propagation_test, basic)
|
|
|
|
|
{
|
2024-06-18 23:42:59 -07:00
|
|
|
brw_reg vgrf0 = bld.vgrf(BRW_TYPE_F);
|
|
|
|
|
brw_reg vgrf1 = bld.vgrf(BRW_TYPE_F);
|
|
|
|
|
brw_reg vgrf2 = bld.vgrf(BRW_TYPE_F);
|
|
|
|
|
brw_reg vgrf3 = bld.vgrf(BRW_TYPE_F);
|
2016-11-28 10:48:53 -08:00
|
|
|
bld.MOV(vgrf0, vgrf2);
|
|
|
|
|
bld.ADD(vgrf1, vgrf0, vgrf3);
|
|
|
|
|
|
|
|
|
|
/* = Before =
|
|
|
|
|
*
|
|
|
|
|
* 0: mov(8) vgrf0 vgrf2
|
|
|
|
|
* 1: add(8) vgrf1 vgrf0 vgrf3
|
|
|
|
|
*
|
|
|
|
|
* = After =
|
|
|
|
|
* 0: mov(8) vgrf0 vgrf2
|
|
|
|
|
* 1: add(8) vgrf1 vgrf2 vgrf3
|
|
|
|
|
*/
|
|
|
|
|
|
2024-07-12 17:08:46 -07:00
|
|
|
brw_calculate_cfg(*v);
|
2016-11-28 10:48:53 -08:00
|
|
|
bblock_t *block0 = v->cfg->blocks[0];
|
|
|
|
|
|
|
|
|
|
EXPECT_EQ(0, block0->start_ip);
|
|
|
|
|
EXPECT_EQ(1, block0->end_ip);
|
|
|
|
|
|
|
|
|
|
EXPECT_TRUE(copy_propagation(v));
|
|
|
|
|
EXPECT_EQ(0, block0->start_ip);
|
|
|
|
|
EXPECT_EQ(1, block0->end_ip);
|
|
|
|
|
|
|
|
|
|
fs_inst *mov = instruction(block0, 0);
|
|
|
|
|
EXPECT_EQ(BRW_OPCODE_MOV, mov->opcode);
|
|
|
|
|
EXPECT_TRUE(mov->dst.equals(vgrf0));
|
|
|
|
|
EXPECT_TRUE(mov->src[0].equals(vgrf2));
|
|
|
|
|
|
|
|
|
|
fs_inst *add = instruction(block0, 1);
|
|
|
|
|
EXPECT_EQ(BRW_OPCODE_ADD, add->opcode);
|
|
|
|
|
EXPECT_TRUE(add->dst.equals(vgrf1));
|
|
|
|
|
EXPECT_TRUE(add->src[0].equals(vgrf2));
|
|
|
|
|
EXPECT_TRUE(add->src[1].equals(vgrf3));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TEST_F(copy_propagation_test, maxmax_sat_imm)
|
|
|
|
|
{
|
2024-06-18 23:42:59 -07:00
|
|
|
brw_reg vgrf0 = bld.vgrf(BRW_TYPE_F);
|
|
|
|
|
brw_reg vgrf1 = bld.vgrf(BRW_TYPE_F);
|
|
|
|
|
brw_reg vgrf2 = bld.vgrf(BRW_TYPE_F);
|
2016-11-28 10:48:53 -08:00
|
|
|
|
|
|
|
|
static const struct {
|
|
|
|
|
enum brw_conditional_mod conditional_mod;
|
|
|
|
|
float immediate;
|
|
|
|
|
bool expected_result;
|
|
|
|
|
} test[] = {
|
|
|
|
|
/* conditional mod, imm, expected_result */
|
2023-03-23 14:19:29 -07:00
|
|
|
{ BRW_CONDITIONAL_GE , 0.1f, false },
|
|
|
|
|
{ BRW_CONDITIONAL_L , 0.1f, false },
|
|
|
|
|
{ BRW_CONDITIONAL_GE , 0.5f, false },
|
|
|
|
|
{ BRW_CONDITIONAL_L , 0.5f, false },
|
|
|
|
|
{ BRW_CONDITIONAL_GE , 0.9f, false },
|
|
|
|
|
{ BRW_CONDITIONAL_L , 0.9f, false },
|
2016-11-28 10:48:53 -08:00
|
|
|
{ BRW_CONDITIONAL_GE , -1.5f, false },
|
|
|
|
|
{ BRW_CONDITIONAL_L , -1.5f, false },
|
|
|
|
|
{ BRW_CONDITIONAL_GE , 1.5f, false },
|
|
|
|
|
{ BRW_CONDITIONAL_L , 1.5f, false },
|
2016-11-28 15:21:51 -08:00
|
|
|
|
|
|
|
|
{ BRW_CONDITIONAL_NONE, 0.5f, false },
|
|
|
|
|
{ BRW_CONDITIONAL_Z , 0.5f, false },
|
|
|
|
|
{ BRW_CONDITIONAL_NZ , 0.5f, false },
|
|
|
|
|
{ BRW_CONDITIONAL_G , 0.5f, false },
|
|
|
|
|
{ BRW_CONDITIONAL_LE , 0.5f, false },
|
|
|
|
|
{ BRW_CONDITIONAL_R , 0.5f, false },
|
|
|
|
|
{ BRW_CONDITIONAL_O , 0.5f, false },
|
|
|
|
|
{ BRW_CONDITIONAL_U , 0.5f, false },
|
2016-11-28 10:48:53 -08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
for (unsigned i = 0; i < sizeof(test) / sizeof(test[0]); i++) {
|
|
|
|
|
fs_inst *mov = set_saturate(true, bld.MOV(vgrf0, vgrf1));
|
|
|
|
|
fs_inst *sel = set_condmod(test[i].conditional_mod,
|
|
|
|
|
bld.SEL(vgrf2, vgrf0,
|
|
|
|
|
brw_imm_f(test[i].immediate)));
|
|
|
|
|
|
2024-07-12 17:08:46 -07:00
|
|
|
brw_calculate_cfg(*v);
|
2016-11-28 10:48:53 -08:00
|
|
|
|
|
|
|
|
bblock_t *block0 = v->cfg->blocks[0];
|
|
|
|
|
|
|
|
|
|
EXPECT_EQ(0, block0->start_ip);
|
|
|
|
|
EXPECT_EQ(1, block0->end_ip);
|
|
|
|
|
|
|
|
|
|
EXPECT_EQ(test[i].expected_result, copy_propagation(v));
|
|
|
|
|
EXPECT_EQ(0, block0->start_ip);
|
|
|
|
|
EXPECT_EQ(1, block0->end_ip);
|
|
|
|
|
|
|
|
|
|
EXPECT_EQ(BRW_OPCODE_MOV, mov->opcode);
|
|
|
|
|
EXPECT_TRUE(mov->saturate);
|
|
|
|
|
EXPECT_TRUE(mov->dst.equals(vgrf0));
|
|
|
|
|
EXPECT_TRUE(mov->src[0].equals(vgrf1));
|
|
|
|
|
|
|
|
|
|
EXPECT_EQ(BRW_OPCODE_SEL, sel->opcode);
|
|
|
|
|
EXPECT_EQ(test[i].conditional_mod, sel->conditional_mod);
|
|
|
|
|
EXPECT_EQ(test[i].expected_result, sel->saturate);
|
|
|
|
|
EXPECT_TRUE(sel->dst.equals(vgrf2));
|
|
|
|
|
if (test[i].expected_result) {
|
|
|
|
|
EXPECT_TRUE(sel->src[0].equals(vgrf1));
|
|
|
|
|
} else {
|
|
|
|
|
EXPECT_TRUE(sel->src[0].equals(vgrf0));
|
|
|
|
|
}
|
|
|
|
|
EXPECT_TRUE(sel->src[1].equals(brw_imm_f(test[i].immediate)));
|
|
|
|
|
|
|
|
|
|
delete v->cfg;
|
|
|
|
|
v->cfg = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
intel/brw: Copy prop from raw integer moves with mismatched types
The specific pattern from the unit test was observed in ray tracing
trampoline shaders.
v2: Refactor the is_raw_move tests out to a utility function. Suggested
by Ken.
v3: Fix a regression caused by being too picky about source
modifiers. This was introduced somewhere between when I did initial
shader-db runs an v2.
v4: Fix typo in comment. Noticed by Caio.
shader-db:
All Intel platforms had similar results. (Meteor Lake shown)
total instructions in shared programs: 19734086 -> 19733997 (<.01%)
instructions in affected programs: 135388 -> 135299 (-0.07%)
helped: 76 / HURT: 2
total cycles in shared programs: 916290451 -> 916264968 (<.01%)
cycles in affected programs: 41046002 -> 41020519 (-0.06%)
helped: 32 / HURT: 29
fossil-db:
Meteor Lake, DG2, and Skylake had similar results. (Meteor Lake shown)
Totals:
Instrs: 151531355 -> 151513669 (-0.01%); split: -0.01%, +0.00%
Cycle count: 17209372399 -> 17208178205 (-0.01%); split: -0.01%, +0.00%
Max live registers: 32016490 -> 32016493 (+0.00%)
Totals from 17361 (2.75% of 630198) affected shaders:
Instrs: 2642048 -> 2624362 (-0.67%); split: -0.67%, +0.00%
Cycle count: 79803066 -> 78608872 (-1.50%); split: -1.75%, +0.25%
Max live registers: 421668 -> 421671 (+0.00%)
Tiger Lake and Ice Lake had similar results. (Tiger Lake shown)
Totals:
Instrs: 149995644 -> 149977326 (-0.01%); split: -0.01%, +0.00%
Cycle count: 15567293770 -> 15566524840 (-0.00%); split: -0.02%, +0.01%
Spill count: 61241 -> 61238 (-0.00%)
Fill count: 107304 -> 107301 (-0.00%)
Max live registers: 31993109 -> 31993112 (+0.00%)
Totals from 17813 (2.83% of 629912) affected shaders:
Instrs: 3738236 -> 3719918 (-0.49%); split: -0.49%, +0.00%
Cycle count: 4251157049 -> 4250388119 (-0.02%); split: -0.06%, +0.04%
Spill count: 28268 -> 28265 (-0.01%)
Fill count: 50377 -> 50374 (-0.01%)
Max live registers: 470648 -> 470651 (+0.00%)
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30251>
2024-07-16 16:04:38 -07:00
|
|
|
|
|
|
|
|
TEST_F(copy_propagation_test, mixed_integer_sign)
|
|
|
|
|
{
|
|
|
|
|
brw_reg vgrf0 = bld.vgrf(BRW_TYPE_UD);
|
|
|
|
|
brw_reg vgrf1 = bld.vgrf(BRW_TYPE_D);
|
|
|
|
|
brw_reg vgrf2 = bld.vgrf(BRW_TYPE_UD);
|
|
|
|
|
brw_reg vgrf3 = bld.vgrf(BRW_TYPE_UD);
|
|
|
|
|
brw_reg vgrf4 = bld.vgrf(BRW_TYPE_UD);
|
|
|
|
|
|
|
|
|
|
bld.MOV(vgrf1, vgrf0);
|
|
|
|
|
bld.BFE(vgrf2, vgrf3, vgrf4, retype(vgrf1, BRW_TYPE_UD));
|
|
|
|
|
|
|
|
|
|
/* = Before =
|
|
|
|
|
*
|
|
|
|
|
* 0: mov(8) vgrf1:D vgrf0:UD
|
|
|
|
|
* 1: bfe(8) vgrf2:UD vgrf3:UD vgrf4:UD vgrf1:UD
|
|
|
|
|
*
|
|
|
|
|
* = After =
|
|
|
|
|
* 0: mov(8) vgrf1:D vgrf0:UD
|
|
|
|
|
* 1: bfe(8) vgrf2:UD vgrf3:UD vgrf4:UD vgrf0:UD
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
brw_calculate_cfg(*v);
|
|
|
|
|
bblock_t *block0 = v->cfg->blocks[0];
|
|
|
|
|
|
|
|
|
|
EXPECT_EQ(0, block0->start_ip);
|
|
|
|
|
EXPECT_EQ(1, block0->end_ip);
|
|
|
|
|
|
|
|
|
|
EXPECT_TRUE(copy_propagation(v));
|
|
|
|
|
EXPECT_EQ(0, block0->start_ip);
|
|
|
|
|
EXPECT_EQ(1, block0->end_ip);
|
|
|
|
|
|
|
|
|
|
fs_inst *mov = instruction(block0, 0);
|
|
|
|
|
EXPECT_EQ(BRW_OPCODE_MOV, mov->opcode);
|
|
|
|
|
EXPECT_TRUE(mov->dst.equals(vgrf1));
|
|
|
|
|
EXPECT_TRUE(mov->src[0].equals(vgrf0));
|
|
|
|
|
|
|
|
|
|
fs_inst *bfe = instruction(block0, 1);
|
|
|
|
|
EXPECT_EQ(BRW_OPCODE_BFE, bfe->opcode);
|
|
|
|
|
EXPECT_TRUE(bfe->dst.equals(vgrf2));
|
|
|
|
|
EXPECT_TRUE(bfe->src[0].equals(vgrf3));
|
|
|
|
|
EXPECT_TRUE(bfe->src[1].equals(vgrf4));
|
|
|
|
|
EXPECT_TRUE(bfe->src[2].equals(vgrf0));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TEST_F(copy_propagation_test, mixed_integer_sign_with_vector_imm)
|
|
|
|
|
{
|
|
|
|
|
brw_reg vgrf0 = bld.vgrf(BRW_TYPE_W);
|
|
|
|
|
brw_reg vgrf1 = bld.vgrf(BRW_TYPE_UD);
|
|
|
|
|
brw_reg vgrf2 = bld.vgrf(BRW_TYPE_UD);
|
|
|
|
|
|
|
|
|
|
bld.MOV(vgrf0, brw_imm_uv(0xffff));
|
|
|
|
|
bld.ADD(vgrf1, vgrf2, retype(vgrf0, BRW_TYPE_UW));
|
|
|
|
|
|
|
|
|
|
/* = Before =
|
|
|
|
|
*
|
|
|
|
|
* 0: mov(8) vgrf0:W ...:UV
|
|
|
|
|
* 1: add(8) vgrf1:UD vgrf2:UD vgrf0:UW
|
|
|
|
|
*
|
|
|
|
|
* = After =
|
|
|
|
|
* No change
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
brw_calculate_cfg(*v);
|
|
|
|
|
bblock_t *block0 = v->cfg->blocks[0];
|
|
|
|
|
|
|
|
|
|
const brw_reg src1 = instruction(block0, 1)->src[1];
|
|
|
|
|
|
|
|
|
|
EXPECT_EQ(0, block0->start_ip);
|
|
|
|
|
EXPECT_EQ(1, block0->end_ip);
|
|
|
|
|
|
|
|
|
|
EXPECT_FALSE(copy_propagation(v));
|
|
|
|
|
EXPECT_EQ(0, block0->start_ip);
|
|
|
|
|
EXPECT_EQ(1, block0->end_ip);
|
|
|
|
|
|
|
|
|
|
fs_inst *mov = instruction(block0, 0);
|
|
|
|
|
EXPECT_EQ(BRW_OPCODE_MOV, mov->opcode);
|
|
|
|
|
EXPECT_TRUE(mov->dst.equals(vgrf0));
|
|
|
|
|
EXPECT_TRUE(mov->src[0].file == IMM);
|
|
|
|
|
|
|
|
|
|
fs_inst *add = instruction(block0, 1);
|
|
|
|
|
EXPECT_EQ(BRW_OPCODE_ADD, add->opcode);
|
|
|
|
|
EXPECT_TRUE(add->dst.equals(vgrf1));
|
|
|
|
|
EXPECT_TRUE(add->src[0].equals(vgrf2));
|
|
|
|
|
EXPECT_TRUE(add->src[1].equals(src1));
|
|
|
|
|
}
|