Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-use memory pool between benchmark runs #1495

Merged
merged 1 commit into from
May 9, 2023
Merged

Re-use memory pool between benchmark runs #1495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion cpp/bench/prims/common/benchmark.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,19 @@ class fixture {
raft::device_resources handle;
rmm::cuda_stream_view stream;

fixture() : stream{handle.get_stream()}
fixture(bool use_pool_memory_resource = false) : stream{handle.get_stream()}
{
// Cache memory pool between test runs, since it is expensive to create.
// This speeds up the time required to run the select_k bench by over 3x.
// This is part of the fixture class here so that the pool will get cleaned
// up, rather than outliving the benchmarks that require it.
static std::unique_ptr<using_pool_memory_res> memory_pool;
if (use_pool_memory_resource) {
if (!memory_pool) { memory_pool.reset(new using_pool_memory_res()); }
} else if (memory_pool) {
memory_pool.reset();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not following what an empty reset() is doing here. I'm reading this line as "a new memory pool is created", but your analysis shows that's not the case. Could you please explain?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This frees the memory being allocated by the memory pool - like in this case use_pool_memory_resource is false, and the empty reset will free up any previously allocated memory pool.

}

int l2_cache_size = 0;
int device_id = 0;
RAFT_CUDA_TRY(cudaGetDevice(&device_id));
Expand Down
4 changes: 2 additions & 2 deletions cpp/bench/prims/matrix/select_k.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ using namespace raft::bench; // NOLINT
template <typename KeyT, typename IdxT, select::Algo Algo>
struct selection : public fixture {
explicit selection(const select::params& p)
: params_(p),
: fixture(true),
params_(p),
in_dists_(p.batch_size * p.len, stream),
in_ids_(p.batch_size * p.len, stream),
out_dists_(p.batch_size * p.k, stream),
Expand Down Expand Up @@ -72,7 +73,6 @@ struct selection : public fixture {
void run_benchmark(::benchmark::State& state) override // NOLINT
{
device_resources handle{stream};
using_pool_memory_res res;
try {
std::ostringstream label_stream;
label_stream << params_.batch_size << "#" << params_.len << "#" << params_.k;
Expand Down
5 changes: 2 additions & 3 deletions cpp/bench/prims/neighbors/knn.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,8 @@ struct brute_force_knn {
template <typename ValT, typename IdxT, typename ImplT>
struct knn : public fixture {
explicit knn(const params& p, const TransferStrategy& strategy, const Scope& scope)
: params_(p),
: fixture(true),
params_(p),
strategy_(strategy),
scope_(scope),
dev_mem_res_(strategy == TransferStrategy::MANAGED),
Expand Down Expand Up @@ -274,8 +275,6 @@ struct knn : public fixture {
"device (TransferStrategy::NO_COPY)");
}

using_pool_memory_res default_resource;

try {
std::ostringstream label_stream;
label_stream << params_ << "#" << strategy_ << "#" << scope_;
Expand Down