From 28dd2508ebf0aef1b0a788e479d49f16ea911ef4 Mon Sep 17 00:00:00 2001 From: Treece Burgess Date: Wed, 6 Nov 2024 17:42:34 +0000 Subject: [PATCH] Add support for AMD family 25 (19h) processors in the RAPL component. Tested on Family/Model/Stepping: - 25/1/1 - 25/48/1 - 25/17/1 - 25/144/1 - 25/97/2 --- src/components/rapl/linux-rapl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/rapl/linux-rapl.c b/src/components/rapl/linux-rapl.c index 8462df649..98a137d0d 100644 --- a/src/components/rapl/linux-rapl.c +++ b/src/components/rapl/linux-rapl.c @@ -505,8 +505,8 @@ _rapl_init_component( int cidx ) msr_pkg_energy_status=MSR_AMD_PKG_ENERGY_STATUS; msr_pp0_energy_status=MSR_AMD_PP0_ENERGY_STATUS; - if (hw_info->cpuid_family!=0x17) { - /* Not a family 17h machine */ + if ((hw_info->cpuid_family!=0x17) && (hw_info->cpuid_family!=0x19)) { + /* Not a family 17h or 19h machine */ strCpy=strncpy(_rapl_vector.cmp_info.disabled_reason, "CPU family not supported",PAPI_MAX_STR_LEN); _rapl_vector.cmp_info.disabled_reason[PAPI_MAX_STR_LEN-1]=0;