Skip to content

metadata: get_cpu_flags(): Fix it on Aarch64 #458

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
merged 1 commit into from
Sep 12, 2022
Merged

metadata: get_cpu_flags(): Fix it on Aarch64 #458

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions gprofiler/metadata/system_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,22 +146,23 @@ def get_cpu_info() -> Tuple[str, str]:
model_names = []
flags = []
for line in f:
m = re.match(r"^((?:model name)|(?:flags))[ \t]*: (.*)$", line)
m = re.match(r"^((?:model name)|(?:flags)|(?:Features))[ \t]*: (.*)$", line)
if m is not None:
field, value = m.groups()
if field == "model name":
model_names.append(value)
else:
assert field == "flags", f"unexpected field: {field!r}"
# flags in x86_64, Features in aarch64
assert field in ("flags", "Features"), f"unexpected field: {field!r}"
flags.append(value)

if len(set(model_names)) != 1:
if len(set(model_names)) > 1:
logger.warning(f"CPU model names differ between cores, reporting only the first: {model_names}")

if len(set(flags)) != 1:
if len(set(flags)) > 1:
logger.warning(f"CPU flags differ between cores, reporting only the first: {model_names}")

return model_names[0], flags[0]
return model_names[0] if len(model_names) else UNKNOWN_VALUE, flags[0] if len(flags) else UNKNOWN_VALUE
except Exception:
logger.exception("Failed to get CPU model name & flags, reporting unknown")
return UNKNOWN_VALUE, UNKNOWN_VALUE
Expand Down