i965: Refactor SIMD16-to-2xSIMD8 checks.

[mesa.git] / src / mesa / drivers / dri / i965 / test_vec4_register_coalesce.cpp

diff --git a/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp b/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp
index 7c507f86d027b6af4158e9abfb12dff9350d0b29..0c271629c0eefff9a251918a341fece7f5f8b11a 100644 (file)
--- a/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp
+++ b/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp
@@ -23,6 +23,7 @@
 
 #include <gtest/gtest.h>
 #include "brw_vec4.h"
+#include "brw_vs.h"
 
 using namespace brw;
 
@@ -35,10 +36,9 @@ class register_coalesce_test : public ::testing::Test {
 
 public:
    struct brw_context *brw;
-   struct intel_context *intel;
    struct gl_context *ctx;
    struct gl_shader_program *shader_prog;
-   struct brw_vs_compile *c;
+   struct brw_vertex_program *vp;
    vec4_visitor *v;
 };
 
@@ -47,38 +47,48 @@ class register_coalesce_vec4_visitor : public vec4_visitor
 {
 public:
    register_coalesce_vec4_visitor(struct brw_context *brw,
-                                  struct brw_vs_compile *c,
                                   struct gl_shader_program *shader_prog)
-      : vec4_visitor(brw, c, NULL, shader_prog, NULL, NULL)
+      : vec4_visitor(brw, NULL, NULL, NULL, NULL, shader_prog,
+                     MESA_SHADER_VERTEX, NULL,
+                     false /* no_spills */,
+                     ST_NONE, ST_NONE, ST_NONE)
    {
    }
 
 protected:
    virtual dst_reg *make_reg_for_system_value(ir_variable *ir)
    {
-      assert(!"Not reached");
-      return NULL;
+      unreachable("Not reached");
    }
 
-   virtual int setup_attributes(int payload_reg)
+   virtual void setup_payload()
    {
-      assert(!"Not reached");
-      return 0;
+      unreachable("Not reached");
    }
 
    virtual void emit_prolog()
    {
-      assert(!"Not reached");
+      unreachable("Not reached");
    }
 
    virtual void emit_program_code()
    {
-      assert(!"Not reached");
+      unreachable("Not reached");
    }
 
    virtual void emit_thread_end()
    {
-      assert(!"Not reached");
+      unreachable("Not reached");
+   }
+
+   virtual void emit_urb_write_header(int mrf)
+   {
+      unreachable("Not reached");
+   }
+
+   virtual vec4_instruction *emit_urb_write_opcode(bool complete)
+   {
+      unreachable("Not reached");
    }
 };
 
@@ -86,19 +96,17 @@ protected:
 void register_coalesce_test::SetUp()
 {
    brw = (struct brw_context *)calloc(1, sizeof(*brw));
-   intel = &brw->intel;
-   ctx = &intel->ctx;
+   ctx = &brw->ctx;
 
-   c = ralloc(NULL, struct brw_vs_compile);
-   c->vp = ralloc(NULL, struct brw_vertex_program);
+   vp = ralloc(NULL, struct brw_vertex_program);
 
    shader_prog = ralloc(NULL, struct gl_shader_program);
 
-   v = new register_coalesce_vec4_visitor(brw, c, shader_prog);
+   v = new register_coalesce_vec4_visitor(brw, shader_prog);
 
-   _mesa_init_vertex_program(ctx, &c->vp->program, GL_VERTEX_SHADER, 0);
+   _mesa_init_vertex_program(ctx, &vp->program, GL_VERTEX_SHADER, 0);
 
-   intel->gen = 4;
+   brw->gen = 4;
 }
 
 static void
@@ -111,6 +119,7 @@ _register_coalesce(vec4_visitor *v, const char *func)
       v->dump_instructions();
    }
 
+   v->calculate_cfg();
    v->opt_register_coalesce();
 
    if (print) {
@@ -233,8 +242,5 @@ TEST_F(register_coalesce_test, test_channel_mul_grf)
 
    register_coalesce(v);
 
-   /* This path isn't supported yet in the reswizzling code, so we're checking
-    * that we haven't done anything bad to scalar non-DP[234]s.
-    */
-   EXPECT_NE(mul->dst.reg, to.reg);
+   EXPECT_EQ(mul->dst.reg, to.reg);
 }