From d6d0242d50f544377100383104104743bc8be75d Mon Sep 17 00:00:00 2001 From: Max Katz Date: Wed, 28 Jul 2021 15:21:18 -0600 Subject: [PATCH 1/3] Add some profiling regions to tasks in particles example --- example/particles/particles.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/example/particles/particles.cpp b/example/particles/particles.cpp index 2a37be7d6a1e..b02bcb436cd5 100644 --- a/example/particles/particles.cpp +++ b/example/particles/particles.cpp @@ -109,6 +109,8 @@ Real EstimateTimestepBlock(MeshBlockData *rc) { // first some helper tasks TaskStatus DestroySomeParticles(MeshBlock *pmb) { + Kokkos::Profiling::pushRegion("Task_Particles_DestroySomeParticles"); + auto pkg = pmb->packages.Get("particles_package"); auto swarm = pmb->swarm_data.Get()->Get("my particles"); auto rng_pool = pkg->Param("rng_pool"); @@ -133,10 +135,13 @@ TaskStatus DestroySomeParticles(MeshBlock *pmb) { // Remove marked particles swarm->RemoveMarkedParticles(); + Kokkos::Profiling::popRegion(); // Task_Particles_DestroySomeParticles return TaskStatus::complete; } TaskStatus DepositParticles(MeshBlock *pmb) { + Kokkos::Profiling::pushRegion("Task_Particles_DepositParticles"); + auto swarm = pmb->swarm_data.Get()->Get("my particles"); // Meshblock geometry @@ -186,10 +191,13 @@ TaskStatus DepositParticles(MeshBlock *pmb) { } }); + Kokkos::Profiling::popRegion(); // Task_Particles_DepositParticles return TaskStatus::complete; } TaskStatus CreateSomeParticles(MeshBlock *pmb, const double t0) { + Kokkos::Profiling::pushRegion("Task_Particles_CreateSomeParticles"); + auto pkg = pmb->packages.Get("particles_package"); auto swarm = pmb->swarm_data.Get()->Get("my particles"); auto rng_pool = pkg->Param("rng_pool"); @@ -297,11 +305,14 @@ TaskStatus CreateSomeParticles(MeshBlock *pmb, const double t0) { }); } + Kokkos::Profiling::popRegion(); // Task_Particles_CreateSomeParticles return TaskStatus::complete; } TaskStatus TransportParticles(MeshBlock *pmb, const StagedIntegrator *integrator, const double t0) { + Kokkos::Profiling::pushRegion("Task_Particles_TransportParticles"); + auto swarm = pmb->swarm_data.Get()->Get("my particles"); auto pkg = pmb->packages.Get("particles_package"); const auto orbiting_particles = pkg->Param("orbiting_particles"); @@ -417,10 +428,13 @@ TaskStatus TransportParticles(MeshBlock *pmb, const StagedIntegrator *integrator }); } + Kokkos::Profiling::popRegion(); // Task_Particles_TransportParticles return TaskStatus::complete; } TaskStatus Defrag(MeshBlock *pmb) { + Kokkos::Profiling::pushRegion("Task_Particles_Defrag"); + auto s = pmb->swarm_data.Get()->Get("my particles"); // Only do this if list is getting too sparse. This criterion (whether there @@ -429,6 +443,7 @@ TaskStatus Defrag(MeshBlock *pmb) { s->Defrag(); } + Kokkos::Profiling::popRegion(); // Task_Particles_Defrag return TaskStatus::complete; } @@ -470,6 +485,8 @@ TaskListStatus ParticleDriver::Step() { // TODO(BRR) This should really be in parthenon/src... but it can't just live in Swarm // because of the loop over blocks TaskStatus StopCommunicationMesh(const BlockList_t &blocks) { + Kokkos::Profiling::pushRegion("Task_Particles_StopCommunicationMesh"); + int num_sent_local = 0; for (auto &block : blocks) { auto sc = block->swarm_data.Get(); @@ -522,6 +539,7 @@ TaskStatus StopCommunicationMesh(const BlockList_t &blocks) { } } + Kokkos::Profiling::popRegion(); // Task_Particles_StopCommunicationMesh return TaskStatus::complete; } From d4b500993e03405b686ca95d144776a2d86e2e04 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Wed, 28 Jul 2021 15:25:16 -0600 Subject: [PATCH 2/3] CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c5faa7c15c6..6d4fca69bbc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Current develop ### Added (new features/APIs/variables/...) +- [[PR 578]](https://github.com/lanl/parthenon/pull/578) Add some profiling regions to tasks in particles example - [[PR 577]](https://github.com/lanl/parthenon/pull/577) Update invalid indices to allow for no-op loops - [[PR 564]](https://github.com/lanl/parthenon/pull/564) Add EstimateTimestep to particles example task list - [[PR 557]](https://github.com/lanl/parthenon/pull/557) Re-enable `InitMeshBlockUserData` so data can be set per-remeshing From fbd58aa8ffd3a5cb3b9d6cebd6bf230ff9432426 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Wed, 28 Jul 2021 16:11:51 -0600 Subject: [PATCH 3/3] Swarm send and receive --- src/interface/swarm_container.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/interface/swarm_container.cpp b/src/interface/swarm_container.cpp index 130f4c3b0031..46d58fc4591d 100644 --- a/src/interface/swarm_container.cpp +++ b/src/interface/swarm_container.cpp @@ -89,6 +89,8 @@ void SwarmContainer::ReceiveAndSetBoundariesWithWait() {} void SwarmContainer::SetBoundaries() {} TaskStatus SwarmContainer::Send(BoundaryCommSubset phase) { + Kokkos::Profiling::pushRegion("Task_SwarmContainer_Send"); + int success = 0, total = 0; for (auto &s : swarmVector_) { if (s->Send(phase)) { @@ -96,11 +98,15 @@ TaskStatus SwarmContainer::Send(BoundaryCommSubset phase) { } total++; } + + Kokkos::Profiling::popRegion(); // Task_SwarmContainer_Send if (success == total) return TaskStatus::complete; return TaskStatus::incomplete; } TaskStatus SwarmContainer::Receive(BoundaryCommSubset phase) { + Kokkos::Profiling::pushRegion("Task_SwarmContainer_Receive"); + int success = 0, total = 0; for (auto &s : swarmVector_) { if (s->Receive(phase)) { @@ -108,6 +114,8 @@ TaskStatus SwarmContainer::Receive(BoundaryCommSubset phase) { } total++; } + + Kokkos::Profiling::popRegion(); // Task_SwarmContainer_Receive if (success == total) return TaskStatus::complete; return TaskStatus::incomplete; }