From owner-svn-src-all@FreeBSD.ORG  Wed Dec  3 15:23:09 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F2AB5106564A;
	Wed,  3 Dec 2008 15:23:08 +0000 (UTC)
	(envelope-from jkoshy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E1D368FC16;
	Wed,  3 Dec 2008 15:23:08 +0000 (UTC)
	(envelope-from jkoshy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mB3FN8hE094397;
	Wed, 3 Dec 2008 15:23:08 GMT (envelope-from jkoshy@svn.freebsd.org)
Received: (from jkoshy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mB3FN8w5094396;
	Wed, 3 Dec 2008 15:23:08 GMT (envelope-from jkoshy@svn.freebsd.org)
Message-Id: <200812031523.mB3FN8w5094396@svn.freebsd.org>
From: Joseph Koshy <jkoshy@FreeBSD.org>
Date: Wed, 3 Dec 2008 15:23:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185582 - head/sys/dev/hwpmc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Dec 2008 15:23:09 -0000

Author: jkoshy
Date: Wed Dec  3 15:23:08 2008
New Revision: 185582
URL: http://svn.freebsd.org/changeset/base/185582

Log:
  Add aliases that map architectural event names to fixed function counters.

Modified:
  head/sys/dev/hwpmc/pmc_events.h

Modified: head/sys/dev/hwpmc/pmc_events.h
==============================================================================
--- head/sys/dev/hwpmc/pmc_events.h	Wed Dec  3 15:10:31 2008	(r185581)
+++ head/sys/dev/hwpmc/pmc_events.h	Wed Dec  3 15:23:08 2008	(r185582)
@@ -426,6 +426,11 @@ __PMC_EV(IAF, CPU_CLK_UNHALTED_REF)
 #define	PMC_EV_IAF_FIRST	PMC_EV_IAF_INSTR_RETIRED_ANY
 #define	PMC_EV_IAF_LAST		PMC_EV_IAF_CPU_CLK_UNHALTED_REF
 
+#define	__PMC_EV_ALIAS_IAF()						\
+__PMC_EV_ALIAS("instruction-retired",	IAF_INSTR_RETIRED_ANY)		\
+__PMC_EV_ALIAS("unhalted-core-cycles",	IAF_CPU_CLK_UNHALTED_CORE)	\
+__PMC_EV_ALIAS("unhalted-reference-cycles", IAF_CPU_CLK_UNHALTED_REF)
+
 /*
  * Events supported by programmable function counters present in
  * Intel Atom, Core and Core2 CPUs, from the "Intel 64 and IA-32