Hi Stephane,
Thank you for reviewing the patch and catching these problems :-)
The replacement of PFMLIB_POWERPC_PMU is an error; it should remain as
90. Since CrayX2 is at 96, maybe we should start the POWER (and PPC970)
numbers at 100? Or if you prefer, we can leave it in the middle of the
POWER numbers, and shuffle all of them around it. It might be better to
start them at 100, so that some room is left for 32-bit PowerPC PMUs.
I will fix the copyright in pfm_gen_ppc64.c. I think I will create a
new pfmlib_ppc64.h file too, so that the 32-bit PowerPC implementation
(if there ever is one) and ppc64 can remain completely separate for now.
This .h file will contain the definitions for the privilege levels as
you requested.
A new patch should be ready by the end of the day and I will post it up.
However, I will be on vacation for the following two weeks, so I may
not be able to reply to comments on it till I return.
Regards,
- Corey
Corey,
===================================================================
RCS file: /cvsroot/perfmon2/libpfm/include/perfmon/pfmlib.h,v
retrieving revision 1.28
diff -p -u -r1.28 pfmlib.h
--- include/perfmon/pfmlib.h 3 Sep 2007 20:37:36 -0000
1.28
+++ include/perfmon/pfmlib.h 10 Oct 2007 19:15:40 -0000
@@ -219,7 +219,13 @@ extern int pfm_get_inst_retired_event(pf
#define PFMLIB_MIPS_ICE9A_PMU 77 /*
SiCortex ICE9A */
#define PFMLIB_MIPS_ICE9B_PMU 78 /*
SiCortex ICE9B */
-#define PFMLIB_POWERPC_PMU 90 /* POWERPC */
^^^^^^^^^^^^^^^^^^
This define is used in pfmlib_powerpc.c yet you remove it.
Shall I update pfmlib_powerpc.c to use PFMLIB_POWER3_PMU
instead?
+#define PFMLIB_POWER3_PMU 90 /* IBM POWER3 */
+#define PFMLIB_PPC970_PMU 91 /* IBM PowerPC 970(FX) */
+#define PFMLIB_PPC970MP_PMU 92 /* IBM PowerPC 970MP */
+#define PFMLIB_POWER4_PMU 93 /* IBM POWER4 */
+#define PFMLIB_POWER5_PMU 94 /* IBM POWER5 */
+#define PFMLIB_POWER5p_PMU 95 /* IBM POWER5+ */
+#define PFMLIB_POWER6_PMU 97 /* IBM POWER6 */
#define PFMLIB_CRAYX2_PMU 96 /* Cray X2 */
===================================================================
RCS file: lib/pfmlib_gen_ppc64.c
diff -N lib/pfmlib_gen_ppc64.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lib/pfmlib_gen_ppc64.c 10 Oct 2007 19:15:40 -0000
@@ -0,0 +1,832 @@
+/*
+ * Copyright (c) 2005-2006 Hewlett-Packard Development Company, L.P.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * pfmlib_gen_ppc64.c
+ *
+ * Support for libpfm for the PowerPC970, POWER4,4+,5,5+,6 processors.
+ */
+
I think you'd want an IBM copyright on this file, right?
+ /*
+ This interpretation comes from PAPI's perfmon.c's set_domain
+ function:
+ PFM_PLM0 = Kernel -> POWER supervisor state
+ PFM_PLM1 = Supervisor -> POWER hypervisor state
+ PFM_PLM2 = Other -> not supported
+ PFM_PLM3 = User -> POWER problem state
+ */
+
It would be beneficial is this selection was cleaerly spelled out in the
pfmlib_powerpc.h header file, like for other architectures.
Thanks.
--
-Stephane
--
Corey Ashford
Software Engineer
IBM Linux Technology Center, Linux Toolchain
Beaverton, OR
503-578-3507
[EMAIL PROTECTED]
_______________________________________________
perfmon mailing list
[email protected]
http://www.hpl.hp.com/hosted/linux/mail-archives/perfmon/
