Skip to content
Merged
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions benchkit/commandwrappers/perf.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,15 @@ def _get_available_events(
sline = line.strip()

# New group section
m = re.match(r"^([-_/:A-Za-z0-9\s]+):$", sline)
m = re.match(r"^([-_/%:A-Za-z0-9\s]+):$", sline)
if m:
(group_name,) = m.groups()
current_group = group_name
events_dict[current_group] = {}
continue

# event OR alias [description] (all on one line)
m = re.match(r"([-_/:.a-zA-Z0-9]+)\s+OR\s+([-_/:.a-zA-Z0-9]+)\s*\[(.*)\]", sline)
m = re.match(r"([-_/%:.a-zA-Z0-9]+)\s+OR\s+([-_/%:.a-zA-Z0-9]+)\s*\[(.*)\]", sline)
if m:
event_left, event_right, event_desc = m.groups()
events.extend([event_left, event_right])
Expand All @@ -148,23 +148,23 @@ def _get_available_events(
continue

# event OR alias (description is on next line)
m = re.match(r"([-_/:.a-zA-Z0-9]+)\s+OR\s+([-_/:.a-zA-Z0-9]+)$", sline)
m = re.match(r"([-_/%:.a-zA-Z0-9]+)\s+OR\s+([-_/%:.a-zA-Z0-9]+)$", sline)
if m:
event_left, event_right = m.groups()
events.extend([event_left, event_right])
event_id = (event_left, event_right)
continue

# event [description] (canonical case)
m = re.match(r"([-_/:.a-zA-Z0-9]+)\s+\[(.*)\]", sline)
m = re.match(r"([-_/%:.a-zA-Z0-9]+)\s+\[(.*)\]", sline)
if m:
event_id, event_desc = m.groups()
events.append(event_id)
events_dict[current_group][event_id] = event_desc
continue

# Single event name only (description may follow)
m = re.match(r"(^[-_/:.a-zA-Z0-9]+)$", sline)
m = re.match(r"(^[-_/%:.a-zA-Z0-9]+)$", sline)
if m:
(event_id,) = m.groups()
events.append(event_id)
Expand Down