Add support for AMD mobile Zen 4 (Phoenix) (#562)

* Add support for AMD mobile Zen4 (Phoenix) * Add AMD Zen4 Phoenix to other interfaces * Remove Zen4 Phoenix from hwfeatures. Conflict because file does not exist anymore in master --------- Co-authored-by: Thomas Roehl <thomas.roehl@fau.de>
RRZE-HPC · Sep 9, 2024 · d9b8904 · d9b8904
1 parent fade9ce
commit d9b8904
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git a/src/access-daemon/accessDaemon.c b/src/access-daemon/accessDaemon.c
@@ -3750,6 +3750,7 @@ int main(void)
                         allowed = allowed_amd17_zen2;
                         break;
                     case ZEN4_RYZEN:
+                    case ZEN4_RYZEN2:
                     case ZEN4_EPYC:
                         allowed = allowed_amd19_zen4;
                         break;

diff --git a/src/includes/perfmon_perfevent.h b/src/includes/perfmon_perfevent.h
@@ -193,7 +193,7 @@ int perfmon_init_perfevent(int cpu_id)
         active_cpus += 1;
     }
     perf_event_num_cpus = cpuid_topology.numHWThreads;
-    if (cpuid_info.family == ZEN3_FAMILY && (cpuid_info.model == ZEN4_RYZEN || cpuid_info.model == ZEN4_EPYC))
+    if (cpuid_info.family == ZEN3_FAMILY && (cpuid_info.model == ZEN4_RYZEN || cpuid_info.model == ZEN4_RYZEN2 || cpuid_info.model == ZEN4_EPYC))
     {
         perfEventOptionNames[EVENT_OPTION_TID] = "threadmask";
         perfEventOptionNames[EVENT_OPTION_CID] = "coreid";
@@ -901,7 +901,7 @@ int perf_uncore_setup(struct perf_event_attr *attr, RegisterType type, PerfmonEv
             }
         }
     }
-    if (type != POWER && cpuid_info.family == ZEN3_FAMILY && (cpuid_info.model == ZEN4_RYZEN || cpuid_info.model == ZEN4_EPYC))
+    if (type != POWER && cpuid_info.family == ZEN3_FAMILY && (cpuid_info.model == ZEN4_RYZEN || cpuid_info.model == ZEN4_RYZEN2 || cpuid_info.model == ZEN4_EPYC))
     {
         int got_cid = 0;
         int got_slices = 0;

diff --git a/src/includes/topology.h b/src/includes/topology.h
@@ -154,6 +154,7 @@ struct topology_functions {
 #define ZEN3_RYZEN3     0x50
 #define ZEN3_EPYC_TRENTO 0x30
 #define ZEN4_RYZEN      0x61
+#define ZEN4_RYZEN2     0x74
 #define ZEN4_EPYC       0x11
 
 /* ARM */

diff --git a/src/perfmon.c b/src/perfmon.c
@@ -1288,6 +1288,7 @@ perfmon_init_maps(void)
                     translate_types = zen3_translate_types;
                     break;
                 case ZEN4_RYZEN:
+                case ZEN4_RYZEN2:
                 case ZEN4_EPYC:
                     eventHash = zen4_arch_events;
                     perfmon_numArchEvents = perfmon_numArchEventsZen4;
@@ -1950,6 +1951,7 @@ perfmon_init_funcs(int* init_power, int* init_temp)
                     perfmon_finalizeCountersThread = perfmon_finalizeCountersThread_zen3;
                     break;
                 case ZEN4_RYZEN:
+                case ZEN4_RYZEN2:
                 case ZEN4_EPYC:
                     initThreadArch = perfmon_init_zen4;
                     initialize_power = TRUE;

diff --git a/src/power.c b/src/power.c
@@ -213,6 +213,7 @@ power_init(int cpuId)
                     }
                     break;
                 case ZEN4_RYZEN:
+                case ZEN4_RYZEN2:
                 case ZEN4_EPYC:
                     cpuid_info.turbo = 0;
                     power_info.hasRAPL = 1;
@@ -501,7 +502,7 @@ power_init(int cpuId)
             }
         }
 
-        if (cpuid_info.family == ZEN3_FAMILY && (cpuid_info.model == ZEN4_RYZEN || cpuid_info.model == ZEN4_EPYC))
+        if (cpuid_info.family == ZEN3_FAMILY && (cpuid_info.model == ZEN4_RYZEN || cpuid_info.model == ZEN4_RYZEN2 || cpuid_info.model == ZEN4_EPYC))
         {
             err = HPMread(cpuId, MSR_DEV, MSR_AMD19_RAPL_L3_UNIT, &flags);
             if (err == 0)

diff --git a/src/topology.c b/src/topology.c
@@ -1142,6 +1142,7 @@ topology_setName(void)
                     cpuid_info.short_name = short_zen3;
                     break;
                 case ZEN4_RYZEN:
+                case ZEN4_RYZEN2:
                 case ZEN4_EPYC:
                     cpuid_info.name = amd_zen4_str;
                     cpuid_info.short_name = short_zen4;