Commit 47c0854d authored by wsttiger's avatar wsttiger
Browse files

Initial commit failing memory coloring test / not verifying resnet18

parent 80203608
...@@ -203,9 +203,8 @@ void memory_coloring_impl::rewrite() ...@@ -203,9 +203,8 @@ void memory_coloring_impl::rewrite()
if(is_allocate(ins)) if(is_allocate(ins))
{ {
assert(!ins->inputs().empty());
p_program->replace_instruction( p_program->replace_instruction(
ins, op::load{ins->inputs().at(0)->get_shape(), offset}, scratch_param); ins, op::load{ins->get_shape(), offset}, scratch_param);
} }
else if(is_literal(ins)) else if(is_literal(ins))
{ {
......
...@@ -23,12 +23,13 @@ void copy_to_gpu(argument src, argument dst); ...@@ -23,12 +23,13 @@ void copy_to_gpu(argument src, argument dst);
struct hip_allocate struct hip_allocate
{ {
shape s;
std::string tag{}; std::string tag{};
std::string name() const { return "hip::allocate"; } std::string name() const { return "hip::allocate"; }
shape compute_shape(const std::vector<shape>& inputs) const shape compute_shape(const std::vector<shape>& inputs) const
{ {
check_shapes{inputs}.has(1); check_shapes{inputs}.has(0);
return inputs.front(); return s;
} }
argument compute(context&, const shape& output_shape, const std::vector<argument>&) const argument compute(context&, const shape& output_shape, const std::vector<argument>&) const
{ {
......
...@@ -102,8 +102,7 @@ struct miopen_apply ...@@ -102,8 +102,7 @@ struct miopen_apply
} }
else else
{ {
auto is = prog->add_outline(s); auto result = prog->insert_instruction(ins, hip_allocate{s, std::move(tag)});
auto result = prog->insert_instruction(ins, hip_allocate{std::move(tag)}, is);
return result; return result;
} }
} }
......
...@@ -37,8 +37,7 @@ void write_literals::apply(program& p) const ...@@ -37,8 +37,7 @@ void write_literals::apply(program& p) const
{ {
literal l = ins->get_literal(); literal l = ins->get_literal();
auto pre = p.add_literal(l); auto pre = p.add_literal(l);
auto s = p.add_outline(l.get_shape()); auto alloc = p.insert_instruction(std::next(pre), hip_allocate{l.get_shape()});
auto alloc = p.insert_instruction(std::next(pre), hip_allocate{}, s);
p.replace_instruction(ins, hip_copy{}, pre, alloc); p.replace_instruction(ins, hip_copy{}, pre, alloc);
} }
else else
......
...@@ -21,8 +21,8 @@ struct allocate ...@@ -21,8 +21,8 @@ struct allocate
std::string name() const { return "allocate"; } std::string name() const { return "allocate"; }
migraph::shape compute_shape(const std::vector<migraph::shape>& inputs) const migraph::shape compute_shape(const std::vector<migraph::shape>& inputs) const
{ {
migraph::check_shapes{inputs, *this}.has(1); migraph::check_shapes{inputs, *this}.has(0);
return inputs.front(); return s;
} }
migraph::argument compute(migraph::context&, migraph::argument compute(migraph::context&,
const migraph::shape& output_shape, const migraph::shape& output_shape,
...@@ -34,8 +34,7 @@ struct allocate ...@@ -34,8 +34,7 @@ struct allocate
migraph::instruction_ref add_alloc(migraph::program& p, const migraph::shape& s) migraph::instruction_ref add_alloc(migraph::program& p, const migraph::shape& s)
{ {
auto a0 = p.add_outline(s); return p.add_instruction(allocate{s});
return p.add_instruction(allocate{}, a0);
} }
bool no_allocate(const migraph::program& p) bool no_allocate(const migraph::program& p)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment