Skip to content

Commit

Permalink
mapfile: Add ARL-H
Browse files Browse the repository at this point in the history
  • Loading branch information
edwarddavidbaker committed Sep 26, 2024
1 parent 56a2598 commit 50bfeb2
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 10 deletions.
4 changes: 4 additions & 0 deletions mapfile.csv
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,10 @@ GenuineIntel-6-B6,V0,/GRR/metrics/grandridge_metrics.json,metrics,,,
GenuineIntel-6-BD,V1.06,/LNL/events/lunarlake_skymont_core.json,hybridcore,0x20,0x000003,Atom
GenuineIntel-6-BD,V1.06,/LNL/events/lunarlake_lioncove_core.json,hybridcore,0x40,0x000003,Core
GenuineIntel-6-BD,V1.06,/LNL/events/lunarlake_uncore.json,uncore,,,
GenuineIntel-6-C5,V1.03,/ARL/events/arrowlake_skymont_core.json,hybridcore,0x20,0x000003,Atom
GenuineIntel-6-C5,V1.03,/ARL/events/arrowlake_crestmont_core.json,hybridcore,0x20,0x000002,LowPower_Atom
GenuineIntel-6-C5,V1.03,/ARL/events/arrowlake_lioncove_core.json,hybridcore,0x40,0x000003,Core
GenuineIntel-6-C5,V1.03,/ARL/events/arrowlake_uncore.json,uncore,,,
GenuineIntel-6-C6,V1.03,/ARL/events/arrowlake_skymont_core.json,hybridcore,0x20,0x000003,Atom
GenuineIntel-6-C6,V1.03,/ARL/events/arrowlake_lioncove_core.json,hybridcore,0x40,0x000003,Core
GenuineIntel-6-C6,V1.03,/ARL/events/arrowlake_uncore.json,uncore,,,
2 changes: 1 addition & 1 deletion scripts/ci/verify_mapfile/mapfile_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"Core Role Name" : {
"type": "string",
"pattern": "^(Core|Atom)?$"
"pattern": "^(Core|Atom|LowPower_Atom)?$"
}
},
"required" : [
Expand Down
21 changes: 12 additions & 9 deletions scripts/ci/verify_mapfile/verify_mapfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -254,22 +254,25 @@ def verify_mapfile_duplicate_types(perfmon_repo_path: Path):
# Filter for any rows with a matching model.
mapfile_rows = [x for x in mapfile_data if x['Family-model'] == model]

# Create a dict key based on EventType and Core Type. Otherwise, for hybrid platforms
# there would be overlapping entries for 'hybridcore'. Combinations of 'hybridcore'
# and core type should be unique.
event_and_core_types = {}
# Create a dict key based on EventType. For hybrid platforms also include Core Type
# and Native Model ID otherwise there would be overlapping entries for 'hybridcore'.
unique_entry_check = {}
for row in mapfile_rows:
event_type = row['EventType']
core_type = row['Core Type']
key = f'{event_type}_{core_type}'
native_model_id = row['Native Model ID']

key = f'{event_type}'
if event_type == 'hybridcore':
key = f'{event_type}_{core_type}_{native_model_id}'

# This row already existed if the key is present.
if key in event_and_core_types:
msg = (f'Family-model {model} includes duplicate entry for EventType={event_type} and '
f'Core Type={core_type}.')
if key in unique_entry_check:
msg = (f'Family-model {model} includes duplicate entry for EventType {event_type}. '
f'Mapfile row {row}.')
raise RuntimeError(msg)

event_and_core_types[key] = 1
unique_entry_check[key] = 1


def verify_mapfile_model_event_versions(perfmon_repo_path: Path):
Expand Down

0 comments on commit 50bfeb2

Please sign in to comment.