Skip to content
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

[PROTON] Don't use designated initializers in CuptiPCSampling.cpp as it relates to c++20 #5291

Merged
merged 3 commits into from
Nov 30, 2024
Merged

[PROTON] Don't use designated initializers in CuptiPCSampling.cpp as it relates to c++20 #5291

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
443ee54
Don't use designated initializers in 'CuptiPCSampling.cpp' as it rela…
anmyachev Nov 29, 2024
107d9f0
address review comments
anmyachev Nov 30, 2024
09e9a32
Merge branch 'main' into amyachev/c++17
anmyachev Nov 30, 2024
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
Prev Previous commit
Next Next commit
address review comments 
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
  • Loading branch information
@anmyachev
anmyachev committed Nov 30, 2024
commit 107d9f040cbbf7a0b8aec9e44a03a96cece8d131
100 changes: 50 additions & 50 deletions third_party/proton/csrc/lib/Profiler/Cupti/CuptiPCSampling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ namespace {
uint64_t getCubinCrc(const char *cubin, size_t size) {
CUpti_GetCubinCrcParams cubinCrcParams = {
/*size=*/CUpti_GetCubinCrcParamsSize,
Copy link
Contributor

@Jokeren Jokeren Nov 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change is fine to me but I would like all the assignment comments to be changed to

/*variable name=*/

by adding an equal sign

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for review!

/*cubinSize*/ size,
/*cubin*/ cubin,
/*cubinCrc*/ 0,
/*cubinSize=*/size,
/*cubin=*/cubin,
/*cubinCrc=*/0,
};
cupti::getCubinCrc<true>(&cubinCrcParams);
return cubinCrcParams.cubinCrc;
Expand All @@ -27,10 +27,10 @@ uint64_t getCubinCrc(const char *cubin, size_t size) {
size_t getNumStallReasons(CUcontext context) {
size_t numStallReasons = 0;
CUpti_PCSamplingGetNumStallReasonsParams numStallReasonsParams = {
/*size*/ CUpti_PCSamplingGetNumStallReasonsParamsSize,
/*pPriv*/ NULL,
/*ctx*/ context,
/*numStallReasons*/ &numStallReasons};
/*size=*/CUpti_PCSamplingGetNumStallReasonsParamsSize,
/*pPriv=*/NULL,
/*ctx=*/context,
/*numStallReasons=*/&numStallReasons};
cupti::pcSamplingGetNumStallReasons<true>(&numStallReasonsParams);
return numStallReasons;
}
Expand All @@ -39,14 +39,14 @@ std::tuple<uint32_t, std::string, std::string>
getSassToSourceCorrelation(const char *functionName, uint64_t pcOffset,
const char *cubin, size_t cubinSize) {
CUpti_GetSassToSourceCorrelationParams sassToSourceParams = {
/*size*/ CUpti_GetSassToSourceCorrelationParamsSize,
/*cubin*/ cubin,
/*functionName*/ functionName,
/*cubinSize*/ cubinSize,
/*lineNumber*/ 0,
/*pcOffset*/ pcOffset,
/*fileName*/ NULL,
/*dirName*/ NULL,
/*size=*/CUpti_GetSassToSourceCorrelationParamsSize,
/*cubin=*/cubin,
/*functionName=*/functionName,
/*cubinSize=*/cubinSize,
/*lineNumber=*/0,
/*pcOffset=*/pcOffset,
/*fileName=*/NULL,
/*dirName=*/NULL,
};
// Get source can fail if the line mapping is not available in the cubin so we
// don't check the return value
Expand Down Expand Up @@ -77,12 +77,12 @@ getStallReasonNamesAndIndices(CUcontext context, size_t numStallReasons) {
static_cast<uint32_t *>(std::calloc(numStallReasons, sizeof(uint32_t)));
// Initialize the names with 128 characters to avoid buffer overflow
CUpti_PCSamplingGetStallReasonsParams stallReasonsParams = {
/*size*/ CUpti_PCSamplingGetStallReasonsParamsSize,
/*pPriv*/ NULL,
/*ctx*/ context,
/*numStallReasons*/ numStallReasons,
/*stallReasonIndex*/ stallReasonIndices,
/*stallReasons*/ stallReasonNames,
/*size=*/CUpti_PCSamplingGetStallReasonsParamsSize,
/*pPriv=*/NULL,
/*ctx=*/context,
/*numStallReasons=*/numStallReasons,
/*stallReasonIndex=*/stallReasonIndices,
/*stallReasons=*/stallReasonNames,
};
cupti::pcSamplingGetStallReasons<true>(&stallReasonsParams);
return std::make_pair(stallReasonNames, stallReasonIndices);
Expand Down Expand Up @@ -143,14 +143,14 @@ CUpti_PCSamplingData allocPCSamplingData(size_t collectNumPCs,
CUPTI_API_VERSION >= CUPTI_CUDA12_4_VERSION)
pcDataSize -= CUPTI_CUDA12_4_PC_DATA_PADDING_SIZE;
CUpti_PCSamplingData pcSamplingData{
/*size*/ pcDataSize,
/*collectNumPcs*/ collectNumPCs,
/*totalSamples*/ 0,
/*droppedSamples*/ 0,
/*totalNumPcs*/ 0,
/*remainingNumPcs*/ 0,
/*rangeId*/ 0,
/*pPcData*/
/*size=*/pcDataSize,
/*collectNumPcs=*/collectNumPCs,
/*totalSamples=*/0,
/*droppedSamples=*/0,
/*totalNumPcs=*/0,
/*remainingNumPcs=*/0,
/*rangeId=*/0,
/*pPcData=*/
static_cast<CUpti_PCSamplingPCData *>(
std::calloc(collectNumPCs, sizeof(CUpti_PCSamplingPCData)))};
for (size_t i = 0; i < collectNumPCs; ++i) {
Expand All @@ -163,47 +163,47 @@ CUpti_PCSamplingData allocPCSamplingData(size_t collectNumPCs,

void enablePCSampling(CUcontext context) {
CUpti_PCSamplingEnableParams params = {
/*size*/ CUpti_PCSamplingEnableParamsSize,
/*pPriv*/ NULL,
/*ctx*/ context,
/*size=*/CUpti_PCSamplingEnableParamsSize,
/*pPriv=*/NULL,
/*ctx=*/context,
};
cupti::pcSamplingEnable<true>(&params);
}

void disablePCSampling(CUcontext context) {
CUpti_PCSamplingDisableParams params = {
/*size*/ CUpti_PCSamplingDisableParamsSize,
/*pPriv*/ NULL,
/*ctx*/ context,
/*size=*/CUpti_PCSamplingDisableParamsSize,
/*pPriv=*/NULL,
/*ctx=*/context,
};
cupti::pcSamplingDisable<true>(&params);
}

void startPCSampling(CUcontext context) {
CUpti_PCSamplingStartParams params = {
/*size*/ CUpti_PCSamplingStartParamsSize,
/*pPriv*/ NULL,
/*ctx*/ context,
/*size=*/CUpti_PCSamplingStartParamsSize,
/*pPriv=*/NULL,
/*ctx=*/context,
};
cupti::pcSamplingStart<true>(&params);
}

void stopPCSampling(CUcontext context) {
CUpti_PCSamplingStopParams params = {
/*size*/ CUpti_PCSamplingStopParamsSize,
/*pPriv*/ NULL,
/*ctx*/ context,
/*size=*/CUpti_PCSamplingStopParamsSize,
/*pPriv=*/NULL,
/*ctx=*/context,
};
cupti::pcSamplingStop<true>(&params);
}

void getPCSamplingData(CUcontext context,
CUpti_PCSamplingData *pcSamplingData) {
CUpti_PCSamplingGetDataParams params = {
/*size*/ CUpti_PCSamplingGetDataParamsSize,
/*pPriv*/ NULL,
/*ctx*/ context,
/*pcSamplingData*/ pcSamplingData,
/*size=*/CUpti_PCSamplingGetDataParamsSize,
/*pPriv=*/NULL,
/*ctx=*/context,
/*pcSamplingData=*/pcSamplingData,
};
cupti::pcSamplingGetData<true>(&params);
}
Expand All @@ -212,11 +212,11 @@ void setConfigurationAttribute(
CUcontext context,
std::vector<CUpti_PCSamplingConfigurationInfo> &configurationInfos) {
CUpti_PCSamplingConfigurationInfoParams infoParams = {
/*size*/ CUpti_PCSamplingConfigurationInfoParamsSize,
/*pPriv*/ NULL,
/*ctx*/ context,
/*numAttributes*/ configurationInfos.size(),
/*pPCSamplingConfigurationInfo*/ configurationInfos.data(),
/*size=*/CUpti_PCSamplingConfigurationInfoParamsSize,
/*pPriv=*/NULL,
/*ctx=*/context,
/*numAttributes=*/configurationInfos.size(),
/*pPCSamplingConfigurationInfo=*/configurationInfos.data(),
};
cupti::pcSamplingSetConfigurationAttribute<true>(&infoParams);
}
Expand Down