-
Notifications
You must be signed in to change notification settings - Fork 26
fix(gfx): copy subExecParam from device before reading timing data #323
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.
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
Open
fcui-amd
wants to merge
1
commit into
develop
Choose a base branch
from
users/fcui/gfx-subexecparam-host-deref-segfault
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5383,9 +5383,15 @@ static bool IsConfiguredGid(union ibv_gid const& gid) | |
| if (cfg.general.recordPerIteration) { | ||
| rss.perIterMsec.push_back(deltaMsec); | ||
| std::set<std::pair<int,int>> CUs; | ||
| // Copy subExecutor parameters back to host before reading them. | ||
| // subExecParamGpuPtr lives in device memory and is not guaranteed to be host-accessible | ||
| // (e.g. GPUs without large/resizable BAR), so dereferencing it directly can segfault. | ||
| std::vector<SubExecParam> subExecParamHost(numSubExecs); | ||
| ERR_CHECK(hipMemcpy(subExecParamHost.data(), rss.subExecParamGpuPtr, | ||
| numSubExecs * sizeof(SubExecParam), hipMemcpyDefault)); | ||
| for (int i = 0; i < numSubExecs; i++) { | ||
| CUs.insert(std::make_pair(rss.subExecParamGpuPtr[i].xccId, | ||
| GetId(rss.subExecParamGpuPtr[i].hwId))); | ||
| CUs.insert(std::make_pair(subExecParamHost[i].xccId, | ||
| GetId(subExecParamHost[i].hwId))); | ||
| } | ||
| rss.perIterCUs.push_back(CUs); | ||
| } | ||
|
|
@@ -5452,18 +5458,25 @@ static bool IsConfiguredGid(union ibv_gid const& gid) | |
| // If Transfers were combined into a single launch, figure out per-Transfer timing | ||
| // Determine timing for each of the individual transfers that were part of this launch | ||
| if (!cfg.gfx.useMultiStream) { | ||
| // Copy subExecutor parameters back to host before reading timing data. | ||
| // subExecParamGpu lives in device memory and is not guaranteed to be host-accessible | ||
| // (e.g. GPUs without large/resizable BAR), so dereferencing it directly can segfault. | ||
| std::vector<SubExecParam> subExecParamHost(exeInfo.totalSubExecs); | ||
| ERR_CHECK(hipMemcpy(subExecParamHost.data(), exeInfo.subExecParamGpu, | ||
| exeInfo.totalSubExecs * sizeof(SubExecParam), hipMemcpyDefault)); | ||
|
|
||
|
Comment on lines
+5461
to
+5467
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same as above. Gate this copy based on whether or not this GPU has largeBar support. |
||
| for (int i = 0; i < exeInfo.resources.size(); i++) { | ||
| TransferResources& rss = exeInfo.resources[i]; | ||
| int64_t minStartCycle = std::numeric_limits<int64_t>::max(); | ||
| int64_t maxStopCycle = std::numeric_limits<int64_t>::min(); | ||
| std::set<std::pair<int, int>> CUs; | ||
|
|
||
| for (auto subExecIdx : rss.subExecIdx) { | ||
| minStartCycle = std::min(minStartCycle, exeInfo.subExecParamGpu[subExecIdx].startCycle); | ||
| maxStopCycle = std::max(maxStopCycle, exeInfo.subExecParamGpu[subExecIdx].stopCycle); | ||
| minStartCycle = std::min(minStartCycle, subExecParamHost[subExecIdx].startCycle); | ||
| maxStopCycle = std::max(maxStopCycle, subExecParamHost[subExecIdx].stopCycle); | ||
| if (cfg.general.recordPerIteration) { | ||
| CUs.insert(std::make_pair(exeInfo.subExecParamGpu[subExecIdx].xccId, | ||
| GetId(exeInfo.subExecParamGpu[subExecIdx].hwId))); | ||
| CUs.insert(std::make_pair(subExecParamHost[subExecIdx].xccId, | ||
| GetId(subExecParamHost[subExecIdx].hwId))); | ||
| } | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be gated only for GPUs that do not have largeBar support, so that it doesn't change the behavior of GPUs that do have largeBar support.