-
Notifications
You must be signed in to change notification settings - Fork 773
fix possible error/crash in NCCL on x86 due to cpuid #19231
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
Merged
smoors
merged 3 commits into
easybuilders:develop
from
Flamefire:20231114131104_new_pr_NCCL2103
Nov 16, 2023
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
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
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
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
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
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
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 |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| The 2nd CPUID asm code modifies registers used by other variables due to failure to list | ||
| EBX, ECX & EDX in the "clobbers" list. | ||
| This causes corruption leading to segfaults or wrong results depending on compiler optimization/register allocation. | ||
|
|
||
| Fix by using the __cpuid GCC function. | ||
| See https://github.com/NVIDIA/nccl/pull/1070 | ||
|
|
||
| Author: Alexander Grund (TU Dresden) | ||
|
|
||
| diff --git a/src/graph/xml.cc b/src/graph/xml.cc | ||
| index 316d20f..d0d1272 100644 | ||
| --- a/src/graph/xml.cc | ||
| +++ b/src/graph/xml.cc | ||
| @@ -12,6 +12,9 @@ | ||
| #include "core.h" | ||
| #include "nvmlwrap.h" | ||
| #include "xml.h" | ||
| +#if defined(__x86_64__) | ||
| +#include <cpuid.h> | ||
| +#endif | ||
|
|
||
| /*******************/ | ||
| /* XML File Parser */ | ||
| @@ -408,7 +411,8 @@ ncclResult_t ncclTopoGetXmlFromCpu(struct ncclXmlNode* cpuNode, struct ncclXml* | ||
| char vendor[12]; | ||
| } cpuid0; | ||
|
|
||
| - asm volatile("cpuid" : "=b" (cpuid0.ebx), "=c" (cpuid0.ecx), "=d" (cpuid0.edx) : "a" (0) : "memory"); | ||
| + unsigned unused; | ||
| + __cpuid(0, unused, cpuid0.ebx, cpuid0.ecx, cpuid0.edx); | ||
| char vendor[13]; | ||
| strncpy(vendor, cpuid0.vendor, 12); | ||
| vendor[12] = '\0'; | ||
| @@ -430,7 +434,8 @@ ncclResult_t ncclTopoGetXmlFromCpu(struct ncclXmlNode* cpuNode, struct ncclXml* | ||
| }; | ||
| uint32_t val; | ||
| } cpuid1; | ||
| - asm volatile("cpuid" : "=a" (cpuid1.val) : "a" (1) : "memory"); | ||
| + unsigned unused; | ||
| + __cpuid(1, cpuid1.val, unused, unused, unused); | ||
| int familyId = cpuid1.familyId + (cpuid1.extFamilyId << 4); | ||
| int modelId = cpuid1.modelId + (cpuid1.extModelId << 4); | ||
| NCCLCHECK(xmlSetAttrInt(cpuNode, "familyid", familyId)); |
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
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
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
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.
Please restore the alternative checksum. See #18906
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.
Oh, didn't notice that. Done 👍
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.
Hitting a framework bug. Shall we resolve that first or shall I revert to non-dicts?
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.
let's get this merged first?
checksumming is quite a mess at the moment. probably better to fix this in EB-5 so breaking changes can be made, see also easybuilders/easybuild-framework#4346