Fix cycle counting in StatePropagatorDataGpu

Double-counting resulted in broken/truncated performance acounting
table.

Fixes #3764

diff --git a/src/gromacs/mdtypes/state_propagator_data_gpu_impl_gpu.cpp b/src/gromacs/mdtypes/state_propagator_data_gpu_impl_gpu.cpp
index e290b73f4a64f73eae4e38c1c6059e179dce6601..8737f63ba9fdd5e29121b779f8e05e4489549547 100644 (file)
--- a/src/gromacs/mdtypes/state_propagator_data_gpu_impl_gpu.cpp
+++ b/src/gromacs/mdtypes/state_propagator_data_gpu_impl_gpu.cpp
@@ -223,8 +223,6 @@ void StatePropagatorDataGpu::Impl::copyToDevice(DeviceBuffer<RVec>
     GMX_ASSERT(dataSize >= 0, "Trying to copy to device buffer before it was allocated.");
 
     GMX_ASSERT(deviceStream.isValid(), "No stream is valid for copying with given atom locality.");
-    wallcycle_start_nocount(wcycle_, ewcLAUNCH_GPU);
-    wallcycle_sub_start(wcycle_, ewcsLAUNCH_STATE_PROPAGATOR_DATA);
 
     int atomsStartAt, numAtomsToCopy;
     std::tie(atomsStartAt, numAtomsToCopy) = getAtomRangesFromAtomLocality(atomLocality);
@@ -239,9 +237,6 @@ void StatePropagatorDataGpu::Impl::copyToDevice(DeviceBuffer<RVec>
         copyToDeviceBuffer(&d_data, reinterpret_cast<const RVec*>(&h_data.data()[atomsStartAt]),
                            atomsStartAt, numAtomsToCopy, deviceStream, transferKind_, nullptr);
     }
-
-    wallcycle_sub_stop(wcycle_, ewcsLAUNCH_STATE_PROPAGATOR_DATA);
-    wallcycle_stop(wcycle_, ewcLAUNCH_GPU);
 }
 
 void StatePropagatorDataGpu::Impl::copyFromDevice(gmx::ArrayRef<gmx::RVec> h_data,
@@ -257,8 +252,6 @@ void StatePropagatorDataGpu::Impl::copyFromDevice(gmx::ArrayRef<gmx::RVec> h_dat
     GMX_ASSERT(dataSize >= 0, "Trying to copy from device buffer before it was allocated.");
 
     GMX_ASSERT(deviceStream.isValid(), "No stream is valid for copying with given atom locality.");
-    wallcycle_start_nocount(wcycle_, ewcLAUNCH_GPU);
-    wallcycle_sub_start(wcycle_, ewcsLAUNCH_STATE_PROPAGATOR_DATA);
 
     int atomsStartAt, numAtomsToCopy;
     std::tie(atomsStartAt, numAtomsToCopy) = getAtomRangesFromAtomLocality(atomLocality);
@@ -273,9 +266,6 @@ void StatePropagatorDataGpu::Impl::copyFromDevice(gmx::ArrayRef<gmx::RVec> h_dat
         copyFromDeviceBuffer(reinterpret_cast<RVec*>(&h_data.data()[atomsStartAt]), &d_data,
                              atomsStartAt, numAtomsToCopy, deviceStream, transferKind_, nullptr);
     }
-
-    wallcycle_sub_stop(wcycle_, ewcsLAUNCH_STATE_PROPAGATOR_DATA);
-    wallcycle_stop(wcycle_, ewcLAUNCH_GPU);
 }
 
 DeviceBuffer<RVec> StatePropagatorDataGpu::Impl::getCoordinates()