Skip to content

Commit

Permalink
Create and use NVBENCH_CUDA_CALL_RESET_ERROR.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergey Pavlov committed May 29, 2024
1 parent 088c9ee commit b333e5c
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 3 deletions.
15 changes: 15 additions & 0 deletions nvbench/cuda_call.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,21 @@
} \
} while (false)

/// Throws a std::runtime_error if `call` doesn't return `cudaSuccess`.
/// Resets the error with cudaGetLastError().
#define NVBENCH_CUDA_CALL_RESET_ERROR(call) \
do \
{ \
const cudaError_t nvbench_cuda_call_error = call; \
if (nvbench_cuda_call_error != cudaSuccess) \
{ \
cudaGetLastError(); \
nvbench::cuda_call::throw_error(__FILE__, __LINE__, #call, nvbench_cuda_call_error); \
} \
} \
while (false)


namespace nvbench::cuda_call
{

Expand Down
2 changes: 1 addition & 1 deletion nvbench/detail/measure_cold.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ protected:

__forceinline__ void sync_stream() const
{
NVBENCH_CUDA_CALL(cudaStreamSynchronize(m_launch.get_stream()));
NVBENCH_CUDA_CALL_RESET_ERROR(cudaStreamSynchronize(m_launch.get_stream()));
}

void block_stream();
Expand Down
2 changes: 1 addition & 1 deletion nvbench/detail/measure_cupti.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ protected:

__forceinline__ void sync_stream() const
{
NVBENCH_CUDA_CALL(cudaStreamSynchronize(m_launch.get_stream()));
NVBENCH_CUDA_CALL_RESET_ERROR(cudaStreamSynchronize(m_launch.get_stream()));
}

nvbench::state &m_state;
Expand Down
2 changes: 1 addition & 1 deletion nvbench/detail/measure_hot.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ private:

__forceinline__ void sync_stream() const
{
NVBENCH_CUDA_CALL(cudaStreamSynchronize(m_launch.get_stream()));
NVBENCH_CUDA_CALL_RESET_ERROR(cudaStreamSynchronize(m_launch.get_stream()));
}

KernelLauncher &m_kernel_launcher;
Expand Down
1 change: 1 addition & 0 deletions testing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ set(test_srcs
named_values.cu
option_parser.cu
range.cu
reset_error.cu
ring_buffer.cu
runner.cu
state.cu
Expand Down
29 changes: 29 additions & 0 deletions testing/reset_error.cu
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#include <nvbench/cuda_call.cuh>

#include "test_asserts.cuh"

namespace
{
__global__ void multiply5(const int32_t* __restrict__ a, int32_t* __restrict__ b)
{
const auto id = blockIdx.x * blockDim.x + threadIdx.x;
b[id] = 5 * a[id];
}
}

int main()
{
multiply5<<<256, 256>>>(nullptr, nullptr);

try
{
NVBENCH_CUDA_CALL_RESET_ERROR(cudaStreamSynchronize(0));
return 1;
}
catch (const std::runtime_error &)
{
ASSERT(cudaGetLastError() == cudaError_t::cudaSuccess);
}

return 0;
}

0 comments on commit b333e5c

Please sign in to comment.