diff options
author | Matt Turner <mattst88@gmail.com> | 2015-02-27 10:22:21 -0800 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2015-03-04 12:37:34 -0800 |
commit | 1e128e9b69c6336762a2b6ee5d356c763b9ae3b0 (patch) | |
tree | ef75c5e1dba051b6d4fd3efe05008af1c37deb7f /src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp | |
parent | ade0b580e75bdea227eec5345f6681b678d0811b (diff) | |
download | external_mesa3d-1e128e9b69c6336762a2b6ee5d356c763b9ae3b0.zip external_mesa3d-1e128e9b69c6336762a2b6ee5d356c763b9ae3b0.tar.gz external_mesa3d-1e128e9b69c6336762a2b6ee5d356c763b9ae3b0.tar.bz2 |
i965/fs: Don't propagate cmod to inst with different type.
Cc: 10.5 <mesa-stable@lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89317
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp')
-rw-r--r-- | src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp b/src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp index fbe4fd9..cb92abf 100644 --- a/src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp +++ b/src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp @@ -415,3 +415,37 @@ TEST_F(cmod_propagation_test, movnz) EXPECT_EQ(BRW_OPCODE_CMP, instruction(block0, 0)->opcode); EXPECT_EQ(BRW_CONDITIONAL_GE, instruction(block0, 0)->conditional_mod); } + +TEST_F(cmod_propagation_test, different_types_cmod_with_zero) +{ + 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); + fs_reg zero(0.0f); + v->emit(BRW_OPCODE_ADD, dest, src0, src1); + v->emit(BRW_OPCODE_CMP, v->reg_null_f, retype(dest, BRW_REGISTER_TYPE_F), + zero) + ->conditional_mod = BRW_CONDITIONAL_GE; + + /* = Before = + * + * 0: add(8) dest:D src0:D src1:D + * 1: cmp.ge.f0(8) null:F dest:F 0.0f + * + * = 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(cmod_propagation(v)); + EXPECT_EQ(0, block0->start_ip); + EXPECT_EQ(1, block0->end_ip); + EXPECT_EQ(BRW_OPCODE_ADD, instruction(block0, 0)->opcode); + EXPECT_EQ(BRW_OPCODE_CMP, instruction(block0, 1)->opcode); + EXPECT_EQ(BRW_CONDITIONAL_GE, instruction(block0, 1)->conditional_mod); +} |