From c52b8c2af7146deb6d1abb61dd01ea7437cd147e Mon Sep 17 00:00:00 2001
From: Luka Stanisic <luka.stanisic@inria.fr>
Date: Fri, 4 Mar 2016 10:45:04 +0100
Subject: [PATCH] improving the format of the simgrid names output
---
.../Core/FGroupTaskStarpuAlgorithm.hpp | 44 +++++++++++--------
.../StarPUUtils/FStarPUTaskNameParams.hpp | 2 +-
2 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp b/Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp
index 97271fcbb..1f62b4846 100644
--- a/Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp
+++ b/Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp
@@ -1018,10 +1018,10 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, p2mTaskNames.get(),
#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)->getSizeOfInterval(),
- tree->getCellGroup(tree->getHeight()-1,idxGroup)->getNbParticlesInGroup()),
+ tree->getCellGroup(tree->getHeight()-1,idxGroup)->getSizeOfInterval()),
#endif
#endif
0);
@@ -1080,7 +1080,8 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
task->name = m2mTaskNames[idxLevel].get();
#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,
tree->getCellGroup(idxLevel,idxGroup)->getNumberOfCellsInBlock(),
tree->getCellGroup(idxLevel,idxGroup)->getSizeOfInterval(),
@@ -1127,7 +1128,8 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
task->name = m2mTaskNames[idxLevel].get();
#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,
tree->getCellGroup(idxLevel,idxGroup)->getNumberOfCellsInBlock(),
tree->getCellGroup(idxLevel,idxGroup)->getSizeOfInterval(),
@@ -1170,7 +1172,8 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, m2lTaskNames[idxLevel].get(),
#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,
tree->getCellGroup(idxLevel,idxGroup)->getNumberOfCellsInBlock(),
tree->getCellGroup(idxLevel,idxGroup)->getSizeOfInterval()),
@@ -1205,7 +1208,8 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, m2lOuterTaskNames[idxLevel].get(),
#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,
tree->getCellGroup(idxLevel,idxGroup)->getNumberOfCellsInBlock(),
tree->getCellGroup(idxLevel,idxGroup)->getSizeOfInterval(),
@@ -1234,7 +1238,8 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, m2lOuterTaskNames[idxLevel].get(),
#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,
tree->getCellGroup(idxLevel,interactionid)->getNumberOfCellsInBlock(),
tree->getCellGroup(idxLevel,interactionid)->getSizeOfInterval(),
@@ -1307,7 +1312,8 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
task->name = l2lTaskNames[idxLevel].get();
#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,
tree->getCellGroup(idxLevel,idxGroup)->getNumberOfCellsInBlock(),
tree->getCellGroup(idxLevel,idxGroup)->getSizeOfInterval(),
@@ -1357,7 +1363,8 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
task->name = l2lTaskNames[idxLevel].get();
#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,
tree->getCellGroup(idxLevel,idxGroup)->getNumberOfCellsInBlock(),
tree->getCellGroup(idxLevel,idxGroup)->getSizeOfInterval(),
@@ -1410,13 +1417,12 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, p2pOuterTaskNames.get(),
#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)->getSizeOfInterval(),
- tree->getParticleGroup(idxGroup)->getNbParticlesInGroup(),
tree->getParticleGroup(interactionid)->getNumberOfLeavesInBlock(),
tree->getParticleGroup(interactionid)->getSizeOfInterval(),
- tree->getParticleGroup(interactionid)->getNbParticlesInGroup(),
outsideInteractions->size()),
#endif
#endif
@@ -1442,10 +1448,10 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, p2pTaskNames.get(),
#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)->getSizeOfInterval(),
- tree->getParticleGroup(idxGroup)->getNbParticlesInGroup()),
+ tree->getParticleGroup(idxGroup)->getSizeOfInterval()),
#endif
#endif
0);
@@ -1484,10 +1490,10 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, l2pTaskNames.get(),
#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)->getSizeOfInterval(),
- tree->getCellGroup(tree->getHeight()-1,idxGroup)->getNbParticlesInGroup()),
+ tree->getCellGroup(tree->getHeight()-1,idxGroup)->getSizeOfInterval()),
#endif
#endif
0);
diff --git a/Src/GroupTree/StarPUUtils/FStarPUTaskNameParams.hpp b/Src/GroupTree/StarPUUtils/FStarPUTaskNameParams.hpp
index 67e09390e..909634776 100644
--- a/Src/GroupTree/StarPUUtils/FStarPUTaskNameParams.hpp
+++ b/Src/GroupTree/StarPUUtils/FStarPUTaskNameParams.hpp
@@ -44,7 +44,7 @@ public:
name[length] = '\0';
names.push_back(name);
- fprintf(fout, "%s=", name);
+ fprintf(fout, "%s, %d, ", key, taskid);
fprintf(fout, format, args...);
return name;
--
GitLab