This is an archive of the discontinued LLVM Phabricator instance.

Differential D139376

[OpenMP] Let predefined allocator fallback to default instead of returning null
ClosedPublic

Authored by Nawrin on Dec 5 2022, 4:01 PM.

Details

Reviewers
tlwilmar
jlpeyton
jdoerfert
Commits
rGe6d2665df35a: [OpenMP] Let predefined allocator fallback to default instead of returning null

Diff Detail

Event Timeline

Nawrin created this revision.Dec 5 2022, 4:01 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 5 2022, 4:01 PM
Herald added subscribers: guansong, yaxunl. · View Herald Transcript
Nawrin requested review of this revision.Dec 5 2022, 4:01 PM
Herald added a reviewer: jdoerfert. · View Herald TranscriptDec 5 2022, 4:01 PM
Herald added a subscriber: sstefan1. · View Herald Transcript
Harbormaster completed remote builds in B201237: Diff 480270.Dec 5 2022, 4:04 PM
jdoerfert accepted this revision.Dec 5 2022, 4:14 PM

One nit, LG.

openmp/runtime/src/kmp_alloc.cpp
1659–1660
This revision is now accepted and ready to land.Dec 5 2022, 4:14 PM
Closed by commit rGe6d2665df35a: [OpenMP] Let predefined allocator fallback to default instead of returning null (authored by Nawrin). · Explain WhyDec 5 2022, 6:53 PM
This revision was automatically updated to reflect the committed changes.
Nawrin added a commit: rGe6d2665df35a: [OpenMP] Let predefined allocator fallback to default instead of returning null.

Revision Contents

PathSize
openmp/
runtime/
src/
23 lines

Diff 480313

openmp/runtime/src/kmp_alloc.cpp

Show First 20 Lines • Show All 1,555 Lines • ▼ Show 20 Linesvoid *__kmp_alloc(int gtid, size_t algn, size_t size,
size_t align = alignment; // default alignment size_t align = alignment; // default alignment
if (allocator > kmp_max_mem_alloc && al->alignment > align) if (allocator > kmp_max_mem_alloc && al->alignment > align)
align = al->alignment; // alignment required by allocator trait align = al->alignment; // alignment required by allocator trait
if (align < algn) if (align < algn)
align = algn; // max of allocator trait, parameter and sizeof(void*) align = algn; // max of allocator trait, parameter and sizeof(void*)
desc.size_orig = size; desc.size_orig = size;
desc.size_a = size + sz_desc + align; desc.size_a = size + sz_desc + align;
// Use default allocator if libmemkind is not available
int use_default_allocator = (__kmp_memkind_available) ? false : true;
if (__kmp_memkind_available) { if (__kmp_memkind_available) {
if (allocator < kmp_max_mem_alloc) { if (allocator < kmp_max_mem_alloc) {
// pre-defined allocator // pre-defined allocator
if (allocator == omp_high_bw_mem_alloc && mk_hbw_preferred) { if (allocator == omp_high_bw_mem_alloc && mk_hbw_preferred) {
ptr = kmp_mk_alloc(*mk_hbw_preferred, desc.size_a); ptr = kmp_mk_alloc(*mk_hbw_preferred, desc.size_a);
} else if (allocator == omp_large_cap_mem_alloc && mk_dax_kmem_all) { } else if (allocator == omp_large_cap_mem_alloc && mk_dax_kmem_all) {
ptr = kmp_mk_alloc(*mk_dax_kmem_all, desc.size_a); ptr = kmp_mk_alloc(*mk_dax_kmem_all, desc.size_a);
} else { } else {
▲ Show 20 Lines • Show All 62 Lines • ▼ Show 20 Lines if (KMP_IS_TARGET_MEM_ALLOC(allocator)) {
else // allocator == llvm_omp_target_device_mem_alloc else // allocator == llvm_omp_target_device_mem_alloc
ptr = kmp_target_alloc_device(size, device); ptr = kmp_target_alloc_device(size, device);
} }
return ptr; return ptr;
} }
// pre-defined allocator // pre-defined allocator
if (allocator == omp_high_bw_mem_alloc) { if (allocator == omp_high_bw_mem_alloc) {
// ptr = NULL; KMP_WARNING(OmpNoAllocator, "omp_high_bw_mem_alloc");
} else if (allocator == omp_large_cap_mem_alloc) { } else if (allocator == omp_large_cap_mem_alloc) {
// warnings? KMP_WARNING(OmpNoAllocator, "omp_large_cap_mem_alloc");
} else { } else if (allocator == omp_const_mem_alloc) {
KMP_WARNING(OmpNoAllocator, "omp_const_mem_alloc");
} else if (allocator == omp_low_lat_mem_alloc) {
KMP_WARNING(OmpNoAllocator, "omp_low_lat_mem_alloc");
} else if (allocator == omp_cgroup_mem_alloc) {
KMP_WARNING(OmpNoAllocator, "omp_cgroup_mem_alloc");
} else if (allocator == omp_pteam_mem_alloc) {
KMP_WARNING(OmpNoAllocator, "omp_pteam_mem_alloc");
} else if (allocator == omp_thread_mem_alloc) {
KMP_WARNING(OmpNoAllocator, "omp_thread_mem_alloc");
} else { // default allocator requested
use_default_allocator = true;
}
jdoerfertUnsubmitted
Not Done
ReplyInline Actions
} else { // default allocator requested
- ptr = __kmp_thread_malloc(__kmp_thread_from_gtid(gtid), desc.size_a);
- use_default_allocator = false;
+ use_default_allocator = true;
}
if (use_default_allocator) {
jdoerfert:
if (use_default_allocator) {
ptr = __kmp_thread_malloc(__kmp_thread_from_gtid(gtid), desc.size_a); ptr = __kmp_thread_malloc(__kmp_thread_from_gtid(gtid), desc.size_a);
use_default_allocator = false;
} }
} else if (KMP_IS_TARGET_MEM_SPACE(al->memspace)) { } else if (KMP_IS_TARGET_MEM_SPACE(al->memspace)) {
if (__kmp_target_mem_available) { if (__kmp_target_mem_available) {
kmp_int32 device = kmp_int32 device =
__kmp_threads[gtid]->th.th_current_task->td_icvs.default_device; __kmp_threads[gtid]->th.th_current_task->td_icvs.default_device;
if (al->memspace == llvm_omp_target_host_mem_space) if (al->memspace == llvm_omp_target_host_mem_space)
ptr = kmp_target_alloc_host(size, device); ptr = kmp_target_alloc_host(size, device);
else if (al->memspace == llvm_omp_target_shared_mem_space) else if (al->memspace == llvm_omp_target_shared_mem_space)
▲ Show 20 Lines • Show All 614 Lines • Show Last 20 Lines