From 613c6120f9e906a984f1d94a0e77a81d8618909f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Szil=C3=A1rd=20P=C3=A1ll?= Date: Mon, 9 Nov 2020 10:33:38 +0000 Subject: [PATCH] Fix cycle counting in StatePropagatorDataGpu Double-counting resulted in broken/truncated performance acounting table. Fixes #3764 --- .../mdtypes/state_propagator_data_gpu_impl_gpu.cpp | 10 ---------- 1 file changed, 10 deletions(-) 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 e290b73f4a..8737f63ba9 100644 --- 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 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 copyToDeviceBuffer(&d_data, reinterpret_cast(&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 h_data, @@ -257,8 +252,6 @@ void StatePropagatorDataGpu::Impl::copyFromDevice(gmx::ArrayRef 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 h_dat copyFromDeviceBuffer(reinterpret_cast(&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 StatePropagatorDataGpu::Impl::getCoordinates() -- 2.22.0