From 50bfeb2678e7d601fb65746cd06a58ffdb6f3651 Mon Sep 17 00:00:00 2001 From: Ed Baker Date: Wed, 21 Aug 2024 09:40:26 -0700 Subject: [PATCH] mapfile: Add ARL-H This commit adds ARL-H model ID 0xC5 to the mapfile [1]. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/x86/include/asm/intel-family.h --- mapfile.csv | 4 ++++ scripts/ci/verify_mapfile/mapfile_schema.json | 2 +- scripts/ci/verify_mapfile/verify_mapfile.py | 21 +++++++++++-------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/mapfile.csv b/mapfile.csv index 2131eb4f..931c9920 100644 --- a/mapfile.csv +++ b/mapfile.csv @@ -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,,, diff --git a/scripts/ci/verify_mapfile/mapfile_schema.json b/scripts/ci/verify_mapfile/mapfile_schema.json index 01d1eb07..65ada729 100644 --- a/scripts/ci/verify_mapfile/mapfile_schema.json +++ b/scripts/ci/verify_mapfile/mapfile_schema.json @@ -32,7 +32,7 @@ }, "Core Role Name" : { "type": "string", - "pattern": "^(Core|Atom)?$" + "pattern": "^(Core|Atom|LowPower_Atom)?$" } }, "required" : [ diff --git a/scripts/ci/verify_mapfile/verify_mapfile.py b/scripts/ci/verify_mapfile/verify_mapfile.py index ef87a7f3..7dac4002 100755 --- a/scripts/ci/verify_mapfile/verify_mapfile.py +++ b/scripts/ci/verify_mapfile/verify_mapfile.py @@ -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):