svn commit: r363144 - head/lib/libpmc/pmu-events/arch/x86

[Mateusz Guzik]

On 7/13/20, Alexander Motin <mav at freebsd.org> wrote:
> Author: mav
> Date: Mon Jul 13 14:25:25 2020
> New Revision: 363144
> URL: https://svnweb.freebsd.org/changeset/base/363144
>
> Log:
>   Minor textual fixes.
>
>   MFC after:	1 week
>
> Modified:
>   head/lib/libpmc/pmu-events/arch/x86/mapfile.csv
>
> Modified: head/lib/libpmc/pmu-events/arch/x86/mapfile.csv
> ==============================================================================
> --- head/lib/libpmc/pmu-events/arch/x86/mapfile.csv	Mon Jul 13 13:58:21
> 2020	(r363143)
> +++ head/lib/libpmc/pmu-events/arch/x86/mapfile.csv	Mon Jul 13 14:25:25
> 2020	(r363144)
> @@ -24,19 +24,15 @@ GenuineIntel-6-1E,v2,nehalemep,core
>  GenuineIntel-6-1F,v2,nehalemep,core
>  GenuineIntel-6-1A,v2,nehalemep,core
>  GenuineIntel-6-2E,v2,nehalemex,core
> -GenuineIntel-6-4E,v24,skylake,core
> -GenuineIntel-6-5E,v24,skylake,core
> -GenuineIntel-6-8E,v24,skylake,core
> -GenuineIntel-6-9E,v24,skylake,core
> +GenuineIntel-6-[4589]E,v24,skylake,core
>  GenuineIntel-6-37,v13,silvermont,core
>  GenuineIntel-6-4D,v13,silvermont,core
>  GenuineIntel-6-4C,v13,silvermont,core
>  GenuineIntel-6-2A,v15,sandybridge,core
>  GenuineIntel-6-2C,v2,westmereep-dp,core
> -GenuineIntel-6-2C,v2,westmereep-dp,core
>  GenuineIntel-6-25,v2,westmereep-sp,core
>  GenuineIntel-6-2F,v2,westmereex,core
> -GenuineIntel-6-55,v1,skylakex,core
> +GenuineIntel-6-55-[01234],v1,skylakex,core

This breaks hwpmc for me as it no longer recognizes the cpu.
kern.hwpmc.cpuid: GenuineIntel-6-55

>  GenuineIntel-6-55-[56789ABCDEF],v1,cascadelakex,core
>  GenuineIntel-6-7D,v1,icelake,core
>  GenuineIntel-6-7E,v1,icelake,core
>


-- 
Mateusz Guzik <mjguzik gmail.com>