Commit c52b8c2a authored by Luka Stanisic's avatar Luka Stanisic

improving the format of the simgrid names output

parent 14a6b1c0
...@@ -1018,10 +1018,10 @@ protected: ...@@ -1018,10 +1018,10 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS #ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, p2mTaskNames.get(), STARPU_NAME, p2mTaskNames.get(),
#else #else
STARPU_NAME, taskNames.print("P2M", "nb%d_i%lld_p%lld", //"P2M-nb_i"
STARPU_NAME, taskNames.print("P2M", "%d, %lld\n",
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getNumberOfCellsInBlock(), tree->getCellGroup(tree->getHeight()-1,idxGroup)->getNumberOfCellsInBlock(),
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getSizeOfInterval(), tree->getCellGroup(tree->getHeight()-1,idxGroup)->getSizeOfInterval()),
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getNbParticlesInGroup()),
#endif #endif
#endif #endif
0); 0);
...@@ -1080,7 +1080,8 @@ protected: ...@@ -1080,7 +1080,8 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS #ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
task->name = m2mTaskNames[idxLevel].get(); task->name = m2mTaskNames[idxLevel].get();
#else #else
task->name = taskNames.print("M2M", "l%d_nb%d_i%lld_nbc%d_ic%lld_s%lld", //"M2M-l_nb_i_nbc_ic_s"
task->name = taskNames.print("M2M", "%d, %d, %lld, %d, %lld, %lld\n",
idxLevel, idxLevel,
tree->getCellGroup(idxLevel,idxGroup)->getNumberOfCellsInBlock(), tree->getCellGroup(idxLevel,idxGroup)->getNumberOfCellsInBlock(),
tree->getCellGroup(idxLevel,idxGroup)->getSizeOfInterval(), tree->getCellGroup(idxLevel,idxGroup)->getSizeOfInterval(),
...@@ -1127,7 +1128,8 @@ protected: ...@@ -1127,7 +1128,8 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS #ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
task->name = m2mTaskNames[idxLevel].get(); task->name = m2mTaskNames[idxLevel].get();
#else #else
task->name = taskNames.print("M2M", "l%d_nb%d_i%lld_nbc%d_ic%lld_s%lld", //M2M-l_nb_i_nbc_ic_s
task->name = taskNames.print("M2M", "%d, %d, %lld, %d, %lld, %lld\n",
idxLevel, idxLevel,
tree->getCellGroup(idxLevel,idxGroup)->getNumberOfCellsInBlock(), tree->getCellGroup(idxLevel,idxGroup)->getNumberOfCellsInBlock(),
tree->getCellGroup(idxLevel,idxGroup)->getSizeOfInterval(), tree->getCellGroup(idxLevel,idxGroup)->getSizeOfInterval(),
...@@ -1170,7 +1172,8 @@ protected: ...@@ -1170,7 +1172,8 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS #ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, m2lTaskNames[idxLevel].get(), STARPU_NAME, m2lTaskNames[idxLevel].get(),
#else #else
STARPU_NAME, taskNames.print("M2L", "l%d_nb%d_i%lld", //"M2L-l_nb_i"
STARPU_NAME, taskNames.print("M2L", "%d, %d, %lld\n",
idxLevel, idxLevel,
tree->getCellGroup(idxLevel,idxGroup)->getNumberOfCellsInBlock(), tree->getCellGroup(idxLevel,idxGroup)->getNumberOfCellsInBlock(),
tree->getCellGroup(idxLevel,idxGroup)->getSizeOfInterval()), tree->getCellGroup(idxLevel,idxGroup)->getSizeOfInterval()),
...@@ -1205,7 +1208,8 @@ protected: ...@@ -1205,7 +1208,8 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS #ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, m2lOuterTaskNames[idxLevel].get(), STARPU_NAME, m2lOuterTaskNames[idxLevel].get(),
#else #else
STARPU_NAME, taskNames.print("M2L_out", "l%d_nb%d_i%lld_nb%d_i%lld_s%d", //"M2L_out-l_nb_i_nb_i_s
STARPU_NAME, taskNames.print("M2L_out", "%d, %d, %lld, %d, %lld, %d\n",
idxLevel, idxLevel,
tree->getCellGroup(idxLevel,idxGroup)->getNumberOfCellsInBlock(), tree->getCellGroup(idxLevel,idxGroup)->getNumberOfCellsInBlock(),
tree->getCellGroup(idxLevel,idxGroup)->getSizeOfInterval(), tree->getCellGroup(idxLevel,idxGroup)->getSizeOfInterval(),
...@@ -1234,7 +1238,8 @@ protected: ...@@ -1234,7 +1238,8 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS #ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, m2lOuterTaskNames[idxLevel].get(), STARPU_NAME, m2lOuterTaskNames[idxLevel].get(),
#else #else
STARPU_NAME, taskNames.print("M2L_out", "l%d_nb%d_i%lld_nb%d_i%lld_s%d", //"M2L_out-l_nb_i_nb_i_s"
STARPU_NAME, taskNames.print("M2L_out", "%d, %d, %lld, %d, %lld, %d\n",
idxLevel, idxLevel,
tree->getCellGroup(idxLevel,interactionid)->getNumberOfCellsInBlock(), tree->getCellGroup(idxLevel,interactionid)->getNumberOfCellsInBlock(),
tree->getCellGroup(idxLevel,interactionid)->getSizeOfInterval(), tree->getCellGroup(idxLevel,interactionid)->getSizeOfInterval(),
...@@ -1307,7 +1312,8 @@ protected: ...@@ -1307,7 +1312,8 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS #ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
task->name = l2lTaskNames[idxLevel].get(); task->name = l2lTaskNames[idxLevel].get();
#else #else
task->name = taskNames.print("L2L", "l%d_nb%d_i%lld_nbc%d_ic%lld_s%lld", //"L2L-l_nb_i_nbc_ic_s"
task->name = taskNames.print("L2L", "%d, %d, %lld, %d, %lld, %lld\n",
idxLevel, idxLevel,
tree->getCellGroup(idxLevel,idxGroup)->getNumberOfCellsInBlock(), tree->getCellGroup(idxLevel,idxGroup)->getNumberOfCellsInBlock(),
tree->getCellGroup(idxLevel,idxGroup)->getSizeOfInterval(), tree->getCellGroup(idxLevel,idxGroup)->getSizeOfInterval(),
...@@ -1357,7 +1363,8 @@ protected: ...@@ -1357,7 +1363,8 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS #ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
task->name = l2lTaskNames[idxLevel].get(); task->name = l2lTaskNames[idxLevel].get();
#else #else
task->name = taskNames.print("L2L", "l%d_nb%d_i%lld_nbc%d_ic%lld_s%lld", //"L2L-l_nb_i_nbc_ic_s"
task->name = taskNames.print("L2L", "%d, %d, %lld, %d, %lld, %lld\n",
idxLevel, idxLevel,
tree->getCellGroup(idxLevel,idxGroup)->getNumberOfCellsInBlock(), tree->getCellGroup(idxLevel,idxGroup)->getNumberOfCellsInBlock(),
tree->getCellGroup(idxLevel,idxGroup)->getSizeOfInterval(), tree->getCellGroup(idxLevel,idxGroup)->getSizeOfInterval(),
...@@ -1410,13 +1417,12 @@ protected: ...@@ -1410,13 +1417,12 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS #ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, p2pOuterTaskNames.get(), STARPU_NAME, p2pOuterTaskNames.get(),
#else #else
STARPU_NAME, taskNames.print("P2P_out", "nb%d_i%lld_p%lld_nb%d_i%lld_p%lld_s%d", //"P2P_out-nb_i_nb_i_s"
STARPU_NAME, taskNames.print("P2P_out", "%d, %lld, %d, %lld, %d\n",
tree->getParticleGroup(idxGroup)->getNumberOfLeavesInBlock(), tree->getParticleGroup(idxGroup)->getNumberOfLeavesInBlock(),
tree->getParticleGroup(idxGroup)->getSizeOfInterval(), tree->getParticleGroup(idxGroup)->getSizeOfInterval(),
tree->getParticleGroup(idxGroup)->getNbParticlesInGroup(),
tree->getParticleGroup(interactionid)->getNumberOfLeavesInBlock(), tree->getParticleGroup(interactionid)->getNumberOfLeavesInBlock(),
tree->getParticleGroup(interactionid)->getSizeOfInterval(), tree->getParticleGroup(interactionid)->getSizeOfInterval(),
tree->getParticleGroup(interactionid)->getNbParticlesInGroup(),
outsideInteractions->size()), outsideInteractions->size()),
#endif #endif
#endif #endif
...@@ -1442,10 +1448,10 @@ protected: ...@@ -1442,10 +1448,10 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS #ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, p2pTaskNames.get(), STARPU_NAME, p2pTaskNames.get(),
#else #else
STARPU_NAME, taskNames.print("P2P", "nb%d_i%lld_p%lld", //"P2P-nb_i"
STARPU_NAME, taskNames.print("P2P", "%d, %lld\n",
tree->getParticleGroup(idxGroup)->getNumberOfLeavesInBlock(), tree->getParticleGroup(idxGroup)->getNumberOfLeavesInBlock(),
tree->getParticleGroup(idxGroup)->getSizeOfInterval(), tree->getParticleGroup(idxGroup)->getSizeOfInterval()),
tree->getParticleGroup(idxGroup)->getNbParticlesInGroup()),
#endif #endif
#endif #endif
0); 0);
...@@ -1484,10 +1490,10 @@ protected: ...@@ -1484,10 +1490,10 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS #ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, l2pTaskNames.get(), STARPU_NAME, l2pTaskNames.get(),
#else #else
STARPU_NAME, taskNames.print("L2P", "nb%d_i%lld_p%lld", //"L2P-nb_i"
STARPU_NAME, taskNames.print("L2P", "%d, %lld\n",
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getNumberOfCellsInBlock(), tree->getCellGroup(tree->getHeight()-1,idxGroup)->getNumberOfCellsInBlock(),
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getSizeOfInterval(), tree->getCellGroup(tree->getHeight()-1,idxGroup)->getSizeOfInterval()),
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getNbParticlesInGroup()),
#endif #endif
#endif #endif
0); 0);
......
...@@ -44,7 +44,7 @@ public: ...@@ -44,7 +44,7 @@ public:
name[length] = '\0'; name[length] = '\0';
names.push_back(name); names.push_back(name);
fprintf(fout, "%s=", name); fprintf(fout, "%s, %d, ", key, taskid);
fprintf(fout, format, args...); fprintf(fout, format, args...);
return name; return name;
......
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