i386: Remove perfmon performance monitoring facility

Remove the perfmon performance monitoring facility that was for Intel
Pentium and Pentium Pro processors.

Reviewed by: imp,mhorne,emaste
Pull Request: https://github.com/freebsd/freebsd-src/pull/2155

share/examples/Makefile

@@ -22,7 +22,6 @@ LDIRS=	BSD_daemon \
 	mdoc \
 	netgraph \
 	oci \
-	perfmon \
 	ppi \
 	ppp \
 	ses \
@@ -202,12 +201,6 @@ SE_OCI= \
 	README \
 	Containerfile.pkg
 
-SE_DIRS+=	perfmon
-SE_PERFMON= \
-	Makefile \
-	README \
-	perfmon.c \
-
 .if ${MK_PF} != "no"
 SE_DIRS+=	pf
 .if ${MK_STAGING} == "no"

share/examples/perfmon/Makefile

@@ -1,8 +0,0 @@
-PACKAGE=examples
-FILESDIR=${SHAREDIR}/examples/${PROG}
-PROG=	perfmon
-MAN=
-
-install:
-
-.include <bsd.prog.mk>

share/examples/perfmon/README

@@ -1,23 +0,0 @@
-`perfmon' is a sample program to access the performance-monitoring
-counters on Pentium and Pentium Pro CPUs.  See perfmon(4) for a
-description of this facility.
-
-The program takes the following options:
-
-	-u	count events in user mode
-	-o	count events in kernel mode
-		(these two can be combined)
-
-	-e	count events, not duration
-	-l n	run `n' loops (default 50)
-	-s n	sleep `n' seconds between loop iterations (default 0)
-
-The following options are not implemented on Pentium CPUs:
-
-	-m n	use count mask `n'
-	-i	invert sense of count mask comparison
-	-U n	use unit mask `n'
-
-There is one mandatory argument, which is the event number to be
-monitored, defined in <machine/perfmon.h>.  All numbers can be
-specified in any format acceptable to strtol(3).

share/examples/perfmon/perfmon.c

@@ -1,191 +0,0 @@
-/*
- * Copyright 1996 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
-#include <machine/cpu.h>
-#include <machine/perfmon.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <err.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <errno.h>
-
-static int getnum(const char *, int, int);
-static void usage(const char *) __dead2;
-
-int
-main(int argc, char **argv)
-{
-	int c, fd, num;
-	int loops, i, sleeptime;
-	char *cmd;
-	struct pmc pmc;
-	struct pmc_tstamp then, now;
-	struct pmc_data value;
-	quad_t *buf;
-	double total;
-
-	pmc.pmc_num = 0;
-	pmc.pmc_event = 0;
-	pmc.pmc_unit = 0;
-	pmc.pmc_flags = 0;
-	pmc.pmc_mask = 0;
-	cmd = NULL;
-	loops = 50;
-	sleeptime = 0;
-
-	while ((c = getopt(argc, argv, "s:l:uoeiU:m:c:")) != -1) {
-		switch(c) {
-		case 'u':
-			pmc.pmc_flags |= PMCF_USR;
-			break;
-		case 'o':
-			pmc.pmc_flags |= PMCF_OS;
-			break;
-		case 'e':
-			pmc.pmc_flags |= PMCF_E;
-			break;
-		case 'i':
-			pmc.pmc_flags |= PMCF_INV;
-			break;
-		case 'U':
-			pmc.pmc_unit = getnum(optarg, 0, 256);
-			break;
-		case 'm':
-			pmc.pmc_mask = getnum(optarg, 0, 256);
-			break;
-		case 'l':
-			loops = getnum(optarg, 1, INT_MAX - 1);
-			break;
-		case 's':
-			sleeptime = getnum(optarg, 0, INT_MAX - 1);
-			break;
-		case 'c':
-			cmd = optarg;
-			break;
-		default:
-			usage(argv[0]);
-		}
-	}
-
-	if (argc - optind != 1)
-		usage(argv[0]);
-
-	pmc.pmc_event = getnum(argv[optind], 0, 255);
-
-	buf = malloc((loops + 1) * sizeof *buf);
-	if (!buf)
-		err(1, "malloc(%lu)", (unsigned long)(loops +1) * sizeof *buf);
-
-	fd = open(_PATH_PERFMON, O_RDWR, 0);
-	if (fd < 0)
-		err(1, "open: " _PATH_PERFMON);
-
-	if (ioctl(fd, PMIOSETUP, &pmc) < 0)
-		err(1, "ioctl(PMIOSETUP)");
-
-	if (ioctl(fd, PMIOTSTAMP, &then) < 0)
-		err(1, "ioctl(PMIOTSTAMP)");
-
-	num = 0;
-	if (ioctl(fd, PMIOSTART, &num) < 0)
-		err(1, "ioctl(PMIOSTART)");
-
-	value.pmcd_num = 0;
-	for (i = 0; i < loops; i++) {
-		if (ioctl(fd, PMIOSTOP, &num) < 0)
-			err(1, "ioctl(PMIOSTOP)");
-		if (ioctl(fd, PMIOREAD, &value) < 0)
-			err(1, "ioctl(PMIOREAD)");
-		buf[i] = value.pmcd_value;
-		if (ioctl(fd, PMIORESET, &value.pmcd_num) < 0)
-			err(1, "ioctl(PMIORESET)");
-		if (ioctl(fd, PMIOSTART, &num) < 0)
-			err(1, "ioctl(PMIOSTART)");
-		if (sleeptime)
-			sleep(sleeptime);
-		if (cmd)
-			system(cmd);
-	}
-
-	if (ioctl(fd, PMIOSTOP, &num) < 0)
-		err(1, "ioctl(PMIOSTOP)");
-	if (ioctl(fd, PMIOREAD, &value) < 0)
-		err(1, "ioctl(PMIOREAD)");
-	buf[i] = value.pmcd_value;
-	if (ioctl(fd, PMIOTSTAMP, &now) < 0)
-		err(1, "ioctl(PMIOTSTAMP)");
-
-	total = 0;
-	for (i = 1; i <= loops; i++) {
-		printf("%d: %qd\n", i, buf[i]);
-		total += buf[i];
-	}
-	printf("total: %f\nmean: %f\n", total, total / loops);
-
-	printf("clocks (at %d-MHz): %qd\n", now.pmct_rate,
-	       now.pmct_value - then.pmct_value);
-
-	return 0;
-}
-
-static int
-getnum(const char *buf, int min, int max)
-{
-	char *ep;
-	long l;
-
-	errno = 0;
-	l = strtol(buf, &ep, 0);
-	if (*buf && !*ep && !errno) {
-		if (l < min || l > max) {
-			errx(1, "%s: must be between %d and %d", 
-			     buf, min, max);
-		}
-		return (int)l;
-	} 
-
-	errx(1, "%s: parameter must be an integer", buf);
-}
-
-static void
-usage(const char *pname)
-{
-	fprintf(stderr, 
-	"usage: %s [-eiou] [-c command] [-l nloops] [-m mask] [-s sleeptime]\n"
-	"       [-U unit] counter\n",
-		pname);
-	exit(1);
-}

share/man/man4/man4.i386/Makefile

@@ -6,7 +6,6 @@ MAN=	apm.4 \
 	npx.4 \
 	pae.4 \
 	pbio.4 \
-	perfmon.4 \
 	pnp.4 \
 	pnpbios.4 \
 	sbni.4 \

share/man/man4/man4.i386/perfmon.4

@@ -1,211 +0,0 @@
-.\"
-.\" Copyright 1996 Massachusetts Institute of Technology
-.\"
-.\" Permission to use, copy, modify, and distribute this software and
-.\" its documentation for any purpose and without fee is hereby
-.\" granted, provided that both the above copyright notice and this
-.\" permission notice appear in all copies, that both the above
-.\" copyright notice and this permission notice appear in all
-.\" supporting documentation, and that the name of M.I.T. not be used
-.\" in advertising or publicity pertaining to distribution of the
-.\" software without specific, written prior permission.  M.I.T. makes
-.\" no representations about the suitability of this software for any
-.\" purpose.  It is provided "as is" without express or implied
-.\" warranty.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
-.\" ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
-.\" SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-.\" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-.\" USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-.\" ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.Dd March 26, 1996
-.Dt PERFMON 4 i386
-.Os
-.Sh NAME
-.Nm perfmon
-.Nd CPU performance-monitoring interface
-.Sh SYNOPSIS
-.Cd cpu I586_CPU
-.Cd cpu I686_CPU
-.Cd options PERFMON
-.Sh DESCRIPTION
-The
-.Nm
-driver provides access to the internal performance-monitoring
-capabilities of the
-.Tn Intel
-.Tn Pentium
-and
-.Tn "Pentium Pro"
-CPUs.
-These processors implement two internal counters which can be
-configured to measure a variety of events for either count or duration
-(in CPU cycles), as well as a cycle counter which counts clock cycles.
-The
-.Nm
-driver provides a device-style interface to these capabilities.
-.Pp
-All access to the performance-monitoring counters is performed through
-the special device file
-.Dq Pa /dev/perfmon .
-This device supports a number of
-.Xr ioctl 2
-requests, defined in
-.In machine/perfmon.h
-along with the definitions of the various counters for both
-.Tn Pentium
-and
-.Tn "Pentium Pro"
-processors.
-.Pp
-.Sy NOTA BENE :
-The set of available events differs from processor to processor.
-It
-is the responsibility of the programmer to ensure that the event
-numbers used are the correct ones for the CPU type being measured.
-.Pp
-The following
-.Xr ioctl 2
-requests are defined:
-.Bl -tag -width PMIOTSTAMP
-.It Dv PMIOSETUP
-.Pq Li "struct pmc"
-Set up a counter with parameters and flags defined in the structure.
-The following fields are defined in
-.Li struct pmc :
-.Bl -tag -width "u_char pmc_eventx"
-.It Li "int pmc_num"
-the number of the counter in question; must be less than
-.Dv NPMC
-(currently 2).
-.It Li "u_char pmc_event"
-the particular event number to be monitored, as defined in
-.In machine/perfmon.h .
-.It Li "u_char pmc_unit"
-the unit mask value, specific to the event type (see the
-.Tn Intel
-documentation).
-.It Li "u_char pmc_flags"
-flags modifying the operation of the counter (see below).
-.It Li "u_char pmc_mask"
-the counter mask value; essentially, this is a threshold used to
-restrict the count to events lasting more (or less) than the specified
-number of clocks.
-.El
-.Pp
-The following
-.Li pmc_flags
-values are defined:
-.Bl -tag -compact -width PMCF_USRxx
-.It Dv PMCF_USR
-count events in user mode
-.It Dv PMCF_OS
-count events in kernel mode
-.It Dv PMCF_E
-count number of events rather than their duration
-.It Dv PMCF_INV
-invert the sense of the counter mask comparison
-.El
-.It Dv PMIOGET
-.Pq Li "struct pmc"
-returns the current configuration of the specified counter.
-.It Dv PMIOSTART
-.It Dv PMIOSTOP
-.Pq Li int
-starts (stops) the specified counter.
-Due to hardware deficiencies,
-counters must be started and stopped in numerical order.
-(That is to
-say, counter 0 can never be stopped without first stopping counter 1.)
-The driver will
-.Em not
-enforce this restriction (since it may not be present in future CPUs).
-.It Dv PMIORESET
-.Pq Li int
-reset the specified counter to zero.
-The counter should be stopped
-with
-.Dv PMIOSTOP
-before it is reset.
-All counters are automatically reset by
-.Dv PMIOSETUP .
-.It Dv PMIOREAD
-.Pq Li "struct pmc_data"
-get the current value of the counter.
-The
-.Li pmc_data
-structure defines two fields:
-.Pp
-.Bl -tag -compact -width "quad_t pmcd_value"
-.It Li "int pmcd_num"
-the number of the counter to read
-.It Li "quad_t pmcd_value"
-the resulting value as a 64-bit signed integer
-.El
-.Pp
-In the future, it may be possible to use the
-.Li RDPMC
-instruction on
-.Tn "Pentium Pro"
-processors to read the counters directly.
-.It Dv PMIOTSTAMP
-.Pq Li "struct pmc_tstamp"
-read the time stamp counter.
-The
-.Li pmc_tstamp
-structure defines two fields:
-.Pp
-.Bl -tag -compact -width "quad_t pmct_value"
-.It Li "int pmct_rate"
-the approximate rate of the counter, in MHz
-.It Li "quad_t pmct_value"
-the current value of the counter as a 64-bit integer
-.El
-.Pp
-It is important to note that the counter rate, as provided in the
-.Li pmct_rate
-field, is often incorrect because of calibration difficulties and
-non-integral clock rates.
-This field should be considered more of a
-hint or sanity-check than an actual representation of the rate of
-clock ticks.
-.El
-.Sh FILES
-.Bl -tag -compact -width "/usr/include/machine/perfmon.h"
-.It Pa /dev/perfmon
-character device interface to counters
-.It Pa /usr/include/machine/perfmon.h
-include file with definitions of structures and event types
-.It Pa /usr/share/examples/perfmon
-sample source code demonstrating use of all the
-.Fn ioctl
-commands
-.El
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr hwpmc 4
-.Rs
-.%A Intel Corporation
-.%B Pentium Pro Family Developer's Manual
-.%D January 1996
-.%V vol. 3
-.%O Operating System Writer's Manual
-.Re
-.Sh HISTORY
-The
-.Nm
-device first appeared in
-.Fx 2.2 .
-.Sh AUTHORS
-The
-.Nm
-driver was written by
-.An Garrett A. Wollman ,
-MIT Laboratory for Computer Science.

share/man/man7/clocks.7

@@ -141,10 +141,6 @@ Its frequency can be found using the
 .Va machdep.tsc_freq
 sysctl, if it is available.
 It is used to interpolate between values of the scheduling clock.
-It can be accessed using the
-.Dv PMIOTSTAMP
-request of
-.Xr perfmon 4 .
 .It
 The ACPI clock.
 This is a real clock/timer with a nominal frequency of 3579545.