diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile --- a/lib/libpmc/Makefile +++ b/lib/libpmc/Makefile @@ -63,6 +63,7 @@ MAN+= pmc.soft.3 # PMC-dependent manual pages +MAN+= pmc.amd.3 MAN+= pmc.atom.3 MAN+= pmc.atomsilvermont.3 MAN+= pmc.cmn-600.3 @@ -77,7 +78,6 @@ MAN+= pmc.iaf.3 MAN+= pmc.ivybridge.3 MAN+= pmc.ivybridgexeon.3 -MAN+= pmc.k8.3 MAN+= pmc.sandybridge.3 MAN+= pmc.sandybridgeuc.3 MAN+= pmc.sandybridgexeon.3 @@ -113,4 +113,8 @@ pmclog.3 pmclog_feed.3 \ pmclog.3 pmclog_read.3 +# Class aliases +MLINKS+= \ + pmc.amd.3 pmc.k8.3 + .include diff --git a/lib/libpmc/pmc.haswell.3 b/lib/libpmc/pmc.haswell.3 --- a/lib/libpmc/pmc.haswell.3 +++ b/lib/libpmc/pmc.haswell.3 @@ -911,6 +911,7 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , @@ -919,7 +920,6 @@ .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.haswelluc.3 b/lib/libpmc/pmc.haswelluc.3 --- a/lib/libpmc/pmc.haswelluc.3 +++ b/lib/libpmc/pmc.haswelluc.3 @@ -197,13 +197,13 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.haswell 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.haswellxeon.3 b/lib/libpmc/pmc.haswellxeon.3 --- a/lib/libpmc/pmc.haswellxeon.3 +++ b/lib/libpmc/pmc.haswellxeon.3 @@ -924,6 +924,7 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , @@ -933,7 +934,6 @@ .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.3 b/lib/libpmc/pmc.3 --- a/lib/libpmc/pmc.3 +++ b/lib/libpmc/pmc.3 @@ -493,7 +493,7 @@ .It Em "PMC Class" Ta Em "Manual Page" .It Li PMC_CLASS_IAF Ta Xr pmc.iaf 3 .It Li PMC_CLASS_IAP Ta Xr pmc.atom 3 , Xr pmc.core 3 , Xr pmc.core2 3 -.It Li PMC_CLASS_K8 Ta Xr pmc.k8 3 +.It Li PMC_CLASS_K8 Ta Xr pmc.amd 3 .It Li PMC_CLASS_TSC Ta Xr pmc.tsc 3 .El .Ss Event Name Aliases @@ -536,6 +536,7 @@ library. Doing otherwise is unsupported. .Sh SEE ALSO +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , @@ -545,7 +546,6 @@ .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.k8.3 b/lib/libpmc/pmc.amd.3 rename from lib/libpmc/pmc.k8.3 rename to lib/libpmc/pmc.amd.3 --- a/lib/libpmc/pmc.k8.3 +++ b/lib/libpmc/pmc.amd.3 @@ -23,10 +23,11 @@ .\" .\" $FreeBSD$ .\" -.Dd October 4, 2008 -.Dt PMC.K8 3 +.Dd 24 June, 2023 +.Dt PMC.AMD 3 .Os .Sh NAME +.Nm pmc.amd .Nm pmc.k8 .Nd measurement events for .Tn AMD diff --git a/lib/libpmc/pmc.atom.3 b/lib/libpmc/pmc.atom.3 --- a/lib/libpmc/pmc.atom.3 +++ b/lib/libpmc/pmc.atom.3 @@ -1168,11 +1168,11 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atomsilvermont 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc_cpuinfo 3 , diff --git a/lib/libpmc/pmc.atomsilvermont.3 b/lib/libpmc/pmc.atomsilvermont.3 --- a/lib/libpmc/pmc.atomsilvermont.3 +++ b/lib/libpmc/pmc.atomsilvermont.3 @@ -506,11 +506,11 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc_cpuinfo 3 , diff --git a/lib/libpmc/pmc.cmn-600.3 b/lib/libpmc/pmc.cmn-600.3 --- a/lib/libpmc/pmc.cmn-600.3 +++ b/lib/libpmc/pmc.cmn-600.3 @@ -555,6 +555,7 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , @@ -562,7 +563,6 @@ .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.westmere 3 , diff --git a/lib/libpmc/pmc.core.3 b/lib/libpmc/pmc.core.3 --- a/lib/libpmc/pmc.core.3 +++ b/lib/libpmc/pmc.core.3 @@ -784,10 +784,10 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmclog 3 , diff --git a/lib/libpmc/pmc.core2.3 b/lib/libpmc/pmc.core2.3 --- a/lib/libpmc/pmc.core2.3 +++ b/lib/libpmc/pmc.core2.3 @@ -1099,10 +1099,10 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc_cpuinfo 3 , diff --git a/lib/libpmc/pmc.corei7.3 b/lib/libpmc/pmc.corei7.3 --- a/lib/libpmc/pmc.corei7.3 +++ b/lib/libpmc/pmc.corei7.3 @@ -1577,11 +1577,11 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.ucf 3 , diff --git a/lib/libpmc/pmc.corei7uc.3 b/lib/libpmc/pmc.corei7uc.3 --- a/lib/libpmc/pmc.corei7uc.3 +++ b/lib/libpmc/pmc.corei7uc.3 @@ -880,11 +880,11 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.ucf 3 , diff --git a/lib/libpmc/pmc.dmc-620.3 b/lib/libpmc/pmc.dmc-620.3 --- a/lib/libpmc/pmc.dmc-620.3 +++ b/lib/libpmc/pmc.dmc-620.3 @@ -123,6 +123,7 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , @@ -130,7 +131,6 @@ .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.westmere 3 , diff --git a/lib/libpmc/pmc.iaf.3 b/lib/libpmc/pmc.iaf.3 --- a/lib/libpmc/pmc.iaf.3 +++ b/lib/libpmc/pmc.iaf.3 @@ -123,10 +123,10 @@ .Qq iaf-instr-retired.any,usr,anythread . .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc_cpuinfo 3 , diff --git a/lib/libpmc/pmc.ivybridge.3 b/lib/libpmc/pmc.ivybridge.3 --- a/lib/libpmc/pmc.ivybridge.3 +++ b/lib/libpmc/pmc.ivybridge.3 @@ -825,13 +825,13 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.ivybridgexeon.3 b/lib/libpmc/pmc.ivybridgexeon.3 --- a/lib/libpmc/pmc.ivybridgexeon.3 +++ b/lib/libpmc/pmc.ivybridgexeon.3 @@ -858,13 +858,13 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.sandybridge.3 b/lib/libpmc/pmc.sandybridge.3 --- a/lib/libpmc/pmc.sandybridge.3 +++ b/lib/libpmc/pmc.sandybridge.3 @@ -904,6 +904,7 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , @@ -911,7 +912,6 @@ .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , .Xr pmc.soft 3 , diff --git a/lib/libpmc/pmc.sandybridgeuc.3 b/lib/libpmc/pmc.sandybridgeuc.3 --- a/lib/libpmc/pmc.sandybridgeuc.3 +++ b/lib/libpmc/pmc.sandybridgeuc.3 @@ -197,12 +197,12 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgexeon 3 , .Xr pmc.soft 3 , diff --git a/lib/libpmc/pmc.sandybridgexeon.3 b/lib/libpmc/pmc.sandybridgexeon.3 --- a/lib/libpmc/pmc.sandybridgexeon.3 +++ b/lib/libpmc/pmc.sandybridgexeon.3 @@ -980,6 +980,7 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , @@ -988,7 +989,6 @@ .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.soft 3 , diff --git a/lib/libpmc/pmc.soft.3 b/lib/libpmc/pmc.soft.3 --- a/lib/libpmc/pmc.soft.3 +++ b/lib/libpmc/pmc.soft.3 @@ -86,12 +86,12 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.tsc 3 , .Xr pmc.ucf 3 , .Xr pmc.westmereuc 3 , diff --git a/lib/libpmc/pmc.tsc.3 b/lib/libpmc/pmc.tsc.3 --- a/lib/libpmc/pmc.tsc.3 +++ b/lib/libpmc/pmc.tsc.3 @@ -59,11 +59,11 @@ maps to the TSC. .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmclog 3 , .Xr hwpmc 4 diff --git a/lib/libpmc/pmc.ucf.3 b/lib/libpmc/pmc.ucf.3 --- a/lib/libpmc/pmc.ucf.3 +++ b/lib/libpmc/pmc.ucf.3 @@ -83,13 +83,13 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.westmere 3 , diff --git a/lib/libpmc/pmc.westmere.3 b/lib/libpmc/pmc.westmere.3 --- a/lib/libpmc/pmc.westmere.3 +++ b/lib/libpmc/pmc.westmere.3 @@ -1369,12 +1369,12 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.ucf 3 , diff --git a/lib/libpmc/pmc.westmereuc.3 b/lib/libpmc/pmc.westmereuc.3 --- a/lib/libpmc/pmc.westmereuc.3 +++ b/lib/libpmc/pmc.westmereuc.3 @@ -1073,12 +1073,12 @@ .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.ucf 3 , diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -6795,6 +6795,7 @@ OLD_FILES+=usr/sbin/pmccontrol OLD_FILES+=usr/sbin/pmcstat OLD_FILES+=usr/share/man/man3/pmc.3.gz +OLD_FILES+=usr/share/man/man3/pmc.amd.3.gz OLD_FILES+=usr/share/man/man3/pmc.atom.3.gz OLD_FILES+=usr/share/man/man3/pmc.atomsilvermont.3.gz OLD_FILES+=usr/share/man/man3/pmc.core.3.gz