i965: Move the back-end compiler to src/intel/compiler
Mostly a dummy git mv with a couple of noticable parts: - With the earlier header cleanups, nothing in src/intel depends files from src/mesa/drivers/dri/i965/ - Both Autoconf and Android builds are addressed. Thanks to Mauro and Tapani for the fixups in the latter - brw_util.[ch] is not really compiler specific, so it's moved to i965. v2: - move brw_eu_defines.h instead of brw_defines.h - remove no-longer applicable includes - add missing vulkan/ prefix in the Android build (thanks Tapani) v3: - don't list brw_defines.h in src/intel/Makefile.sources (Jason) - rebase on top of the oa patches [Emil Velikov: commit message, various small fixes througout] Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Jason Ekstrand
committed by
Emil Velikov
Emil Velikov
parent
d0d4a5f43b
commit
700bebb958
600
src/intel/compiler/test_fs_saturate_propagation.cpp
Normal file
600
src/intel/compiler/test_fs_saturate_propagation.cpp
Normal file
@@ -0,0 +1,600 @@
|
||||
/*
|
||||
* Copyright © 2015 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"
|
||||
#include "brw_cfg.h"
|
||||
#include "program/program.h"
|
||||
|
||||
using namespace brw;
|
||||
|
||||
class saturate_propagation_test : public ::testing::Test {
|
||||
virtual void SetUp();
|
||||
|
||||
public:
|
||||
struct brw_compiler *compiler;
|
||||
struct gen_device_info *devinfo;
|
||||
struct gl_context *ctx;
|
||||
struct brw_wm_prog_data *prog_data;
|
||||
struct gl_shader_program *shader_prog;
|
||||
fs_visitor *v;
|
||||
};
|
||||
|
||||
class saturate_propagation_fs_visitor : public fs_visitor
|
||||
{
|
||||
public:
|
||||
saturate_propagation_fs_visitor(struct brw_compiler *compiler,
|
||||
struct brw_wm_prog_data *prog_data,
|
||||
nir_shader *shader)
|
||||
: fs_visitor(compiler, NULL, NULL, NULL,
|
||||
&prog_data->base, (struct gl_program *) NULL,
|
||||
shader, 8, -1) {}
|
||||
};
|
||||
|
||||
|
||||
void saturate_propagation_test::SetUp()
|
||||
{
|
||||
ctx = (struct gl_context *)calloc(1, sizeof(*ctx));
|
||||
compiler = (struct brw_compiler *)calloc(1, sizeof(*compiler));
|
||||
devinfo = (struct gen_device_info *)calloc(1, sizeof(*devinfo));
|
||||
compiler->devinfo = devinfo;
|
||||
|
||||
prog_data = ralloc(NULL, struct brw_wm_prog_data);
|
||||
nir_shader *shader =
|
||||
nir_shader_create(NULL, MESA_SHADER_FRAGMENT, NULL, NULL);
|
||||
|
||||
v = new saturate_propagation_fs_visitor(compiler, prog_data, shader);
|
||||
|
||||
devinfo->gen = 4;
|
||||
}
|
||||
|
||||
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
|
||||
saturate_propagation(fs_visitor *v)
|
||||
{
|
||||
const bool print = false;
|
||||
|
||||
if (print) {
|
||||
fprintf(stderr, "= Before =\n");
|
||||
v->cfg->dump(v);
|
||||
}
|
||||
|
||||
bool ret = v->opt_saturate_propagation();
|
||||
|
||||
if (print) {
|
||||
fprintf(stderr, "\n= After =\n");
|
||||
v->cfg->dump(v);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
TEST_F(saturate_propagation_test, basic)
|
||||
{
|
||||
const fs_builder &bld = v->bld;
|
||||
fs_reg dst0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg dst1 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src1 = v->vgrf(glsl_type::float_type);
|
||||
bld.ADD(dst0, src0, src1);
|
||||
set_saturate(true, bld.MOV(dst1, dst0));
|
||||
|
||||
/* = Before =
|
||||
*
|
||||
* 0: add(8) dst0 src0 src1
|
||||
* 1: mov.sat(8) dst1 dst0
|
||||
*
|
||||
* = After =
|
||||
* 0: add.sat(8) dst0 src0 src1
|
||||
* 1: mov(8) dst1 dst0
|
||||
*/
|
||||
|
||||
v->calculate_cfg();
|
||||
bblock_t *block0 = v->cfg->blocks[0];
|
||||
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(1, block0->end_ip);
|
||||
|
||||
EXPECT_TRUE(saturate_propagation(v));
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(1, block0->end_ip);
|
||||
EXPECT_EQ(BRW_OPCODE_ADD, instruction(block0, 0)->opcode);
|
||||
EXPECT_TRUE(instruction(block0, 0)->saturate);
|
||||
EXPECT_EQ(BRW_OPCODE_MOV, instruction(block0, 1)->opcode);
|
||||
EXPECT_FALSE(instruction(block0, 1)->saturate);
|
||||
}
|
||||
|
||||
TEST_F(saturate_propagation_test, other_non_saturated_use)
|
||||
{
|
||||
const fs_builder &bld = v->bld;
|
||||
fs_reg dst0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg dst1 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg dst2 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src1 = v->vgrf(glsl_type::float_type);
|
||||
bld.ADD(dst0, src0, src1);
|
||||
set_saturate(true, bld.MOV(dst1, dst0));
|
||||
bld.ADD(dst2, dst0, src0);
|
||||
|
||||
/* = Before =
|
||||
*
|
||||
* 0: add(8) dst0 src0 src1
|
||||
* 1: mov.sat(8) dst1 dst0
|
||||
* 2: add(8) dst2 dst0 src0
|
||||
*
|
||||
* = After =
|
||||
* (no changes)
|
||||
*/
|
||||
|
||||
v->calculate_cfg();
|
||||
bblock_t *block0 = v->cfg->blocks[0];
|
||||
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(2, block0->end_ip);
|
||||
|
||||
EXPECT_FALSE(saturate_propagation(v));
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(2, block0->end_ip);
|
||||
EXPECT_EQ(BRW_OPCODE_ADD, instruction(block0, 0)->opcode);
|
||||
EXPECT_FALSE(instruction(block0, 0)->saturate);
|
||||
EXPECT_EQ(BRW_OPCODE_MOV, instruction(block0, 1)->opcode);
|
||||
EXPECT_TRUE(instruction(block0, 1)->saturate);
|
||||
EXPECT_EQ(BRW_OPCODE_ADD, instruction(block0, 2)->opcode);
|
||||
}
|
||||
|
||||
TEST_F(saturate_propagation_test, predicated_instruction)
|
||||
{
|
||||
const fs_builder &bld = v->bld;
|
||||
fs_reg dst0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg dst1 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src1 = v->vgrf(glsl_type::float_type);
|
||||
bld.ADD(dst0, src0, src1)
|
||||
->predicate = BRW_PREDICATE_NORMAL;
|
||||
set_saturate(true, bld.MOV(dst1, dst0));
|
||||
|
||||
/* = Before =
|
||||
*
|
||||
* 0: (+f0) add(8) dst0 src0 src1
|
||||
* 1: mov.sat(8) dst1 dst0
|
||||
*
|
||||
* = After =
|
||||
* (no changes)
|
||||
*/
|
||||
|
||||
v->calculate_cfg();
|
||||
bblock_t *block0 = v->cfg->blocks[0];
|
||||
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(1, block0->end_ip);
|
||||
|
||||
EXPECT_FALSE(saturate_propagation(v));
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(1, block0->end_ip);
|
||||
EXPECT_EQ(BRW_OPCODE_ADD, instruction(block0, 0)->opcode);
|
||||
EXPECT_FALSE(instruction(block0, 0)->saturate);
|
||||
EXPECT_EQ(BRW_OPCODE_MOV, instruction(block0, 1)->opcode);
|
||||
EXPECT_TRUE(instruction(block0, 1)->saturate);
|
||||
}
|
||||
|
||||
TEST_F(saturate_propagation_test, neg_mov_sat)
|
||||
{
|
||||
const fs_builder &bld = v->bld;
|
||||
fs_reg dst0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg dst1 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src0 = v->vgrf(glsl_type::float_type);
|
||||
bld.RNDU(dst0, src0);
|
||||
dst0.negate = true;
|
||||
set_saturate(true, bld.MOV(dst1, dst0));
|
||||
|
||||
/* = Before =
|
||||
*
|
||||
* 0: rndu(8) dst0 src0
|
||||
* 1: mov.sat(8) dst1 -dst0
|
||||
*
|
||||
* = After =
|
||||
* (no changes)
|
||||
*/
|
||||
|
||||
v->calculate_cfg();
|
||||
bblock_t *block0 = v->cfg->blocks[0];
|
||||
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(1, block0->end_ip);
|
||||
|
||||
EXPECT_FALSE(saturate_propagation(v));
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(1, block0->end_ip);
|
||||
EXPECT_EQ(BRW_OPCODE_RNDU, instruction(block0, 0)->opcode);
|
||||
EXPECT_FALSE(instruction(block0, 0)->saturate);
|
||||
EXPECT_EQ(BRW_OPCODE_MOV, instruction(block0, 1)->opcode);
|
||||
EXPECT_TRUE(instruction(block0, 1)->saturate);
|
||||
}
|
||||
|
||||
TEST_F(saturate_propagation_test, add_neg_mov_sat)
|
||||
{
|
||||
const fs_builder &bld = v->bld;
|
||||
fs_reg dst0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg dst1 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src1 = v->vgrf(glsl_type::float_type);
|
||||
bld.ADD(dst0, src0, src1);
|
||||
dst0.negate = true;
|
||||
set_saturate(true, bld.MOV(dst1, dst0));
|
||||
|
||||
/* = Before =
|
||||
*
|
||||
* 0: add(8) dst0 src0 src1
|
||||
* 1: mov.sat(8) dst1 -dst0
|
||||
*
|
||||
* = After =
|
||||
* 0: add.sat(8) dst0 -src0 -src1
|
||||
* 1: mov(8) dst1 dst0
|
||||
*/
|
||||
|
||||
v->calculate_cfg();
|
||||
bblock_t *block0 = v->cfg->blocks[0];
|
||||
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(1, block0->end_ip);
|
||||
|
||||
EXPECT_TRUE(saturate_propagation(v));
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(1, block0->end_ip);
|
||||
EXPECT_EQ(BRW_OPCODE_ADD, instruction(block0, 0)->opcode);
|
||||
EXPECT_TRUE(instruction(block0, 0)->saturate);
|
||||
EXPECT_TRUE(instruction(block0, 0)->src[0].negate);
|
||||
EXPECT_TRUE(instruction(block0, 0)->src[1].negate);
|
||||
EXPECT_EQ(BRW_OPCODE_MOV, instruction(block0, 1)->opcode);
|
||||
EXPECT_FALSE(instruction(block0, 1)->saturate);
|
||||
}
|
||||
|
||||
TEST_F(saturate_propagation_test, mul_neg_mov_sat)
|
||||
{
|
||||
const fs_builder &bld = v->bld;
|
||||
fs_reg dst0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg dst1 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src1 = v->vgrf(glsl_type::float_type);
|
||||
bld.MUL(dst0, src0, src1);
|
||||
dst0.negate = true;
|
||||
set_saturate(true, bld.MOV(dst1, dst0));
|
||||
|
||||
/* = Before =
|
||||
*
|
||||
* 0: mul(8) dst0 src0 src1
|
||||
* 1: mov.sat(8) dst1 -dst0
|
||||
*
|
||||
* = After =
|
||||
* 0: mul.sat(8) dst0 src0 -src1
|
||||
* 1: mov(8) dst1 dst0
|
||||
*/
|
||||
|
||||
v->calculate_cfg();
|
||||
bblock_t *block0 = v->cfg->blocks[0];
|
||||
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(1, block0->end_ip);
|
||||
|
||||
EXPECT_TRUE(saturate_propagation(v));
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(1, block0->end_ip);
|
||||
EXPECT_EQ(BRW_OPCODE_MUL, instruction(block0, 0)->opcode);
|
||||
EXPECT_TRUE(instruction(block0, 0)->saturate);
|
||||
EXPECT_TRUE(instruction(block0, 0)->src[0].negate);
|
||||
EXPECT_EQ(BRW_OPCODE_MOV, instruction(block0, 1)->opcode);
|
||||
EXPECT_FALSE(instruction(block0, 1)->saturate);
|
||||
EXPECT_FALSE(instruction(block0, 1)->src[0].negate);
|
||||
}
|
||||
|
||||
TEST_F(saturate_propagation_test, mul_mov_sat_neg_mov_sat)
|
||||
{
|
||||
const fs_builder &bld = v->bld;
|
||||
fs_reg dst0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg dst1 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg dst2 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src1 = v->vgrf(glsl_type::float_type);
|
||||
bld.MUL(dst0, src0, src1);
|
||||
set_saturate(true, bld.MOV(dst1, dst0));
|
||||
dst0.negate = true;
|
||||
set_saturate(true, bld.MOV(dst2, dst0));
|
||||
|
||||
/* = Before =
|
||||
*
|
||||
* 0: mul(8) dst0 src0 src1
|
||||
* 1: mov.sat(8) dst1 dst0
|
||||
* 2: mov.sat(8) dst2 -dst0
|
||||
*
|
||||
* = After =
|
||||
* (no changes)
|
||||
*/
|
||||
|
||||
v->calculate_cfg();
|
||||
bblock_t *block0 = v->cfg->blocks[0];
|
||||
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(2, block0->end_ip);
|
||||
|
||||
EXPECT_FALSE(saturate_propagation(v));
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(2, block0->end_ip);
|
||||
EXPECT_EQ(BRW_OPCODE_MUL, instruction(block0, 0)->opcode);
|
||||
EXPECT_FALSE(instruction(block0, 0)->saturate);
|
||||
EXPECT_FALSE(instruction(block0, 0)->src[1].negate);
|
||||
EXPECT_EQ(BRW_OPCODE_MOV, instruction(block0, 1)->opcode);
|
||||
EXPECT_TRUE(instruction(block0, 1)->saturate);
|
||||
EXPECT_EQ(BRW_OPCODE_MOV, instruction(block0, 2)->opcode);
|
||||
EXPECT_TRUE(instruction(block0, 2)->src[0].negate);
|
||||
EXPECT_TRUE(instruction(block0, 2)->saturate);
|
||||
}
|
||||
|
||||
TEST_F(saturate_propagation_test, mul_neg_mov_sat_neg_mov_sat)
|
||||
{
|
||||
const fs_builder &bld = v->bld;
|
||||
fs_reg dst0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg dst1 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg dst2 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src1 = v->vgrf(glsl_type::float_type);
|
||||
bld.MUL(dst0, src0, src1);
|
||||
dst0.negate = true;
|
||||
set_saturate(true, bld.MOV(dst1, dst0));
|
||||
set_saturate(true, bld.MOV(dst2, dst0));
|
||||
|
||||
/* = Before =
|
||||
*
|
||||
* 0: mul(8) dst0 src0 src1
|
||||
* 1: mov.sat(8) dst1 -dst0
|
||||
* 2: mov.sat(8) dst2 -dst0
|
||||
*
|
||||
* = After =
|
||||
* (no changes)
|
||||
*/
|
||||
|
||||
v->calculate_cfg();
|
||||
bblock_t *block0 = v->cfg->blocks[0];
|
||||
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(2, block0->end_ip);
|
||||
|
||||
EXPECT_FALSE(saturate_propagation(v));
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(2, block0->end_ip);
|
||||
EXPECT_EQ(BRW_OPCODE_MUL, instruction(block0, 0)->opcode);
|
||||
EXPECT_FALSE(instruction(block0, 0)->saturate);
|
||||
EXPECT_FALSE(instruction(block0, 0)->src[1].negate);
|
||||
EXPECT_EQ(BRW_OPCODE_MOV, instruction(block0, 1)->opcode);
|
||||
EXPECT_TRUE(instruction(block0, 1)->src[0].negate);
|
||||
EXPECT_TRUE(instruction(block0, 1)->saturate);
|
||||
EXPECT_EQ(BRW_OPCODE_MOV, instruction(block0, 2)->opcode);
|
||||
EXPECT_TRUE(instruction(block0, 2)->src[0].negate);
|
||||
EXPECT_TRUE(instruction(block0, 2)->saturate);
|
||||
}
|
||||
|
||||
TEST_F(saturate_propagation_test, abs_mov_sat)
|
||||
{
|
||||
const fs_builder &bld = v->bld;
|
||||
fs_reg dst0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg dst1 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src1 = v->vgrf(glsl_type::float_type);
|
||||
bld.ADD(dst0, src0, src1);
|
||||
dst0.abs = true;
|
||||
set_saturate(true, bld.MOV(dst1, dst0));
|
||||
|
||||
/* = Before =
|
||||
*
|
||||
* 0: add(8) dst0 src0 src1
|
||||
* 1: mov.sat(8) dst1 (abs)dst0
|
||||
*
|
||||
* = After =
|
||||
* (no changes)
|
||||
*/
|
||||
|
||||
v->calculate_cfg();
|
||||
bblock_t *block0 = v->cfg->blocks[0];
|
||||
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(1, block0->end_ip);
|
||||
|
||||
EXPECT_FALSE(saturate_propagation(v));
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(1, block0->end_ip);
|
||||
EXPECT_EQ(BRW_OPCODE_ADD, instruction(block0, 0)->opcode);
|
||||
EXPECT_FALSE(instruction(block0, 0)->saturate);
|
||||
EXPECT_EQ(BRW_OPCODE_MOV, instruction(block0, 1)->opcode);
|
||||
EXPECT_TRUE(instruction(block0, 1)->saturate);
|
||||
}
|
||||
|
||||
TEST_F(saturate_propagation_test, producer_saturates)
|
||||
{
|
||||
const fs_builder &bld = v->bld;
|
||||
fs_reg dst0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg dst1 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg dst2 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src1 = v->vgrf(glsl_type::float_type);
|
||||
set_saturate(true, bld.ADD(dst0, src0, src1));
|
||||
set_saturate(true, bld.MOV(dst1, dst0));
|
||||
bld.MOV(dst2, dst0);
|
||||
|
||||
/* = Before =
|
||||
*
|
||||
* 0: add.sat(8) dst0 src0 src1
|
||||
* 1: mov.sat(8) dst1 dst0
|
||||
* 2: mov(8) dst2 dst0
|
||||
*
|
||||
* = After =
|
||||
* 0: add.sat(8) dst0 src0 src1
|
||||
* 1: mov(8) dst1 dst0
|
||||
* 2: mov(8) dst2 dst0
|
||||
*/
|
||||
|
||||
v->calculate_cfg();
|
||||
bblock_t *block0 = v->cfg->blocks[0];
|
||||
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(2, block0->end_ip);
|
||||
|
||||
EXPECT_TRUE(saturate_propagation(v));
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(2, block0->end_ip);
|
||||
EXPECT_EQ(BRW_OPCODE_ADD, instruction(block0, 0)->opcode);
|
||||
EXPECT_TRUE(instruction(block0, 0)->saturate);
|
||||
EXPECT_EQ(BRW_OPCODE_MOV, instruction(block0, 1)->opcode);
|
||||
EXPECT_FALSE(instruction(block0, 1)->saturate);
|
||||
}
|
||||
|
||||
TEST_F(saturate_propagation_test, intervening_saturating_copy)
|
||||
{
|
||||
const fs_builder &bld = v->bld;
|
||||
fs_reg dst0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg dst1 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg dst2 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src1 = v->vgrf(glsl_type::float_type);
|
||||
bld.ADD(dst0, src0, src1);
|
||||
set_saturate(true, bld.MOV(dst1, dst0));
|
||||
set_saturate(true, bld.MOV(dst2, dst0));
|
||||
|
||||
/* = Before =
|
||||
*
|
||||
* 0: add(8) dst0 src0 src1
|
||||
* 1: mov.sat(8) dst1 dst0
|
||||
* 2: mov.sat(8) dst2 dst0
|
||||
*
|
||||
* = After =
|
||||
* 0: add.sat(8) dst0 src0 src1
|
||||
* 1: mov(8) dst1 dst0
|
||||
* 2: mov(8) dst2 dst0
|
||||
*/
|
||||
|
||||
v->calculate_cfg();
|
||||
bblock_t *block0 = v->cfg->blocks[0];
|
||||
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(2, block0->end_ip);
|
||||
|
||||
EXPECT_TRUE(saturate_propagation(v));
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(2, block0->end_ip);
|
||||
EXPECT_EQ(BRW_OPCODE_ADD, instruction(block0, 0)->opcode);
|
||||
EXPECT_TRUE(instruction(block0, 0)->saturate);
|
||||
EXPECT_EQ(BRW_OPCODE_MOV, instruction(block0, 1)->opcode);
|
||||
EXPECT_FALSE(instruction(block0, 1)->saturate);
|
||||
EXPECT_EQ(BRW_OPCODE_MOV, instruction(block0, 2)->opcode);
|
||||
EXPECT_FALSE(instruction(block0, 2)->saturate);
|
||||
}
|
||||
|
||||
TEST_F(saturate_propagation_test, intervening_dest_write)
|
||||
{
|
||||
const fs_builder &bld = v->bld;
|
||||
fs_reg dst0 = v->vgrf(glsl_type::vec4_type);
|
||||
fs_reg dst1 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src1 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src2 = v->vgrf(glsl_type::vec2_type);
|
||||
bld.ADD(offset(dst0, bld, 2), src0, src1);
|
||||
bld.emit(SHADER_OPCODE_TEX, dst0, src2)
|
||||
->size_written = 4 * REG_SIZE;
|
||||
set_saturate(true, bld.MOV(dst1, offset(dst0, bld, 2)));
|
||||
|
||||
/* = Before =
|
||||
*
|
||||
* 0: add(8) dst0+2 src0 src1
|
||||
* 1: tex(8) rlen 4 dst0+0 src2
|
||||
* 2: mov.sat(8) dst1 dst0+2
|
||||
*
|
||||
* = After =
|
||||
* (no changes)
|
||||
*/
|
||||
|
||||
v->calculate_cfg();
|
||||
bblock_t *block0 = v->cfg->blocks[0];
|
||||
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(2, block0->end_ip);
|
||||
|
||||
EXPECT_FALSE(saturate_propagation(v));
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(2, block0->end_ip);
|
||||
EXPECT_EQ(BRW_OPCODE_ADD, instruction(block0, 0)->opcode);
|
||||
EXPECT_FALSE(instruction(block0, 0)->saturate);
|
||||
EXPECT_EQ(SHADER_OPCODE_TEX, instruction(block0, 1)->opcode);
|
||||
EXPECT_FALSE(instruction(block0, 0)->saturate);
|
||||
EXPECT_EQ(BRW_OPCODE_MOV, instruction(block0, 2)->opcode);
|
||||
EXPECT_TRUE(instruction(block0, 2)->saturate);
|
||||
}
|
||||
|
||||
TEST_F(saturate_propagation_test, mul_neg_mov_sat_mov_sat)
|
||||
{
|
||||
const fs_builder &bld = v->bld;
|
||||
fs_reg dst0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg dst1 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg dst2 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src0 = v->vgrf(glsl_type::float_type);
|
||||
fs_reg src1 = v->vgrf(glsl_type::float_type);
|
||||
bld.MUL(dst0, src0, src1);
|
||||
dst0.negate = true;
|
||||
set_saturate(true, bld.MOV(dst1, dst0));
|
||||
dst0.negate = false;
|
||||
set_saturate(true, bld.MOV(dst2, dst0));
|
||||
|
||||
/* = Before =
|
||||
*
|
||||
* 0: mul(8) dst0 src0 src1
|
||||
* 1: mov.sat(8) dst1 -dst0
|
||||
* 2: mov.sat(8) dst2 dst0
|
||||
*
|
||||
* = After =
|
||||
* (no changes)
|
||||
*/
|
||||
|
||||
v->calculate_cfg();
|
||||
bblock_t *block0 = v->cfg->blocks[0];
|
||||
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(2, block0->end_ip);
|
||||
|
||||
EXPECT_FALSE(saturate_propagation(v));
|
||||
EXPECT_EQ(0, block0->start_ip);
|
||||
EXPECT_EQ(2, block0->end_ip);
|
||||
EXPECT_EQ(BRW_OPCODE_MUL, instruction(block0, 0)->opcode);
|
||||
EXPECT_FALSE(instruction(block0, 0)->saturate);
|
||||
EXPECT_FALSE(instruction(block0, 0)->src[1].negate);
|
||||
EXPECT_EQ(BRW_OPCODE_MOV, instruction(block0, 1)->opcode);
|
||||
EXPECT_TRUE(instruction(block0, 1)->saturate);
|
||||
EXPECT_TRUE(instruction(block0, 1)->src[0].negate);
|
||||
EXPECT_EQ(BRW_OPCODE_MOV, instruction(block0, 2)->opcode);
|
||||
EXPECT_TRUE(instruction(block0, 2)->saturate);
|
||||
}
|
||||
Reference in New Issue
Block a user