Initial Pentium4/Xeon/EM64T support for pfmon. Very limited support right now.
This is basically a copy of the i386-P6 code, with most of the i386-P6-specific
support removed. Pentium4-specific support will be added in the future when
the necessary support is added to libpfm.
This patch is against the CVS version of pfmon.
Signed-Off-By: Kevin Corry <[EMAIL PROTECTED]>
Index: pfmon/config.mk
===================================================================
--- pfmon.orig/config.mk
+++ pfmon/config.mk
@@ -59,12 +59,14 @@
ifeq ($(ARCH),x86_64)
CONFIG_PFMON_AMD_X86_64=y
+CONFIG_PFMON_PENTIUM4=y
endif
ifeq ($(ARCH),ia32)
CONFIG_PFMON_I386_P6=y
CONFIG_PFMON_GEN_IA32=y
CONFIG_PFMON_AMD_X86_64=y
+CONFIG_PFMON_PENTIUM4=y
endif
ifeq ($(ARCH),mips64)
Index: pfmon/pfmon/Makefile
===================================================================
--- pfmon.orig/pfmon/Makefile
+++ pfmon/pfmon/Makefile
@@ -126,6 +126,11 @@
CFLAGS += -DCONFIG_PFMON_I386_P6
endif
+ifeq ($(CONFIG_PFMON_PENTIUM4),y)
+OBJS += pfmon_pentium4.o
+CFLAGS += -DCONFIG_PFMON_PENTIUM4
+endif
+
ifeq ($(CONFIG_PFMON_GEN_MIPS64),y)
OBJS += pfmon_mips64.o
CFLAGS += -DCONFIG_PFMON_MIPS64
Index: pfmon/pfmon/pfmon.c
===================================================================
--- pfmon.orig/pfmon/pfmon.c
+++ pfmon/pfmon/pfmon.c
@@ -35,6 +35,7 @@
extern pfmon_support_t pfmon_amd_x86_64;
extern pfmon_support_t pfmon_i386_p6;
extern pfmon_support_t pfmon_gen_ia32;
+extern pfmon_support_t pfmon_pentium4;
static pfmon_support_t *pfmon_cpus[]={
#ifdef CONFIG_PFMON_ITANIUM
@@ -55,6 +56,9 @@
#ifdef CONFIG_PFMON_I386_P6
&pfmon_i386_p6,
#endif
+#ifdef CONFIG_PFMON_PENTIUM4
+ &pfmon_pentium4,
+#endif
#ifdef CONFIG_PFMON_GEN_IA32
&pfmon_gen_ia32, /* must always be last of IA-32 choices */
#endif
Index: pfmon/pfmon/pfmon_pentium4.c
===================================================================
--- /dev/null
+++ pfmon/pfmon/pfmon_pentium4.c
@@ -0,0 +1,296 @@
+/*
+ * pfmon_pentium4.c - Pentium4/Xeon/EM64T processor family PMU support for
pfmon
+ *
+ * Copyright (c) 2005-2006 Hewlett-Packard Development Company, L.P.
+ * Copyright (c) 2006 IBM Corp.
+ * Contributed by Kevin Corry <[EMAIL PROTECTED]>
+ *
+ * This file is part of pfmon, a sample tool to measure performance
+ * of applications on Linux.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA
+ */
+
+#include "pfmon.h"
+#include <ctype.h>
+//#include <perfmon/pfmlib_i386_p6.h>
+
+#include "pfmon_pentium4.h"
+
+static pfmon_pentium4_options_t pfmon_pentium4_opt; /* keep track of global
program options */
+
+typedef struct {
+// pfmlib_pentium4_input_param_t inp;
+ pfmon_pentium4_args_t args;
+} pfmon_pentium4_param_t;
+
+/**
+ * pfmon_pentium4_prepare_registers
+ **/
+static int
+pfmon_pentium4_prepare_registers(pfmon_event_set_t *set)
+{
+ return 0;
+}
+
+/**
+ * pfmon_pentium4_install_pmc_registers
+ **/
+static int
+pfmon_pentium4_install_pmc_registers(pfmon_sdesc_t *sdesc,
+ pfmon_event_set_t *set)
+{
+ return 0;
+}
+
+/**
+ * pfmon_pentium4_install_pmd_registers
+ **/
+static int
+pfmon_pentium4_install_pmd_registers(pfmon_sdesc_t *sdesc,
+ pfmon_event_set_t *set)
+{
+ return 0;
+}
+
+/**
+ * pfmon_pentium4_pmc_map
+ **/
+static int
+pfmon_pentium4_pmc_map(unsigned int lib_reg_num, unsigned int *kern_reg_num)
+{
+ return 0;
+}
+
+/**
+ * pfmon_pentium4_pmd_map
+ **/
+static int
+pfmon_pentium4_pmd_map(unsigned int lib_reg_num, unsigned int *kern_reg_num)
+{
+ return 0;
+}
+
+/**
+ * pfmon_pentium4_print_header
+ **/
+static int
+pfmon_pentium4_print_header(FILE *fp)
+{
+ return 0;
+}
+
+/**
+ * cmd_pentium4_options
+ *
+ * Pentium4-specific command-line options for pfmon.
+ *
+ * 000-255 reserved for generic options
+ * 400-499 reserved for PMU specific options
+ * 500-599 reserved for format specific options
+ **/
+static struct option cmd_pentium4_options[] = {
+#if 0
+/* No Pentium4-specific command-line options yet. */
+ { "counter-mask", 1, 0, 400 },
+ { "inv-mask", 1, 0, 401 },
+ { "edge-mask", 1, 0, 402 },
+#endif
+ { 0, 0, 0, 0}
+};
+
+/**
+ * pfmon_pentium4_initialize
+ *
+ * Register the Pentium4 code with the pfmon core.
+ **/
+static int
+pfmon_pentium4_initialize(void)
+{
+ int r;
+
+ r = pfmon_register_options(cmd_pentium4_options,
+ sizeof(cmd_pentium4_options));
+ if (r == -1)
+ return -1;
+
+ /* connect pfmon model specific options */
+ options.model_options = &pfmon_pentium4_opt;
+
+ return 0;
+}
+
+/**
+ * pfmon_pentium4_usage
+ **/
+static void
+pfmon_pentium4_usage(void)
+{
+#if 0
+/* No Pentium4-specific command-line options yet. */
+ printf(
+ "--counter-mask=msk1,msk2,...\t\tset event counter mask
(0,1,2,3)\n"
+ "--inv-mask=i1,i2,...\t\t\tset event inverse counter mask
(y/n,0/1)\n"
+ "--edge-mask=e1,e2,...\t\t\tset event edge detect (y/n,0/1)\n"
+ );
+#endif
+}
+
+/**
+ * pfmon_pentium4_parse_options
+ *
+ * 0 means we understood the option
+ * -1 unknown option
+ **/
+static int
+pfmon_pentium4_parse_options(int code, char *optarg)
+{
+ pfmon_pentium4_args_t *pentium4_args;
+ pfmon_event_set_t *set;
+
+ set = options.last_set;
+
+ pentium4_args = set->mod_args;
+
+ switch(code) {
+#if 0
+/* No Pentium4-specific command-line options yet. */
+ case 400:
+ if (i386_p6_args->cnt_mask_arg) fatal_error("counter
masks already defined\n");
+ i386_p6_args->cnt_mask_arg = optarg;
+ break;
+ case 401:
+ if (i386_p6_args->inv_mask_arg) fatal_error("inverse
mask already defined\n");
+ i386_p6_args->inv_mask_arg = optarg;
+ break;
+ case 402:
+ if (i386_p6_args->edge_mask_arg) fatal_error("edge
detect mask already defined\n");
+ i386_p6_args->edge_mask_arg = optarg;
+ break;
+#endif
+ default:
+ return -1;
+ }
+ return 0;
+}
+
+/**
+ * pfmon_pentium4_create_set
+ *
+ * Set up Pentium4-specific info to pass to the dispatch-events routine.
+ **/
+static int
+pfmon_pentium4_create_set(pfmon_event_set_t *set)
+{
+#if 0
+/* Nothing to initialize yet for Pentium4. */
+ size_t sz;
+ pfmon_pentium4_param_t *p;
+
+ /* Only need to initialize each set once. */
+ if (set->mod_inp)
+ return 0;
+
+ sz = sizeof(pfmon_pentium4_param_t);
+ p = malloc(sz);
+ if (!p)
+ fatal_error("cannot allocate memory for PMU specific
options\n");
+
+ memset(p, 0, sz);
+
+ set->mod_inp = &p->inp;
+ if (!set->mod_args)
+ set->mod_args = &p->args;
+#endif
+
+ return 0;
+}
+
+/**
+ * pfmon_pentium4_setup
+ **/
+static int
+pfmon_pentium4_setup(pfmon_event_set_t *set)
+{
+ pfmon_pentium4_args_t *pentium4_args;
+
+ pentium4_args = set->mod_args;
+
+ if (pentium4_args == NULL)
+ return 0;
+
+ return 0;
+}
+
+/**
+ * pfmon_pentium4_setup_ctx_flags
+ **/
+static int
+pfmon_pentium4_setup_ctx_flags(pfmon_ctx_t *ctx)
+{
+ return 0;
+}
+
+/**
+ * pfmon_pentium4_verify_event_sets
+ **/
+static void pfmon_pentium4_verify_event_sets(void)
+{
+ return;
+}
+
+/**
+ * pfmon_pentium4_verify_cmdline
+ *
+ * Check all command-line options to make sure they are valid for Pentium4.
+ **/
+static void
+pfmon_pentium4_verify_cmdline(int argc, char **argv)
+{
+ if (options.dfl_plm & (PFM_PLM1|PFM_PLM2))
+ fatal_error("-1 or -2 privilege levels are not "
+ "supported by the Pentium4/Xeon/EM64T PMU.\n");
+}
+
+/**
+ * pfmon_pentium4_detailed_event_name
+ **/
+static void
+pfmon_pentium4_detailed_event_name(int evt)
+{
+}
+
+pfmon_support_t pfmon_pentium4 = {
+ .pfmon_prepare_registers = pfmon_pentium4_prepare_registers,
+ .pfmon_install_pmc_registers = pfmon_pentium4_install_pmc_registers,
+ .pfmon_install_pmd_registers = pfmon_pentium4_install_pmd_registers,
+ .pfmon_pmc_map = pfmon_pentium4_pmc_map,
+ .pfmon_pmd_map = pfmon_pentium4_pmd_map,
+ .pfmon_print_header = pfmon_pentium4_print_header,
+ .pfmon_initialize = pfmon_pentium4_initialize,
+ .pfmon_usage = pfmon_pentium4_usage,
+ .pfmon_parse_options = pfmon_pentium4_parse_options,
+ .pfmon_create_set = pfmon_pentium4_create_set,
+ .pfmon_setup = pfmon_pentium4_setup,
+ .pfmon_setup_ctx_flags = pfmon_pentium4_setup_ctx_flags,
+ .pfmon_verify_event_sets = pfmon_pentium4_verify_event_sets,
+ .pfmon_verify_cmdline = pfmon_pentium4_verify_cmdline,
+ .pfmon_detailed_event_name = pfmon_pentium4_detailed_event_name,
+ .name = "Pentium4/Xeon/EM64T",
+ .pmu_type = PFMLIB_PENTIUM4_PMU,
+ .generic_pmu_type = PFMLIB_NO_PMU,
+};
+
Index: pfmon/pfmon/pfmon_pentium4.h
===================================================================
--- /dev/null
+++ pfmon/pfmon/pfmon_pentium4.h
@@ -0,0 +1,40 @@
+/*
+ * pfmon_pentium4.h
+ *
+ * Copyright (c) 2005-2006 Hewlett-Packard Development Company, L.P.
+ * Copyright (c) 2006 IBM Corp.
+ * Contributed by Kevin Corry <[EMAIL PROTECTED]>
+ *
+ * This file is part of pfmon, a sample tool to measure performance
+ * of applications for Linux.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA
+ */
+#ifndef __PFMON_PENTIUM4_H__
+#define __PFMON_PENTIUM4_H__
+
+typedef struct {
+ int dummy;
+} pfmon_pentium4_options_t;
+
+typedef struct {
+ char *cnt_mask_arg;
+ char *inv_mask_arg;
+ char *edge_mask_arg;
+} pfmon_pentium4_args_t;
+
+#endif /* __PFMON_PENTIUM4_H__ */
+
_______________________________________________
perfmon mailing list
[email protected]
http://www.hpl.hp.com/hosted/linux/mail-archives/perfmon/
