Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions flang-rt/lib/cuda/allocator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -138,23 +138,21 @@ void RTDEF(CUFRegisterAllocator)() {
void *CUFAllocPinned(
std::size_t sizeInBytes, [[maybe_unused]] std::int64_t *asyncObject) {
void *p;
CUDA_REPORT_IF_ERROR(cudaMallocHost((void **)&p, sizeInBytes));
cudaMallocHost((void **)&p, sizeInBytes);
return p;
}

void CUFFreePinned(void *p) { CUDA_REPORT_IF_ERROR(cudaFreeHost(p)); }
void CUFFreePinned(void *p) { cudaFreeHost(p); }

void *CUFAllocDevice(std::size_t sizeInBytes, std::int64_t *asyncObject) {
void *p;
if (Fortran::runtime::executionEnvironment.cudaDeviceIsManaged) {
CUDA_REPORT_IF_ERROR(
cudaMallocManaged((void **)&p, sizeInBytes, cudaMemAttachGlobal));
cudaMallocManaged((void **)&p, sizeInBytes, cudaMemAttachGlobal);
} else {
if (asyncObject == nullptr) {
CUDA_REPORT_IF_ERROR(cudaMalloc(&p, sizeInBytes));
cudaMalloc(&p, sizeInBytes);
} else {
CUDA_REPORT_IF_ERROR(
cudaMallocAsync(&p, sizeInBytes, (cudaStream_t)*asyncObject));
cudaMallocAsync(&p, sizeInBytes, (cudaStream_t)*asyncObject);
insertAllocation(p, sizeInBytes, (cudaStream_t)*asyncObject);
}
}
Expand All @@ -167,21 +165,20 @@ void CUFFreeDevice(void *p) {
if (pos >= 0) {
cudaStream_t stream = deviceAllocations[pos].stream;
eraseAllocation(pos);
CUDA_REPORT_IF_ERROR(cudaFreeAsync(p, stream));
cudaFreeAsync(p, stream);
} else {
CUDA_REPORT_IF_ERROR(cudaFree(p));
cudaFree(p);
}
}

void *CUFAllocManaged(
std::size_t sizeInBytes, [[maybe_unused]] std::int64_t *asyncObject) {
void *p;
CUDA_REPORT_IF_ERROR(
cudaMallocManaged((void **)&p, sizeInBytes, cudaMemAttachGlobal));
cudaMallocManaged((void **)&p, sizeInBytes, cudaMemAttachGlobal);
return reinterpret_cast<void *>(p);
}

void CUFFreeManaged(void *p) { CUDA_REPORT_IF_ERROR(cudaFree(p)); }
void CUFFreeManaged(void *p) { cudaFree(p); }

void *CUFAllocUnified(
std::size_t sizeInBytes, [[maybe_unused]] std::int64_t *asyncObject) {
Expand Down
Loading