[Mesa-dev] [PATCH 12/16] i965/fs: Add unit tests for cmod propagation pass.

Jason Ekstrand jason at jlekstrand.net
Tue Jan 20 15:00:27 PST 2015


I had comments on 11 and 15, but 12-14 are
Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>

On Mon, Jan 19, 2015 at 3:31 PM, Matt Turner <mattst88 at gmail.com> wrote:

> ---
>  src/mesa/drivers/dri/i965/Makefile.am              |   7 +
>  .../drivers/dri/i965/test_fs_cmod_propagation.cpp  | 271
> +++++++++++++++++++++
>  2 files changed, 278 insertions(+)
>  create mode 100644 src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp
>
> diff --git a/src/mesa/drivers/dri/i965/Makefile.am
> b/src/mesa/drivers/dri/i965/Makefile.am
> index 0420507..b74c7d7 100644
> --- a/src/mesa/drivers/dri/i965/Makefile.am
> +++ b/src/mesa/drivers/dri/i965/Makefile.am
> @@ -52,6 +52,7 @@ TEST_LIBS = \
>         ../common/libdri_test_stubs.la
>
>  TESTS = \
> +       test_fs_cmod_propagation \
>          test_eu_compact \
>         test_vf_float_conversions \
>          test_vec4_copy_propagation \
> @@ -59,6 +60,12 @@ TESTS = \
>
>  check_PROGRAMS = $(TESTS)
>
> +test_fs_cmod_propagation_SOURCES = \
> +       test_fs_cmod_propagation.cpp
> +test_fs_cmod_propagation_LDADD = \
> +       $(TEST_LIBS) \
> +       $(top_builddir)/src/gtest/libgtest.la
> +
>  test_vf_float_conversions_SOURCES = \
>         test_vf_float_conversions.cpp
>  test_vf_float_conversions_LDADD = \
> diff --git a/src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp
> b/src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp
> new file mode 100644
> index 0000000..daac9e6
> --- /dev/null
> +++ b/src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp
> @@ -0,0 +1,271 @@
> +/*
> + * 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"
> +
> +class cmod_propagation_test : public ::testing::Test {
> +   virtual void SetUp();
> +
> +public:
> +   struct brw_context *brw;
> +   struct gl_context *ctx;
> +   struct brw_wm_prog_data *prog_data;
> +   struct gl_shader_program *shader_prog;
> +   struct brw_fragment_program *fp;
> +   fs_visitor *v;
> +};
> +
> +class cmod_propagation_fs_visitor : public fs_visitor
> +{
> +public:
> +   cmod_propagation_fs_visitor(struct brw_context *brw,
> +                               struct brw_wm_prog_data *prog_data,
> +                               struct gl_shader_program *shader_prog)
> +      : fs_visitor(brw, NULL, NULL, prog_data, shader_prog, NULL, 8) {}
> +};
> +
> +
> +void cmod_propagation_test::SetUp()
> +{
> +   brw = (struct brw_context *)calloc(1, sizeof(*brw));
> +   ctx = &brw->ctx;
> +
> +   fp = ralloc(NULL, struct brw_fragment_program);
> +   prog_data = ralloc(NULL, struct brw_wm_prog_data);
> +   shader_prog = ralloc(NULL, struct gl_shader_program);
> +
> +   v = new cmod_propagation_fs_visitor(brw, prog_data, shader_prog);
> +
> +   _mesa_init_fragment_program(ctx, &fp->program, GL_FRAGMENT_SHADER, 0);
> +
> +   brw->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
> +cmod_propagation(fs_visitor *v)
> +{
> +   const bool print = false;
> +
> +   if (print) {
> +      fprintf(stderr, "= Before =\n");
> +      v->cfg->dump(v);
> +   }
> +
> +   bool ret = v->opt_cmod_propagation();
> +
> +   if (print) {
> +      fprintf(stderr, "\n= After =\n");
> +      v->cfg->dump(v);
> +   }
> +
> +   return ret;
> +}
> +
> +TEST_F(cmod_propagation_test, basic)
> +{
> +   fs_reg dest(v, glsl_type::float_type);
> +   fs_reg src0(v, glsl_type::float_type);
> +   fs_reg src1(v, glsl_type::float_type);
> +   fs_reg zero(0.0f);
> +   v->emit(BRW_OPCODE_ADD, dest, src0, src1);
> +   v->emit(BRW_OPCODE_CMP, v->reg_null_f, dest, zero)
> +      ->conditional_mod = BRW_CONDITIONAL_GE;
> +
> +   /* = Before =
> +    *
> +    * 0: add(8)        dest  src0  src1
> +    * 1: cmp.ge.f0(8)  null  dest  0.0f
> +    *
> +    * = After =
> +    * 0: add.ge.f0(8)  dest  src0  src1
> +    */
> +
> +   v->calculate_cfg();
> +   bblock_t *block0 = v->cfg->blocks[0];
> +
> +   EXPECT_EQ(0, block0->start_ip);
> +   EXPECT_EQ(1, block0->end_ip);
> +
> +   EXPECT_TRUE(cmod_propagation(v));
> +   EXPECT_EQ(0, block0->start_ip);
> +   EXPECT_EQ(0, block0->end_ip);
> +   EXPECT_EQ(BRW_OPCODE_ADD, instruction(block0, 0)->opcode);
> +   EXPECT_EQ(BRW_CONDITIONAL_GE, instruction(block0, 0)->conditional_mod);
> +}
> +
> +TEST_F(cmod_propagation_test, cmp_nonzero)
> +{
> +   fs_reg dest(v, glsl_type::float_type);
> +   fs_reg src0(v, glsl_type::float_type);
> +   fs_reg src1(v, glsl_type::float_type);
> +   fs_reg nonzero(1.0f);
> +   v->emit(BRW_OPCODE_ADD, dest, src0, src1);
> +   v->emit(BRW_OPCODE_CMP, v->reg_null_f, dest, nonzero)
> +      ->conditional_mod = BRW_CONDITIONAL_GE;
> +
> +   /* = Before =
> +    *
> +    * 0: add(8)        dest  src0  src1
> +    * 1: cmp.ge.f0(8)  null  dest  1.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);
> +}
> +
> +TEST_F(cmod_propagation_test, non_cmod_instruction)
> +{
> +   fs_reg dest(v, glsl_type::uint_type);
> +   fs_reg src0(v, glsl_type::uint_type);
> +   fs_reg zero(0u);
> +   v->emit(BRW_OPCODE_FBL, dest, src0);
> +   v->emit(BRW_OPCODE_CMP, v->reg_null_ud, dest, zero)
> +      ->conditional_mod = BRW_CONDITIONAL_GE;
> +
> +   /* = Before =
> +    *
> +    * 0: fbl(8)        dest  src0
> +    * 1: cmp.ge.f0(8)  null  dest  0u
> +    *
> +    * = 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_FBL, instruction(block0, 0)->opcode);
> +   EXPECT_EQ(BRW_OPCODE_CMP, instruction(block0, 1)->opcode);
> +   EXPECT_EQ(BRW_CONDITIONAL_GE, instruction(block0, 1)->conditional_mod);
> +}
> +
> +TEST_F(cmod_propagation_test, intervening_flag_write)
> +{
> +   fs_reg dest(v, glsl_type::float_type);
> +   fs_reg src0(v, glsl_type::float_type);
> +   fs_reg src1(v, glsl_type::float_type);
> +   fs_reg src2(v, glsl_type::float_type);
> +   fs_reg zero(0.0f);
> +   v->emit(BRW_OPCODE_ADD, dest, src0, src1);
> +   v->emit(BRW_OPCODE_CMP, v->reg_null_f, src2, zero)
> +      ->conditional_mod = BRW_CONDITIONAL_GE;
> +   v->emit(BRW_OPCODE_CMP, v->reg_null_f, dest, zero)
> +      ->conditional_mod = BRW_CONDITIONAL_GE;
> +
> +   /* = Before =
> +    *
> +    * 0: add(8)        dest  src0  src1
> +    * 1: cmp.ge.f0(8)  null  src2  0.0f
> +    * 2: cmp.ge.f0(8)  null  dest  0.0f
> +    *
> +    * = 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(cmod_propagation(v));
> +   EXPECT_EQ(0, block0->start_ip);
> +   EXPECT_EQ(2, 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);
> +   EXPECT_EQ(BRW_OPCODE_CMP, instruction(block0, 2)->opcode);
> +   EXPECT_EQ(BRW_CONDITIONAL_GE, instruction(block0, 2)->conditional_mod);
> +}
> +
> +TEST_F(cmod_propagation_test, intervening_flag_read)
> +{
> +   fs_reg dest0(v, glsl_type::float_type);
> +   fs_reg dest1(v, glsl_type::float_type);
> +   fs_reg src0(v, glsl_type::float_type);
> +   fs_reg src1(v, glsl_type::float_type);
> +   fs_reg src2(v, glsl_type::float_type);
> +   fs_reg zero(0.0f);
> +   v->emit(BRW_OPCODE_ADD, dest0, src0, src1);
> +   v->emit(BRW_OPCODE_SEL, dest1, src2, zero)
> +      ->predicate = BRW_PREDICATE_NORMAL;
> +   v->emit(BRW_OPCODE_CMP, v->reg_null_f, dest0, zero)
> +      ->conditional_mod = BRW_CONDITIONAL_GE;
> +
> +   /* = Before =
> +    *
> +    * 0: add(8)        dest0 src0  src1
> +    * 1: (+f0) sel(8)  dest1 src2  0.0f
> +    * 2: cmp.ge.f0(8)  null  dest0 0.0f
> +    *
> +    * = 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(cmod_propagation(v));
> +   EXPECT_EQ(0, block0->start_ip);
> +   EXPECT_EQ(2, block0->end_ip);
> +   EXPECT_EQ(BRW_OPCODE_ADD, instruction(block0, 0)->opcode);
> +   EXPECT_EQ(BRW_OPCODE_SEL, instruction(block0, 1)->opcode);
> +   EXPECT_EQ(BRW_PREDICATE_NORMAL, instruction(block0, 1)->predicate);
> +   EXPECT_EQ(BRW_OPCODE_CMP, instruction(block0, 2)->opcode);
> +   EXPECT_EQ(BRW_CONDITIONAL_GE, instruction(block0, 2)->conditional_mod);
> +}
> --
> 2.0.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20150120/daa7caf3/attachment-0001.html>


More information about the mesa-dev mailing list