From b293497146fea63d76a1c7492c3a21e4e5bf8f48 Mon Sep 17 00:00:00 2001
From: Mitchell Horne <mhorne@FreeBSD.org>
Date: Wed, 18 Oct 2023 14:57:06 -0300
Subject: [PATCH] pmc.amd(3): rename from pmc.k8(3)

This is the first step in recognizing that the K8 microarchitecture
represents a small and aged subset of AMD CPUs supported by this class.
Future changes will update the code and documentation details to better
reflect this.

Keep the old filename as an alias.

Reviewed by:	jkoshy
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D41279
---
 lib/libpmc/Makefile                      | 6 +++++-
 lib/libpmc/pmc.3                         | 4 ++--
 lib/libpmc/{pmc.k8.3 => pmc.amd.3}       | 5 +++--
 lib/libpmc/pmc.atom.3                    | 2 +-
 lib/libpmc/pmc.atomsilvermont.3          | 2 +-
 lib/libpmc/pmc.cmn-600.3                 | 2 +-
 lib/libpmc/pmc.core.3                    | 2 +-
 lib/libpmc/pmc.core2.3                   | 2 +-
 lib/libpmc/pmc.corei7.3                  | 2 +-
 lib/libpmc/pmc.corei7uc.3                | 2 +-
 lib/libpmc/pmc.dmc-620.3                 | 2 +-
 lib/libpmc/pmc.haswell.3                 | 2 +-
 lib/libpmc/pmc.haswelluc.3               | 2 +-
 lib/libpmc/pmc.haswellxeon.3             | 2 +-
 lib/libpmc/pmc.iaf.3                     | 2 +-
 lib/libpmc/pmc.ivybridge.3               | 2 +-
 lib/libpmc/pmc.ivybridgexeon.3           | 2 +-
 lib/libpmc/pmc.sandybridge.3             | 2 +-
 lib/libpmc/pmc.sandybridgeuc.3           | 2 +-
 lib/libpmc/pmc.sandybridgexeon.3         | 2 +-
 lib/libpmc/pmc.soft.3                    | 2 +-
 lib/libpmc/pmc.tsc.3                     | 2 +-
 lib/libpmc/pmc.ucf.3                     | 2 +-
 lib/libpmc/pmc.westmere.3                | 2 +-
 lib/libpmc/pmc.westmereuc.3              | 2 +-
 tools/build/mk/OptionalObsoleteFiles.inc | 1 +
 26 files changed, 33 insertions(+), 27 deletions(-)
 rename lib/libpmc/{pmc.k8.3 => pmc.amd.3} (99%)

diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile
index f4c02968e806..34993a428fbd 100644
--- a/lib/libpmc/Makefile
+++ b/lib/libpmc/Makefile
@@ -62,6 +62,7 @@ MAN+=	pmclog.3
 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
@@ -76,7 +77,6 @@ MAN+=	pmc.haswellxeon.3
 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
@@ -112,4 +112,8 @@ MLINKS+= \
 	pmclog.3 pmclog_feed.3 \
 	pmclog.3 pmclog_read.3
 
+# Class aliases
+MLINKS+= \
+	pmc.amd.3 pmc.k8.3
+
 .include <bsd.lib.mk>
diff --git a/lib/libpmc/pmc.3 b/lib/libpmc/pmc.3
index 25e534e52b23..9a5b599759ff 100644
--- a/lib/libpmc/pmc.3
+++ b/lib/libpmc/pmc.3
@@ -491,7 +491,7 @@ following manual pages:
 .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
@@ -534,6 +534,7 @@ driver, applications are urged to dynamically link with the
 library.
 Doing otherwise is unsupported.
 .Sh SEE ALSO
+.Xr pmc.amd 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.core2 3 ,
@@ -543,7 +544,6 @@ Doing otherwise is unsupported.
 .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
similarity index 99%
rename from lib/libpmc/pmc.k8.3
rename to lib/libpmc/pmc.amd.3
index 29571aa1c097..ee0aae26d42f 100644
--- a/lib/libpmc/pmc.k8.3
+++ b/lib/libpmc/pmc.amd.3
@@ -21,10 +21,11 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.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
index 0819525321f4..480668e6e6bd 100644
--- a/lib/libpmc/pmc.atom.3
+++ b/lib/libpmc/pmc.atom.3
@@ -1166,11 +1166,11 @@ and the underlying hardware events used on these CPUs.
 .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
index 72baa6453565..cacee51d0e0c 100644
--- a/lib/libpmc/pmc.atomsilvermont.3
+++ b/lib/libpmc/pmc.atomsilvermont.3
@@ -504,11 +504,11 @@ The number of times the MSROM starts a flow of UOPS.
 .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
index 1fa75a674c0b..406209807301 100644
--- a/lib/libpmc/pmc.cmn-600.3
+++ b/lib/libpmc/pmc.cmn-600.3
@@ -553,6 +553,7 @@ Average latency to form a TX TLP
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
+.Xr pmc.amd 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.core2 3 ,
@@ -560,7 +561,6 @@ Average latency to form a TX TLP
 .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
index 4ee4b4c9235d..b4fa9ab661a4 100644
--- a/lib/libpmc/pmc.core.3
+++ b/lib/libpmc/pmc.core.3
@@ -782,10 +782,10 @@ may not count some transitions.
 .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
index 45e4a4c7916d..86604b7ff16c 100644
--- a/lib/libpmc/pmc.core2.3
+++ b/lib/libpmc/pmc.core2.3
@@ -1097,10 +1097,10 @@ and the underlying hardware events used.
 .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
