fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 20:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

intel/compiler: Don't use fs_visitor::bld in tests

Browse source 
Tests create their own fs_builder now.  Moves one step closer to remove
bld from fs_visitor.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26301>
This commit is contained in:
Caio Oliveira 2023-11-20 23:02:46 -08:00 • committed by Marge Bot
parent 9540259e1c
commit f55867b56c
4 changed files with 15 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/intel/compiler/test_fs_cmod_propagation.cpp
View file

@ -39,6 +39,7 @@ protected:
struct brw_wm_prog_data *prog_data;
struct gl_shader_program *shader_prog;
fs_visitor *v;
fs_builder bld;
void test_mov_prop(enum brw_conditional_mod cmod,
enum brw_reg_type add_type,
@ -65,6 +66,7 @@ public:
cmod_propagation_test::cmod_propagation_test()
: bld(NULL, 0)
{
ctx = ralloc_context(NULL);
compiler = rzalloc(ctx, struct brw_compiler);
@ -80,6 +82,8 @@ cmod_propagation_test::cmod_propagation_test()
v = new cmod_propagation_fs_visitor(compiler, &params, prog_data, shader);
bld = fs_builder(v, v->dispatch_width).at_end();
devinfo->ver = 7;
devinfo->verx10 = devinfo->ver * 10;
}
@ -125,7 +129,6 @@ cmod_propagation(fs_visitor *v)
TEST_F(cmod_propagation_test, basic)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg src1 = v->vgrf(glsl_type::float_type);
@ -157,7 +160,6 @@ TEST_F(cmod_propagation_test, basic)
TEST_F(cmod_propagation_test, basic_other_flag)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg src1 = v->vgrf(glsl_type::float_type);
@ -191,7 +193,6 @@ TEST_F(cmod_propagation_test, basic_other_flag)
TEST_F(cmod_propagation_test, cmp_nonzero)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg src1 = v->vgrf(glsl_type::float_type);
@ -224,7 +225,6 @@ TEST_F(cmod_propagation_test, cmp_nonzero)
TEST_F(cmod_propagation_test, non_cmod_instruction)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::uint_type);
fs_reg src0 = v->vgrf(glsl_type::uint_type);
fs_reg zero(brw_imm_ud(0u));
@ -256,7 +256,6 @@ TEST_F(cmod_propagation_test, non_cmod_instruction)
TEST_F(cmod_propagation_test, non_cmod_livechannel)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::uint_type);
fs_reg zero(brw_imm_d(0));
bld.emit(SHADER_OPCODE_FIND_LIVE_CHANNEL, dest)->exec_size = 32;
@ -288,7 +287,6 @@ TEST_F(cmod_propagation_test, non_cmod_livechannel)
TEST_F(cmod_propagation_test, intervening_flag_write)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg src1 = v->vgrf(glsl_type::float_type);
@ -326,7 +324,6 @@ TEST_F(cmod_propagation_test, intervening_flag_write)
TEST_F(cmod_propagation_test, intervening_mismatch_flag_write)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg src1 = v->vgrf(glsl_type::float_type);
@ -367,7 +364,6 @@ TEST_F(cmod_propagation_test, intervening_mismatch_flag_write)
TEST_F(cmod_propagation_test, intervening_flag_read)
{
const fs_builder &bld = v->bld;
fs_reg dest0 = v->vgrf(glsl_type::float_type);
fs_reg dest1 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
@ -406,7 +402,6 @@ TEST_F(cmod_propagation_test, intervening_flag_read)
TEST_F(cmod_propagation_test, intervening_mismatch_flag_read)
{
const fs_builder &bld = v->bld;
fs_reg dest0 = v->vgrf(glsl_type::float_type);
fs_reg dest1 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
@ -448,7 +443,6 @@ TEST_F(cmod_propagation_test, intervening_mismatch_flag_read)
TEST_F(cmod_propagation_test, intervening_dest_write)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::vec4_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg src1 = v->vgrf(glsl_type::float_type);
@ -488,7 +482,6 @@ TEST_F(cmod_propagation_test, intervening_dest_write)
TEST_F(cmod_propagation_test, intervening_flag_read_same_value)
{
const fs_builder &bld = v->bld;
fs_reg dest0 = v->vgrf(glsl_type::float_type);
fs_reg dest1 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
@ -527,7 +520,6 @@ TEST_F(cmod_propagation_test, intervening_flag_read_same_value)
TEST_F(cmod_propagation_test, negate)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg src1 = v->vgrf(glsl_type::float_type);
@ -560,7 +552,6 @@ TEST_F(cmod_propagation_test, negate)
TEST_F(cmod_propagation_test, movnz)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg src1 = v->vgrf(glsl_type::float_type);
@ -592,7 +583,6 @@ TEST_F(cmod_propagation_test, movnz)
TEST_F(cmod_propagation_test, different_types_cmod_with_zero)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::int_type);
fs_reg src0 = v->vgrf(glsl_type::int_type);
fs_reg src1 = v->vgrf(glsl_type::int_type);
@ -626,7 +616,6 @@ TEST_F(cmod_propagation_test, different_types_cmod_with_zero)
TEST_F(cmod_propagation_test, andnz_one)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::int_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg zero(brw_imm_f(0.0f));
@ -661,7 +650,6 @@ TEST_F(cmod_propagation_test, andnz_one)
TEST_F(cmod_propagation_test, andnz_non_one)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::int_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg zero(brw_imm_f(0.0f));
@ -696,8 +684,6 @@ TEST_F(cmod_propagation_test, andnz_non_one)
TEST_F(cmod_propagation_test, cmp_cmpnz)
{
const fs_builder &bld = v->bld;
fs_reg dst0 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg zero(brw_imm_f(0));
@ -725,8 +711,6 @@ TEST_F(cmod_propagation_test, cmp_cmpnz)
TEST_F(cmod_propagation_test, cmp_cmpg)
{
const fs_builder &bld = v->bld;
fs_reg dst0 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg zero(brw_imm_f(0));
@ -756,8 +740,6 @@ TEST_F(cmod_propagation_test, cmp_cmpg)
TEST_F(cmod_propagation_test, plnnz_cmpnz)
{
const fs_builder &bld = v->bld;
fs_reg dst0 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg zero(brw_imm_f(0));
@ -785,8 +767,6 @@ TEST_F(cmod_propagation_test, plnnz_cmpnz)
TEST_F(cmod_propagation_test, plnnz_cmpz)
{
const fs_builder &bld = v->bld;
fs_reg dst0 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg zero(brw_imm_f(0));
@ -814,8 +794,6 @@ TEST_F(cmod_propagation_test, plnnz_cmpz)
TEST_F(cmod_propagation_test, plnnz_sel_cmpz)
{
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);
@ -850,8 +828,6 @@ TEST_F(cmod_propagation_test, plnnz_sel_cmpz)
TEST_F(cmod_propagation_test, cmp_cmpg_D)
{
const fs_builder &bld = v->bld;
fs_reg dst0 = v->vgrf(glsl_type::int_type);
fs_reg src0 = v->vgrf(glsl_type::int_type);
fs_reg zero(brw_imm_d(0));
@ -882,8 +858,6 @@ TEST_F(cmod_propagation_test, cmp_cmpg_D)
TEST_F(cmod_propagation_test, cmp_cmpg_UD)
{
const fs_builder &bld = v->bld;
fs_reg dst0 = v->vgrf(glsl_type::uint_type);
fs_reg src0 = v->vgrf(glsl_type::uint_type);
fs_reg zero(brw_imm_ud(0));
@ -911,8 +885,6 @@ TEST_F(cmod_propagation_test, cmp_cmpg_UD)
TEST_F(cmod_propagation_test, cmp_cmpl_D)
{
const fs_builder &bld = v->bld;
fs_reg dst0 = v->vgrf(glsl_type::int_type);
fs_reg src0 = v->vgrf(glsl_type::int_type);
fs_reg zero(brw_imm_d(0));
@ -940,8 +912,6 @@ TEST_F(cmod_propagation_test, cmp_cmpl_D)
TEST_F(cmod_propagation_test, cmp_cmpl_UD)
{
const fs_builder &bld = v->bld;
fs_reg dst0 = v->vgrf(glsl_type::uint_type);
fs_reg src0 = v->vgrf(glsl_type::uint_type);
fs_reg zero(brw_imm_ud(0));
@ -971,7 +941,6 @@ TEST_F(cmod_propagation_test, cmp_cmpl_UD)
TEST_F(cmod_propagation_test, andz_one)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::int_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg zero(brw_imm_f(0.0f));
@ -1006,7 +975,6 @@ TEST_F(cmod_propagation_test, andz_one)
TEST_F(cmod_propagation_test, add_not_merge_with_compare)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg src1 = v->vgrf(glsl_type::float_type);
@ -1040,7 +1008,6 @@ TEST_F(cmod_propagation_test, add_not_merge_with_compare)
TEST_F(cmod_propagation_test, subtract_merge_with_compare)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg src1 = v->vgrf(glsl_type::float_type);
@ -1069,7 +1036,6 @@ TEST_F(cmod_propagation_test, subtract_merge_with_compare)
TEST_F(cmod_propagation_test, subtract_immediate_merge_with_compare)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg one(brw_imm_f(1.0f));
@ -1100,7 +1066,6 @@ TEST_F(cmod_propagation_test, subtract_immediate_merge_with_compare)
TEST_F(cmod_propagation_test, subtract_merge_with_compare_intervening_add)
{
const fs_builder &bld = v->bld;
fs_reg dest0 = v->vgrf(glsl_type::float_type);
fs_reg dest1 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
@ -1135,7 +1100,6 @@ TEST_F(cmod_propagation_test, subtract_merge_with_compare_intervening_add)
TEST_F(cmod_propagation_test, subtract_not_merge_with_compare_intervening_partial_write)
{
const fs_builder &bld = v->bld;
fs_reg dest0 = v->vgrf(glsl_type::float_type);
fs_reg dest1 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
@ -1171,7 +1135,6 @@ TEST_F(cmod_propagation_test, subtract_not_merge_with_compare_intervening_partia
TEST_F(cmod_propagation_test, subtract_not_merge_with_compare_intervening_add)
{
const fs_builder &bld = v->bld;
fs_reg dest0 = v->vgrf(glsl_type::float_type);
fs_reg dest1 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
@ -1207,7 +1170,6 @@ TEST_F(cmod_propagation_test, subtract_not_merge_with_compare_intervening_add)
TEST_F(cmod_propagation_test, add_merge_with_compare)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg src1 = v->vgrf(glsl_type::float_type);
@ -1236,7 +1198,6 @@ TEST_F(cmod_propagation_test, add_merge_with_compare)
TEST_F(cmod_propagation_test, negative_subtract_merge_with_compare)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg src1 = v->vgrf(glsl_type::float_type);
@ -1268,7 +1229,6 @@ TEST_F(cmod_propagation_test, negative_subtract_merge_with_compare)
TEST_F(cmod_propagation_test, subtract_delete_compare)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg dest1 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
@ -1308,7 +1268,6 @@ TEST_F(cmod_propagation_test, subtract_delete_compare_other_flag)
/* This test is the same as subtract_delete_compare but it explicitly used
* flag f0.1 for the subtraction and the comparison.
*/
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg dest1 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
@ -1348,7 +1307,6 @@ TEST_F(cmod_propagation_test, subtract_delete_compare_other_flag)
TEST_F(cmod_propagation_test, subtract_to_mismatch_flag)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg src1 = v->vgrf(glsl_type::float_type);
@ -1384,7 +1342,6 @@ TEST_F(cmod_propagation_test, subtract_to_mismatch_flag)
TEST_F(cmod_propagation_test,
subtract_merge_with_compare_intervening_mismatch_flag_write)
{
const fs_builder &bld = v->bld;
fs_reg dest0 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg src1 = v->vgrf(glsl_type::float_type);
@ -1432,7 +1389,6 @@ TEST_F(cmod_propagation_test,
TEST_F(cmod_propagation_test,
subtract_merge_with_compare_intervening_mismatch_flag_read)
{
const fs_builder &bld = v->bld;
fs_reg dest0 = v->vgrf(glsl_type::float_type);
fs_reg dest1 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
@ -1473,7 +1429,6 @@ TEST_F(cmod_propagation_test,
TEST_F(cmod_propagation_test, subtract_delete_compare_derp)
{
const fs_builder &bld = v->bld;
fs_reg dest0 = v->vgrf(glsl_type::float_type);
fs_reg dest1 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
@ -1509,7 +1464,6 @@ TEST_F(cmod_propagation_test, subtract_delete_compare_derp)
TEST_F(cmod_propagation_test, signed_unsigned_comparison_mismatch)
{
const fs_builder &bld = v->bld;
fs_reg dest0 = v->vgrf(glsl_type::int_type);
fs_reg src0 = v->vgrf(glsl_type::int_type);
src0.type = BRW_REGISTER_TYPE_W;
@ -1541,7 +1495,6 @@ TEST_F(cmod_propagation_test, signed_unsigned_comparison_mismatch)
TEST_F(cmod_propagation_test, ior_f2i_nz)
{
const fs_builder &bld = v->bld;
fs_reg dest = bld.vgrf(BRW_REGISTER_TYPE_D);
fs_reg src0 = bld.vgrf(BRW_REGISTER_TYPE_D);
fs_reg src1 = bld.vgrf(BRW_REGISTER_TYPE_D);
@ -1588,7 +1541,6 @@ cmod_propagation_test::test_mov_prop(enum brw_conditional_mod cmod,
enum brw_reg_type mov_dst_type,
bool expected_cmod_prop_progress)
{
const fs_builder &bld = v->bld;
fs_reg dest = bld.vgrf(add_type);
fs_reg src0 = bld.vgrf(add_type);
fs_reg src1 = bld.vgrf(add_type);
@ -2166,7 +2118,6 @@ cmod_propagation_test::test_saturate_prop(enum brw_conditional_mod before,
enum brw_reg_type op_type,
bool expected_cmod_prop_progress)
{
const fs_builder &bld = v->bld;
fs_reg dest = bld.vgrf(add_type);
fs_reg src0 = bld.vgrf(add_type);
fs_reg src1 = bld.vgrf(add_type);
@ -2652,7 +2603,6 @@ TEST_F(cmod_propagation_test, not_to_or)
/* Exercise propagation of conditional modifier from a NOT instruction to
* another ALU instruction as performed by cmod_propagate_not.
*/
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::uint_type);
fs_reg src0 = v->vgrf(glsl_type::uint_type);
fs_reg src1 = v->vgrf(glsl_type::uint_type);
@ -2686,7 +2636,6 @@ TEST_F(cmod_propagation_test, not_to_and)
/* Exercise propagation of conditional modifier from a NOT instruction to
* another ALU instruction as performed by cmod_propagate_not.
*/
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::uint_type);
fs_reg src0 = v->vgrf(glsl_type::uint_type);
fs_reg src1 = v->vgrf(glsl_type::uint_type);
@ -2725,7 +2674,6 @@ TEST_F(cmod_propagation_test, not_to_uadd)
* restriction is just the the destination type of the ALU instruction is
* the same as the source type of the NOT instruction.
*/
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::uint_type);
fs_reg src0 = v->vgrf(glsl_type::uint_type);
fs_reg src1 = v->vgrf(glsl_type::uint_type);
@ -2766,7 +2714,6 @@ TEST_F(cmod_propagation_test, not_to_fadd_to_ud)
* restriction is just the the destination type of the ALU instruction is
* the same as the source type of the NOT instruction.
*/
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::uint_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg src1 = v->vgrf(glsl_type::float_type);
@ -2807,7 +2754,6 @@ TEST_F(cmod_propagation_test, not_to_fadd)
* restriction is just the the destination type of the ALU instruction is
* the same as the source type of the NOT instruction.
*/
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg src1 = v->vgrf(glsl_type::float_type);
@ -2845,7 +2791,6 @@ TEST_F(cmod_propagation_test, not_to_or_intervening_flag_read_compatible_value)
/* Exercise propagation of conditional modifier from a NOT instruction to
* another ALU instruction as performed by cmod_propagate_not.
*/
const fs_builder &bld = v->bld;
fs_reg dest0 = v->vgrf(glsl_type::uint_type);
fs_reg dest1 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::uint_type);
@ -2888,7 +2833,6 @@ TEST_F(cmod_propagation_test,
/* Exercise propagation of conditional modifier from a NOT instruction to
* another ALU instruction as performed by cmod_propagate_not.
*/
const fs_builder &bld = v->bld;
fs_reg dest0 = v->vgrf(glsl_type::uint_type);
fs_reg dest1 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::uint_type);
@ -2934,7 +2878,6 @@ TEST_F(cmod_propagation_test, not_to_or_intervening_flag_read_incompatible_value
/* Exercise propagation of conditional modifier from a NOT instruction to
* another ALU instruction as performed by cmod_propagate_not.
*/
const fs_builder &bld = v->bld;
fs_reg dest0 = v->vgrf(glsl_type::uint_type);
fs_reg dest1 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::uint_type);
@ -2977,7 +2920,6 @@ TEST_F(cmod_propagation_test, not_to_or_intervening_mismatch_flag_write)
/* Exercise propagation of conditional modifier from a NOT instruction to
* another ALU instruction as performed by cmod_propagate_not.
*/
const fs_builder &bld = v->bld;
fs_reg dest0 = v->vgrf(glsl_type::uint_type);
fs_reg dest1 = v->vgrf(glsl_type::uint_type);
fs_reg src0 = v->vgrf(glsl_type::uint_type);
@ -3021,7 +2963,6 @@ TEST_F(cmod_propagation_test, not_to_or_intervening_mismatch_flag_read)
/* Exercise propagation of conditional modifier from a NOT instruction to
* another ALU instruction as performed by cmod_propagate_not.
*/
const fs_builder &bld = v->bld;
fs_reg dest0 = v->vgrf(glsl_type::uint_type);
fs_reg dest1 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::uint_type);
@ -3064,7 +3005,6 @@ TEST_F(cmod_propagation_test, not_to_or_intervening_mismatch_flag_read)
TEST_F(cmod_propagation_test, cmp_to_add_float_e)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg neg10(brw_imm_f(-10.0f));
@ -3095,7 +3035,6 @@ TEST_F(cmod_propagation_test, cmp_to_add_float_e)
TEST_F(cmod_propagation_test, cmp_to_add_float_g)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg neg10(brw_imm_f(-10.0f));
@ -3124,7 +3063,6 @@ TEST_F(cmod_propagation_test, cmp_to_add_float_g)
TEST_F(cmod_propagation_test, cmp_to_add_float_le)
{
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg neg10(brw_imm_f(-10.0f));
@ -3153,7 +3091,6 @@ TEST_F(cmod_propagation_test, cmp_to_add_float_le)
TEST_F(cmod_propagation_test, prop_across_sel_gfx7)
{
const fs_builder &bld = v->bld;
fs_reg dest1 = v->vgrf(glsl_type::float_type);
fs_reg dest2 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
@ -3196,7 +3133,6 @@ TEST_F(cmod_propagation_test, prop_across_sel_gfx5)
devinfo->ver = 5;
devinfo->verx10 = devinfo->ver * 10;
const fs_builder &bld = v->bld;
fs_reg dest1 = v->vgrf(glsl_type::float_type);
fs_reg dest2 = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
@ -3245,7 +3181,6 @@ TEST_F(cmod_propagation_test, prop_into_sel_gfx5)
devinfo->ver = 5;
devinfo->verx10 = devinfo->ver * 10;
const fs_builder &bld = v->bld;
fs_reg dest = v->vgrf(glsl_type::float_type);
fs_reg src0 = v->vgrf(glsl_type::float_type);
fs_reg src1 = v->vgrf(glsl_type::float_type);

6
src/intel/compiler/test_fs_copy_propagation.cpp
View file

@ -39,6 +39,7 @@ protected:
struct brw_wm_prog_data *prog_data;
struct gl_shader_program *shader_prog;
fs_visitor *v;
fs_builder bld;
};
class copy_propagation_fs_visitor : public fs_visitor
@ -54,6 +55,7 @@ public:
copy_propagation_test::copy_propagation_test()
: bld(NULL, 0)
{
ctx = ralloc_context(NULL);
compiler = rzalloc(ctx, struct brw_compiler);
@ -69,6 +71,8 @@ copy_propagation_test::copy_propagation_test()
v = new copy_propagation_fs_visitor(compiler, &params, prog_data, shader);
bld = fs_builder(v, v->dispatch_width).at_end();
devinfo->ver = 4;
devinfo->verx10 = devinfo->ver * 10;
}
@ -114,7 +118,6 @@ copy_propagation(fs_visitor *v)
TEST_F(copy_propagation_test, basic)
{
const fs_builder &bld = v->bld;
fs_reg vgrf0 = v->vgrf(glsl_type::float_type);
fs_reg vgrf1 = v->vgrf(glsl_type::float_type);
fs_reg vgrf2 = v->vgrf(glsl_type::float_type);
@ -156,7 +159,6 @@ TEST_F(copy_propagation_test, basic)
TEST_F(copy_propagation_test, maxmax_sat_imm)
{
const fs_builder &bld = v->bld;
fs_reg vgrf0 = v->vgrf(glsl_type::float_type);
fs_reg vgrf1 = v->vgrf(glsl_type::float_type);
fs_reg vgrf2 = v->vgrf(glsl_type::float_type);

23
src/intel/compiler/test_fs_saturate_propagation.cpp
View file

@ -39,6 +39,7 @@ protected:
struct brw_wm_prog_data *prog_data;
struct gl_shader_program *shader_prog;
fs_visitor *v;
fs_builder bld;
};
class saturate_propagation_fs_visitor : public fs_visitor
@ -54,6 +55,7 @@ public:
saturate_propagation_test::saturate_propagation_test()
: bld(NULL, 0)
{
ctx = ralloc_context(NULL);
compiler = rzalloc(ctx, struct brw_compiler);
@ -69,6 +71,8 @@ saturate_propagation_test::saturate_propagation_test()
v = new saturate_propagation_fs_visitor(compiler, &params, prog_data, shader);
bld = fs_builder(v, v->dispatch_width).at_end();
devinfo->ver = 6;
devinfo->verx10 = devinfo->ver * 10;
}
@ -115,7 +119,6 @@ saturate_propagation(fs_visitor *v)
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);
@ -150,7 +153,6 @@ TEST_F(saturate_propagation_test, basic)
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);
@ -188,7 +190,6 @@ TEST_F(saturate_propagation_test, other_non_saturated_use)
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);
@ -223,7 +224,6 @@ TEST_F(saturate_propagation_test, predicated_instruction)
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);
@ -257,7 +257,6 @@ TEST_F(saturate_propagation_test, neg_mov_sat)
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);
@ -295,7 +294,6 @@ TEST_F(saturate_propagation_test, add_neg_mov_sat)
TEST_F(saturate_propagation_test, add_imm_float_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);
@ -333,7 +331,6 @@ TEST_F(saturate_propagation_test, add_imm_float_neg_mov_sat)
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);
@ -371,7 +368,6 @@ TEST_F(saturate_propagation_test, mul_neg_mov_sat)
TEST_F(saturate_propagation_test, mad_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);
@ -412,7 +408,6 @@ TEST_F(saturate_propagation_test, mad_neg_mov_sat)
TEST_F(saturate_propagation_test, mad_imm_float_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 = brw_imm_f(1.0f);
@ -457,7 +452,6 @@ TEST_F(saturate_propagation_test, mad_imm_float_neg_mov_sat)
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);
@ -499,7 +493,6 @@ TEST_F(saturate_propagation_test, mul_mov_sat_neg_mov_sat)
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);
@ -542,7 +535,6 @@ TEST_F(saturate_propagation_test, mul_neg_mov_sat_neg_mov_sat)
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);
@ -577,7 +569,6 @@ TEST_F(saturate_propagation_test, abs_mov_sat)
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);
@ -616,7 +607,6 @@ TEST_F(saturate_propagation_test, producer_saturates)
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);
@ -657,7 +647,6 @@ TEST_F(saturate_propagation_test, intervening_saturating_copy)
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);
@ -697,7 +686,6 @@ TEST_F(saturate_propagation_test, intervening_dest_write)
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);
@ -740,7 +728,6 @@ TEST_F(saturate_propagation_test, mul_neg_mov_sat_mov_sat)
TEST_F(saturate_propagation_test, smaller_exec_size_consumer)
{
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);
@ -774,7 +761,6 @@ TEST_F(saturate_propagation_test, smaller_exec_size_consumer)
TEST_F(saturate_propagation_test, larger_exec_size_consumer)
{
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);
@ -808,7 +794,6 @@ TEST_F(saturate_propagation_test, larger_exec_size_consumer)
TEST_F(saturate_propagation_test, offset_source_barrier)
{
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);

28
src/intel/compiler/test_fs_scoreboard.cpp
View file

@ -39,9 +39,11 @@ protected:
struct brw_wm_prog_data *prog_data;
struct gl_shader_program *shader_prog;
fs_visitor *v;
fs_builder bld;
};
scoreboard_test::scoreboard_test()
: bld(NULL, 0)
{
ctx = ralloc_context(NULL);
compiler = rzalloc(ctx, struct brw_compiler);
@ -62,6 +64,7 @@ scoreboard_test::scoreboard_test()
v = new fs_visitor(compiler, &params, NULL, &prog_data->base, shader, 8,
false, false);
bld = fs_builder(v, v->dispatch_width).at_end();
}
scoreboard_test::~scoreboard_test()
@ -144,7 +147,6 @@ std::ostream &operator<<(std::ostream &os, const tgl_swsb &swsb) {
TEST_F(scoreboard_test, RAW_inorder_inorder)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -171,7 +173,6 @@ TEST_F(scoreboard_test, RAW_inorder_inorder)
TEST_F(scoreboard_test, RAW_inorder_outoforder)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -197,7 +198,6 @@ TEST_F(scoreboard_test, RAW_inorder_outoforder)
TEST_F(scoreboard_test, RAW_outoforder_inorder)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -224,7 +224,6 @@ TEST_F(scoreboard_test, RAW_outoforder_inorder)
TEST_F(scoreboard_test, RAW_outoforder_outoforder)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -257,7 +256,6 @@ TEST_F(scoreboard_test, RAW_outoforder_outoforder)
TEST_F(scoreboard_test, WAR_inorder_inorder)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -283,7 +281,6 @@ TEST_F(scoreboard_test, WAR_inorder_inorder)
TEST_F(scoreboard_test, WAR_inorder_outoforder)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -309,7 +306,6 @@ TEST_F(scoreboard_test, WAR_inorder_outoforder)
TEST_F(scoreboard_test, WAR_outoforder_inorder)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -335,7 +331,6 @@ TEST_F(scoreboard_test, WAR_outoforder_inorder)
TEST_F(scoreboard_test, WAR_outoforder_outoforder)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -364,7 +359,6 @@ TEST_F(scoreboard_test, WAR_outoforder_outoforder)
TEST_F(scoreboard_test, WAW_inorder_inorder)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -395,7 +389,6 @@ TEST_F(scoreboard_test, WAW_inorder_inorder)
TEST_F(scoreboard_test, WAW_inorder_outoforder)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -421,7 +414,6 @@ TEST_F(scoreboard_test, WAW_inorder_outoforder)
TEST_F(scoreboard_test, WAW_outoforder_inorder)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -447,7 +439,6 @@ TEST_F(scoreboard_test, WAW_outoforder_inorder)
TEST_F(scoreboard_test, WAW_outoforder_outoforder)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -477,7 +468,6 @@ TEST_F(scoreboard_test, WAW_outoforder_outoforder)
TEST_F(scoreboard_test, loop1)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -508,7 +498,6 @@ TEST_F(scoreboard_test, loop1)
TEST_F(scoreboard_test, loop2)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -544,7 +533,6 @@ TEST_F(scoreboard_test, loop2)
TEST_F(scoreboard_test, loop3)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -582,7 +570,6 @@ TEST_F(scoreboard_test, loop3)
TEST_F(scoreboard_test, conditional1)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -612,7 +599,6 @@ TEST_F(scoreboard_test, conditional1)
TEST_F(scoreboard_test, conditional2)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -645,7 +631,6 @@ TEST_F(scoreboard_test, conditional2)
TEST_F(scoreboard_test, conditional3)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -678,7 +663,6 @@ TEST_F(scoreboard_test, conditional3)
TEST_F(scoreboard_test, conditional4)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -711,7 +695,6 @@ TEST_F(scoreboard_test, conditional4)
TEST_F(scoreboard_test, conditional5)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -749,7 +732,6 @@ TEST_F(scoreboard_test, conditional5)
TEST_F(scoreboard_test, conditional6)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -794,7 +776,6 @@ TEST_F(scoreboard_test, conditional6)
TEST_F(scoreboard_test, conditional7)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -839,7 +820,6 @@ TEST_F(scoreboard_test, conditional7)
TEST_F(scoreboard_test, conditional8)
{
const fs_builder &bld = v->bld;
fs_reg g[16];
for (unsigned i = 0; i < ARRAY_SIZE(g); i++)
g[i] = v->vgrf(glsl_type::int_type);
@ -888,8 +868,6 @@ TEST_F(scoreboard_test, gfx125_RaR_over_different_pipes)
devinfo->verx10 = 125;
brw_init_isa_info(&compiler->isa, devinfo);
const fs_builder &bld = v->bld;
fs_reg a = v->vgrf(glsl_type::int_type);
fs_reg b = v->vgrf(glsl_type::int_type);
fs_reg f = v->vgrf(glsl_type::float_type);