int ret = 0;
-#define register_coalesce(v) _register_coalesce(v, __FUNCTION__)
+#define register_coalesce(v) _register_coalesce(v, __func__)
class register_coalesce_test : public ::testing::Test {
virtual void SetUp();
public:
- struct brw_context *brw;
+ struct brw_compiler *compiler;
+ struct brw_device_info *devinfo;
struct gl_context *ctx;
struct gl_shader_program *shader_prog;
struct brw_vertex_program *vp;
class register_coalesce_vec4_visitor : public vec4_visitor
{
public:
- register_coalesce_vec4_visitor(struct brw_context *brw,
+ register_coalesce_vec4_visitor(struct brw_compiler *compiler,
struct gl_shader_program *shader_prog)
- : vec4_visitor(brw, NULL, NULL, NULL, NULL, shader_prog, NULL, NULL,
- false, false /* no_spills */)
+ : vec4_visitor(compiler, NULL, NULL, NULL, NULL, shader_prog,
+ MESA_SHADER_VERTEX, NULL,
+ false /* no_spills */, -1)
{
}
protected:
- virtual dst_reg *make_reg_for_system_value(ir_variable *ir)
+ virtual dst_reg *make_reg_for_system_value(int location,
+ const glsl_type *type)
{
- assert(!"Not reached");
- return NULL;
+ unreachable("Not reached");
}
virtual void setup_payload()
{
- assert(!"Not reached");
+ 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)
{
- assert(!"Not reached");
+ unreachable("Not reached");
}
virtual vec4_instruction *emit_urb_write_opcode(bool complete)
{
- assert(!"Not reached");
+ unreachable("Not reached");
}
};
void register_coalesce_test::SetUp()
{
- brw = (struct brw_context *)calloc(1, sizeof(*brw));
- ctx = &brw->ctx;
+ ctx = (struct gl_context *)calloc(1, sizeof(*ctx));
+ compiler = (struct brw_compiler *)calloc(1, sizeof(*compiler));
+ devinfo = (struct brw_device_info *)calloc(1, sizeof(*devinfo));
+ compiler->devinfo = devinfo;
vp = ralloc(NULL, struct brw_vertex_program);
shader_prog = ralloc(NULL, struct gl_shader_program);
- v = new register_coalesce_vec4_visitor(brw, shader_prog);
+ v = new register_coalesce_vec4_visitor(compiler, shader_prog);
_mesa_init_vertex_program(ctx, &vp->program, GL_VERTEX_SHADER, 0);
- brw->gen = 4;
+ devinfo->gen = 4;
}
static void
v->dump_instructions();
}
+ v->calculate_cfg();
v->opt_register_coalesce();
if (print) {
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);
}