Skip to content

Handle cpu name having colons #2155

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
mcrnobrn-amd merged 3 commits into from
Dec 11, 2025
Merged

Handle cpu name having colons #2155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7651430
Handle cpu name having colons
mcrnobrn-amd Dec 3, 2025
e378b85
Adding tests to verify
bgopesh Dec 4, 2025
11ac831
clang-format fix
bgopesh Dec 5, 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
37 changes: 23 additions & 14 deletions projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/agent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ parse_cpu_info()
for(const auto& itr : bitr)
{
auto match = sdk::parse::tokenize(itr, std::vector<std::string_view>{": "});
if(match.size() == 2)
if(match.size() >= 2)
Comment thread
mcrnobrn-amd marked this conversation as resolved.
Resolved
{
auto get_stol = [_label = std::string_view{itr}](const auto& _value) -> long {
try
Expand All @@ -153,24 +153,33 @@ parse_cpu_info()
return 0;
};

const auto& value = match.back();
// For cases with multiple colons, join all tokens after the first one
Comment thread
mcrnobrn-amd marked this conversation as resolved.
Resolved
// e.g. "model name : AMD EPYC : 100-000000248" split into
// ["model name", "AMD EPYC", "100-000000248"] with the last two tokens joined
// back together with ": "
std::string value;
if(match.size() == 2)
{
value = match.back();
}
else
{
// Join all tokens after the first one with ": " separator
for(size_t i = 1; i < match.size(); ++i)
{
if(i > 1) value += ": ";
value += match[i];
}
}

if(itr.find("vendor_id") == 0)
info_v.vendor_id = value;
else if(itr.find("model name") == 0)
{
info_v.model_name = value;
size_t first_colon_pos = value.find(':');
// This handles the case where the model name has multiple colons
// Example "model name : AMD EPYC : 100-000000248"
if(first_colon_pos != std::string::npos)
{
// Extract the model name after the first colon
info_v.model_name = value.substr(first_colon_pos + 1);
// Remove leading and trailing whitespaces
info_v.model_name =
sdk::parse::strip(std::string{info_v.model_name}, " \t\n\v\f\r");
}
info_v.model_name = value;
// Remove leading and trailing whitespaces
info_v.model_name =
sdk::parse::strip(std::string{info_v.model_name}, " \t\n\v\f\r");
}
else if(itr.find("processor") == 0)
info_v.processor = get_stol(value);
Expand Down
49 changes: 49 additions & 0 deletions projects/rocprofiler-sdk/source/lib/tests/common/parse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,52 @@ TEST(parse, strip)
test_message,
stripped_message);
}

TEST(parse, cpu_info_model_name)
{
// Simulate the logic in agent.cpp
auto parse_line = [](std::string_view line) -> std::string {
auto match = sdk::parse::tokenize(line, std::vector<std::string_view>{": "});
std::string model_name;

if(match.size() >= 2)
{
std::string value;
if(match.size() == 2)
{
value = match.back();
}
else
{
// Join all tokens after the first one with ": " separator
for(size_t i = 1; i < match.size(); ++i)
{
if(i > 1) value += ": ";
value += match[i];
}
}

if(line.find("model name") == 0)
{
model_name = value;
// Remove leading and trailing whitespaces
model_name = sdk::parse::strip(std::string{model_name}, " \t\n\v\f\r");
}
}
return model_name;
};

// Case 1: Normal model name
{
const auto* line = "model name : AMD EPYC 7742 64-Core Processor";
auto name = parse_line(line);
EXPECT_EQ(name, "AMD EPYC 7742 64-Core Processor");
}

// Case 2: Model name with colons (The bug fix case)
{
const auto* line = "model name : AMD EPYC : 100-000000248";
auto name = parse_line(line);
EXPECT_EQ(name, "AMD EPYC : 100-000000248");
}
}
Loading