From de2229bad401ab6ecc47a2b6702ce8a48d3d400f Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 4 Jun 2024 19:18:26 +1200
Subject: [PATCH] Support Intel MeteorLake

---
 src/PerfCounters.cc    | 4 +++-
 src/PerfCounters_x86.h | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/PerfCounters.cc b/src/PerfCounters.cc
index 24387f063b3..85ef2fd9c7b 100644
--- a/src/PerfCounters.cc
+++ b/src/PerfCounters.cc
@@ -92,7 +92,8 @@ enum CpuMicroarch {
   IntelRaptorlake,
   IntelSapphireRapid,
   IntelEmeraldRapid,
-  LastIntel = IntelEmeraldRapid,
+  IntelMeteorLake,
+  LastIntel = IntelMeteorLake,
   FirstAMD,
   AMDF15R30 = FirstAMD,
   AMDZen,
@@ -174,6 +175,7 @@ struct PmuConfig {
 static const PmuConfig pmu_configs[] = {
   { IntelEmeraldRapid, "Intel EmeraldRapid", 0x5111c4, 0, 0, 125, PMU_TICKS_RCB },
   { IntelSapphireRapid, "Intel SapphireRapid", 0x5111c4, 0, 0, 125, PMU_TICKS_RCB },
+  { IntelMeteorLake, "Intel Meteorlake", 0x5111c4, 0, 0, 125, PMU_TICKS_RCB },
   { IntelRaptorlake, "Intel Raptorlake", 0x5111c4, 0, 0, 125, PMU_TICKS_RCB },
   { IntelAlderlake, "Intel Alderlake", 0x5111c4, 0, 0, 125, PMU_TICKS_RCB },
   { IntelRocketlake, "Intel Rocketlake", 0x5111c4, 0, 0, 100, PMU_TICKS_RCB },
diff --git a/src/PerfCounters_x86.h b/src/PerfCounters_x86.h
index 123dd82079c..19bf651a792 100644
--- a/src/PerfCounters_x86.h
+++ b/src/PerfCounters_x86.h
@@ -94,6 +94,8 @@ static CpuMicroarch compute_cpu_microarch() {
       return IntelSapphireRapid;
     case 0xc06f0:
       return IntelEmeraldRapid;
+    case 0xa06a0:
+      return IntelMeteorLake;
     case 0x30f00:
       return AMDF15R30;
     case 0x00f10: // A8-3530MX, Naples, Whitehaven, Summit Ridge, Snowy Owl (Zen), Milan (Zen 3) (UNTESTED)
@@ -113,7 +115,7 @@ static CpuMicroarch compute_cpu_microarch() {
       }
       break;
     case 0x10f10: // Raven Ridge, Great Horned Owl (Zen) (UNTESTED)
-    case 0x10f80: // Banded Kestrel (Zen), Picasso (Zen+), 7975WX
+    case 0x10f80: // Banded Kestrel (Zen), Picasso (Zen+), 7975WX (Zen2)
     case 0x20f00: // Dali (Zen) (UNTESTED)
       if (ext_family == 8) {
         return AMDZen;