Skip to content

[offload] Remove redundant checks in MappingInfoTy::lookupMapping #127638

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

Merged
kparzysz merged 2 commits into from
Feb 18, 2025
Merged

[offload] Remove redundant checks in MappingInfoTy::lookupMapping #127638

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85aa991
[offload] Remove redundant checks in MappingInfoTy::lookupMapping
kparzysz Feb 17, 2025
1015800
use OpenMP spec terminology in comments
kparzysz Feb 18, 2025
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
31 changes: 14 additions & 17 deletions offload/libomptarget/OpenMP/Mapping.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,47 +141,44 @@ LookupResult MappingInfoTy::lookupMapping(HDTTMapAccessorTy &HDTTMap,
if (HDTTMap->empty())
return LR;

// HDTTMap is std::set, ordered by HstPtrBegin.
// Upper is the first element whose HstPtrBegin > HP.
auto Upper = HDTTMap->upper_bound(HP);

if (Size == 0) {
// specification v5.1 Pointer Initialization for Device Data Environments
// upper_bound satisfies
// std::prev(upper)->HDTT.HstPtrBegin <= hp < upper->HDTT.HstPtrBegin
// HP satisfies
// std::prev(Upper)->HDTT.HstPtrBegin <= HP < Upper->HDTT.HstPtrBegin
if (Upper != HDTTMap->begin()) {
LR.TPR.setEntry(std::prev(Upper)->HDTT, OwnedTPR);
// the left side of extended address range is satisfied.
// hp >= LR.TPR.getEntry()->HstPtrBegin || hp >=
// LR.TPR.getEntry()->HstPtrBase
LR.Flags.IsContained = HP < LR.TPR.getEntry()->HstPtrEnd ||
HP < LR.TPR.getEntry()->HstPtrBase;
// We know that HP >= LR.TPR.getEntry()->HstPtrBegin
LR.Flags.IsContained = HP < LR.TPR.getEntry()->HstPtrEnd;
}

if (!LR.Flags.IsContained && Upper != HDTTMap->end()) {
LR.TPR.setEntry(Upper->HDTT, OwnedTPR);
// the right side of extended address range is satisfied.
// hp < LR.TPR.getEntry()->HstPtrEnd || hp < LR.TPR.getEntry()->HstPtrBase
// This is a special case: HP is not really contained in a mapped
// region, but it's contained in the extended mapped region, which
// suffices to get the mapping of the base pointer.
// We know that HP < LR.TPR.getEntry()->HstPtrBegin
LR.Flags.IsContained = HP >= LR.TPR.getEntry()->HstPtrBase;
}
} else {
// check the left bin
if (Upper != HDTTMap->begin()) {
LR.TPR.setEntry(std::prev(Upper)->HDTT, OwnedTPR);
// Is it contained?
LR.Flags.IsContained = HP >= LR.TPR.getEntry()->HstPtrBegin &&
HP < LR.TPR.getEntry()->HstPtrEnd &&
// We know that HP >= LR.TPR.getEntry()->HstPtrBegin
LR.Flags.IsContained = HP < LR.TPR.getEntry()->HstPtrEnd &&
(HP + Size) <= LR.TPR.getEntry()->HstPtrEnd;
// Does it extend beyond the mapped region?
LR.Flags.ExtendsAfter = HP < LR.TPR.getEntry()->HstPtrEnd &&
(HP + Size) > LR.TPR.getEntry()->HstPtrEnd;
}

// check the right bin
if (!(LR.Flags.IsContained || LR.Flags.ExtendsAfter) &&
Upper != HDTTMap->end()) {
LR.TPR.setEntry(Upper->HDTT, OwnedTPR);
// Does it extend into an already mapped region?
LR.Flags.ExtendsBefore = HP < LR.TPR.getEntry()->HstPtrBegin &&
(HP + Size) > LR.TPR.getEntry()->HstPtrBegin;
// We know that HP < LR.TPR.getEntry()->HstPtrBegin
LR.Flags.ExtendsBefore = (HP + Size) > LR.TPR.getEntry()->HstPtrBegin;
// Does it extend beyond the mapped region?
LR.Flags.ExtendsAfter = HP < LR.TPR.getEntry()->HstPtrEnd &&
(HP + Size) > LR.TPR.getEntry()->HstPtrEnd;
Expand Down