MFP4:

- Implement sampling modes and logging support in hwpmc(4).

- Separate MI and MD parts of hwpmc(4) and allow sharing of
  PMC implementations across different architectures.
  Add support for P4 (EMT64) style PMCs to the amd64 code.

- New pmcstat(8) options: -E (exit time counts) -W (counts
  every context switch), -R (print log file).

- pmc(3) API changes, improve our ability to keep ABI compatibility
  in the future.  Add more 'alias' names for commonly used events.

- bug fixes & documentation.

1 files changed, 0 insertions, 143 deletions

diff --git a/sys/dev/hwpmc/hwpmc_intel.c b/sys/dev/hwpmc/hwpmc_intel.c
deleted file mode 100644
index ea2c6c8..0000000
--- a/sys/dev/hwpmc/hwpmc_intel.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*-
- * Copyright (c) 2003-2005 Joseph Koshy
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS 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/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/pmc.h>
-#include <sys/pmckern.h>
-#include <sys/smp.h>
-#include <sys/systm.h>
-
-#include <machine/cputypes.h>
-#include <machine/md_var.h>
-
-struct pmc_mdep *
-pmc_intel_initialize(void)
-{
-	struct pmc_mdep *pmc_mdep;
-	enum pmc_cputype cputype;
-	int error, model;
-
-	KASSERT(strcmp(cpu_vendor, "GenuineIntel") == 0,
-	    ("[intel,%d] Initializing non-intel processor", __LINE__));
-
-	PMCDBG(MDP,INI,0, "intel-initialize cpuid=0x%x", cpu_id);
-
-	cputype = -1;
-
-	switch (cpu_id & 0xF00) {
-	case 0x500:		/* Pentium family processors */
-		cputype = PMC_CPU_INTEL_P5;
-		break;
-	case 0x600:		/* Pentium Pro, Celeron, Pentium II & III */
-		switch ((cpu_id & 0xF0) >> 4) { /* model number field */
-		case 0x1:
-			cputype = PMC_CPU_INTEL_P6;
-			break;
-		case 0x3: case 0x5:
-			cputype = PMC_CPU_INTEL_PII;
-			break;
-		case 0x6:
-			cputype = PMC_CPU_INTEL_CL;
-			break;
-		case 0x7: case 0x8: case 0xA: case 0xB:
-			cputype = PMC_CPU_INTEL_PIII;
-			break;
-		case 0x9: case 0xD:
-			cputype = PMC_CPU_INTEL_PM;
-			break;
-		}
-		break;
-	case 0xF00:		/* P4 */
-		model = ((cpu_id & 0xF0000) >> 12) | ((cpu_id & 0xF0) >> 4);
-		if (model >= 0 && model <= 3) /* known models */
-			cputype = PMC_CPU_INTEL_PIV;
-		break;
-	}
-
-	if ((int) cputype == -1) {
-		printf("pmc: Unknown Intel CPU.\n");
-		return NULL;
-	}
-
-	MALLOC(pmc_mdep, struct pmc_mdep *, sizeof(struct pmc_mdep),
-	    M_PMC, M_WAITOK|M_ZERO);
-
-	pmc_mdep->pmd_cputype 	    = cputype;
-	pmc_mdep->pmd_nclass	    = 2;
-	pmc_mdep->pmd_classes[0].pm_class    = PMC_CLASS_TSC;
-	pmc_mdep->pmd_classes[0].pm_caps     = PMC_CAP_READ;
-	pmc_mdep->pmd_classes[0].pm_width    = 64;
-	pmc_mdep->pmd_nclasspmcs[0] = 1;
-
-	error = 0;
-
-	switch (cputype) {
-
-		/*
-		 * Intel Pentium 4 Processors
-		 */
-
-	case PMC_CPU_INTEL_PIV:
-		error = pmc_initialize_p4(pmc_mdep);
-		break;
-
-		/*
-		 * P6 Family Processors
-		 */
-
-	case PMC_CPU_INTEL_P6:
-	case PMC_CPU_INTEL_CL:
-	case PMC_CPU_INTEL_PII:
-	case PMC_CPU_INTEL_PIII:
-	case PMC_CPU_INTEL_PM:
-
-		error = pmc_initialize_p6(pmc_mdep);
-		break;
-
-		/*
-		 * Intel Pentium PMCs.
-		 */
-
-	case PMC_CPU_INTEL_P5:
-		error = pmc_initialize_p5(pmc_mdep);
-		break;
-
-	default:
-		KASSERT(0,("[intel,%d] Unknown CPU type", __LINE__));
-	}
-
-	if (error) {
-		FREE(pmc_mdep, M_PMC);
-		pmc_mdep = NULL;
-	}
-
-	return pmc_mdep;
-}