changes to print cpp

src/module.cpp

@@ -114,7 +114,7 @@ struct module_impl
 
 const operation& get_operation(instruction_ref ins) { return ins->get_operator(); }
 
-module::module(const std::string& name) : impl(std::make_unique<module_impl>())
+module::module(const std::string& name) :impl(std::make_unique<module_impl>())
 {
     impl->name = name;
 }
@@ -165,7 +165,7 @@ void module::assign(const module& m)
             auto order  = any_cast<builtin::param>(ins->get_operator()).order;
             auto s      = ins->get_shape();
             copy_ins    = impl->insert(impl->instructions.end(),
-                                    {builtin::param{name, order}, std::move(s), {}});
+                                       {builtin::param{name, order}, std::move(s), {}});
             impl->nparams++;
         }
         else if(ins->name() == "@outline")
@@ -800,8 +800,10 @@ static std::string cpp_var_name(const std::string& name)
 {
     std::string prefix = "x_";
     if(not contains(name, "@"))
-        prefix = "p_";
-    return to_c_id(prefix + replace_string(name, ":", "_module_"));
+    {
+        return to_c_id(name);
+    }
+    return to_c_id(prefix + name);
 }
 
 static void print_py_op(std::ostream& os, const operation& op)
@@ -825,8 +827,11 @@ static void print_make_op(std::ostream& os, const operation& op)
     auto v = op.to_value();
     if(not v.empty())
     {
-        os << "migraphx::make_json_op(" << enclose_name(op.name());
-        os << ", " << enclose_name(to_json_string(v));
+        os << "migraphx::make_op(" << enclose_name(op.name());
+        auto rname = "{" + replace_string(to_json_string(v), "\"", "\\\"") + "}";
+        rname      = replace_string(rname, ":", ", ");
+        rname      = replace_string(rname, "\\", "");
+        os << ", " << rname;
     }
     else
     {

src/program.cpp

@@ -1032,7 +1032,7 @@ void program::print_cpp(std::ostream& os) const
     os << "migraphx::program p;\n";
     for(auto& mod : vec_modules)
     {
-        std::string var_name = "m" + mod->name();
+        std::string var_name = mod->name();
         os << "migraphx::module_ref " << var_name << " = ";
         if(mod->name() == "main")
             os << "p.get_main_module();";