index ab7a47e79846..32b28eb3db48 100644
--- a/lib/libpmc/pmc.corei7.3
+++ b/lib/libpmc/pmc.corei7.3
@@ -1575,11 +1575,11 @@ Counts number of segment register loads.
 .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
index ca4283e38c90..6a059d84a0f9 100644
--- a/lib/libpmc/pmc.corei7uc.3
+++ b/lib/libpmc/pmc.corei7uc.3
@@ -878,11 +878,11 @@ into a power down mode.
 .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
index 1fcd6ae9c733..f9054b637c90 100644
--- a/lib/libpmc/pmc.dmc-620.3
+++ b/lib/libpmc/pmc.dmc-620.3
@@ -123,6 +123,7 @@ The following PMC events are available:
 .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 @@ The following PMC events are available:
 .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.haswell.3 b/lib/libpmc/pmc.haswell.3
index 0e1a4623eda6..495516cf45a0 100644
--- a/lib/libpmc/pmc.haswell.3
+++ b/lib/libpmc/pmc.haswell.3
@@ -909,6 +909,7 @@ Dirty L2 cache lines evicted by demand.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
+.Xr pmc.amd 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.corei7 3 ,
@@ -917,7 +918,6 @@ Dirty L2 cache lines evicted by demand.
 .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
index 03c37995a41b..a9587c3b5604 100644
--- a/lib/libpmc/pmc.haswelluc.3
+++ b/lib/libpmc/pmc.haswelluc.3
@@ -195,13 +195,13 @@ Number of requests allocated in Coherency Tracker.
 .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
index cd6c71fd6606..e6cf65c5e6dc 100644
--- a/lib/libpmc/pmc.haswellxeon.3
+++ b/lib/libpmc/pmc.haswellxeon.3
@@ -922,6 +922,7 @@ Dirty L2 cache lines evicted by demand.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
+.Xr pmc.amd 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.corei7 3 ,
@@ -931,7 +932,6 @@ Dirty L2 cache lines evicted by demand.
 .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.iaf.3 b/lib/libpmc/pmc.iaf.3
index 0757795c95af..eaf45db140f5 100644
--- a/lib/libpmc/pmc.iaf.3
+++ b/lib/libpmc/pmc.iaf.3
@@ -121,10 +121,10 @@ CPU, use the event specifier
 .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
index 4b88f95be21c..1490b896a73c 100644
--- a/lib/libpmc/pmc.ivybridge.3
+++ b/lib/libpmc/pmc.ivybridge.3
@@ -823,13 +823,13 @@ Dirty L2 cache lines evicted by the MLC prefetcher.
 .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
index 56b2f2f62c0b..415cdf518bd6 100644
--- a/lib/libpmc/pmc.ivybridgexeon.3
+++ b/lib/libpmc/pmc.ivybridgexeon.3
@@ -856,13 +856,13 @@ Dirty L2 cache lines filling the L2.
 .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
index 5672cfbcd958..77221d985ded 100644
--- a/lib/libpmc/pmc.sandybridge.3
+++ b/lib/libpmc/pmc.sandybridge.3
@@ -902,6 +902,7 @@ Split locks in SQ.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
+.Xr pmc.amd 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.corei7 3 ,
@@ -909,7 +910,6 @@ Split locks in SQ.
 .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
index 080c9f31ffee..70ce768d9966 100644
--- a/lib/libpmc/pmc.sandybridgeuc.3
+++ b/lib/libpmc/pmc.sandybridgeuc.3
@@ -195,12 +195,12 @@ Counts the number of core-outgoing entries in the coherent tracker queue.
 .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
index 3d238bbad2de..e7bfc8c71708 100644
--- a/lib/libpmc/pmc.sandybridgexeon.3
+++ b/lib/libpmc/pmc.sandybridgexeon.3
@@ -978,6 +978,7 @@ Split locks in SQ.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
+.Xr pmc.amd 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.corei7 3 ,
@@ -986,7 +987,6 @@ Split locks in SQ.
 .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
index dcbf8d904838..08d5af63d02d 100644
--- a/lib/libpmc/pmc.soft.3
+++ b/lib/libpmc/pmc.soft.3
@@ -84,12 +84,12 @@ Write page fault.
 .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
index c613433eb0f1..4834d897f90c 100644
--- a/lib/libpmc/pmc.tsc.3
+++ b/lib/libpmc/pmc.tsc.3
@@ -57,11 +57,11 @@ The alias
 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
index 7604e915d384..a7cea6bb57f9 100644
--- a/lib/libpmc/pmc.ucf.3
+++ b/lib/libpmc/pmc.ucf.3
@@ -81,13 +81,13 @@ offset C0H under device number 0 and Function 0.
 .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
index 00aaa0b74338..231bc331894e 100644
--- a/lib/libpmc/pmc.westmere.3
+++ b/lib/libpmc/pmc.westmere.3
@@ -1367,12 +1367,12 @@ Counts number of SID integer 64 bit shift or move operations.
 .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
index 67b21ef42f84..5d6286b0e91e 100644
--- a/lib/libpmc/pmc.westmereuc.3
+++ b/lib/libpmc/pmc.westmereuc.3
@@ -1071,12 +1071,12 @@ disabled.
 .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
index 298a3b2e403e..f4eb36f50df1 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -6798,6 +6798,7 @@ OLD_FILES+=usr/sbin/pmcannotate
 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