--- pfmon/pfmon.c | 2 pfmon/pfmon_cell.c | 149 +++++++++++++++++++++++------------------------- pfmon/pfmon_cell.h | 28 ++++----- pfmon/pfmon_util_cell.c | 70 +++++++++++----------- 4 files changed, 124 insertions(+), 125 deletions(-) --- a/pfmon/pfmon.c +++ b/pfmon/pfmon.c @@ -58,7 +58,7 @@ static pfmon_support_t *pfmon_cpus[]={ &pfmon_mips64_ice9b, #endif #ifdef CONFIG_PFMON_CELL - &pfmon_cell, + &pfmon_cell, #endif NULL }; --- a/pfmon/pfmon_cell.c +++ b/pfmon/pfmon_cell.c @@ -29,140 +29,139 @@ static pfmon_cell_options_t pfmon_cell_opt; typedef struct { - int dummy; - pfmon_cell_args_t args; + int dummy; + pfmon_cell_args_t args; } pfmon_cell_param_t; static int pfmon_cell_prepare_registers(pfmon_event_set_t *set) { - DPRINT(("set:%p\n", set)); - return 0; + DPRINT(("set:%p\n", set)); + return 0; } static int pfmon_cell_install_pmc_registers(pfmon_sdesc_t *sdesc, - pfmon_event_set_t *set) + pfmon_event_set_t *set) { - DPRINT(("set:%p sdesc:%p\n", set, sdesc)); - return 0; + DPRINT(("set:%p sdesc:%p\n", set, sdesc)); + return 0; } static int pfmon_cell_install_pmd_registers(pfmon_sdesc_t *sdesc, - pfmon_event_set_t *set) + pfmon_event_set_t *set) { - DPRINT(("set:%p sdesc:%p\n", set, sdesc)); - return 0; + DPRINT(("set:%p sdesc:%p\n", set, sdesc)); + return 0; } static void pfmon_cell_usage(void) { - DPRINT(("\n")); + DPRINT(("\n")); } static struct option cmd_cell_options[] = { - {0, 0, 0, 0}, + {0, 0, 0, 0}, }; static int pfmon_cell_initialize(void) { - int r; + int r; - r = pfmon_register_options(cmd_cell_options, - sizeof(cmd_cell_options)); - if (r) - return r; + r = pfmon_register_options(cmd_cell_options, + sizeof(cmd_cell_options)); + if (r) + return r; - /* connect pfmon model specific options */ - options.model_options = &pfmon_cell_opt; + /* connect pfmon model specific options */ + options.model_options = &pfmon_cell_opt; - return 0; + return 0; } static int pfmon_cell_parse_options(int code, char *optarg) { - DPRINT(("\n")); - return 0; + DPRINT(("\n")); + return 0; } static int pfmon_cell_create_set(pfmon_event_set_t *set) { - pfmlib_cell_input_param_t *p; + pfmlib_cell_input_param_t *p; - if (set->mod_inp) - return 0; + if (set->mod_inp) + return 0; - p = malloc(sizeof(pfmlib_cell_input_param_t)); - if (p == NULL) - fatal_error("cannot allocate memory for PMU specific " - "options\n"); + p = malloc(sizeof(pfmlib_cell_input_param_t)); + if (p == NULL) + fatal_error("cannot allocate memory for PMU specific " + "options\n"); - memset(p, 0, sizeof(pfmlib_cell_input_param_t)); + memset(p, 0, sizeof(pfmlib_cell_input_param_t)); - set->mod_inp = p; - set->mod_args = NULL; + set->mod_inp = p; + set->mod_args = NULL; - return 0; + return 0; } static int pfmon_cell_setup(pfmon_event_set_t *set) { - pfmlib_cell_input_param_t *p; - int i; + pfmlib_cell_input_param_t *p; + int i; - DPRINT(("%s set:%p\n", __FUNCTION__, set)); + DPRINT(("%s set:%p\n", __FUNCTION__, set)); - p = set->mod_inp; - p->triggers = 0; - for (i = 0; i < PMU_CELL_NUM_COUNTERS; i++) { - p->pfp_cell_counters[i].pmX_control_num = 0; - p->pfp_cell_counters[i].spe_subunit = 0; - p->pfp_cell_counters[i].polarity = 1; - p->pfp_cell_counters[i].input_control = 0; - p->pfp_cell_counters[i].cnt_mask = 0; - p->pfp_cell_counters[i].flags = 0; - } + p = set->mod_inp; + p->triggers = 0; + for (i = 0; i < PMU_CELL_NUM_COUNTERS; i++) { + p->pfp_cell_counters[i].pmX_control_num = 0; + p->pfp_cell_counters[i].spe_subunit = 0; + p->pfp_cell_counters[i].polarity = 1; + p->pfp_cell_counters[i].input_control = 0; + p->pfp_cell_counters[i].cnt_mask = 0; + p->pfp_cell_counters[i].flags = 0; + } - return 0; + return 0; } static int pfmon_cell_print_header(FILE *fp) { - DPRINT(("\n")); - return 0; + DPRINT(("\n")); + return 0; } static int pfmon_cell_setup_ctx_flags(pfmon_ctx_t *ctx) { - DPRINT(("\n")); - return 0; + DPRINT(("\n")); + return 0; } static void pfmon_cell_verify_cmdline(int argc, char **argv) { - if (options.code_trigger_start || - options.code_trigger_stop || - options.data_trigger_start || - options.data_trigger_stop || - options.opt_code_trigger_repeat || - options.opt_code_trigger_follow || - options.opt_data_trigger_repeat || - options.opt_data_trigger_follow || - options.opt_data_trigger_ro || - options.opt_data_trigger_wo) - fatal_error("trigger options are not implemented\n"); + if (options.code_trigger_start || + options.code_trigger_stop || + options.data_trigger_start || + options.data_trigger_stop || + options.opt_code_trigger_repeat || + options.opt_code_trigger_follow || + options.opt_data_trigger_repeat || + options.opt_data_trigger_follow || + options.opt_data_trigger_ro || options.opt_data_trigger_wo) + fatal_error("trigger options are not implemented\n"); } pfmon_support_t pfmon_cell = { - .name = "Cell/B.E PMU", - .pmu_type = PFMLIB_CELL_PMU, - .pfmon_initialize = pfmon_cell_initialize, - .pfmon_usage = pfmon_cell_usage, - .pfmon_parse_options = pfmon_cell_parse_options, - .pfmon_create_set = pfmon_cell_create_set, - .pfmon_setup = pfmon_cell_setup, - .pfmon_prepare_registers = pfmon_cell_prepare_registers, - .pfmon_install_pmc_registers = pfmon_cell_install_pmc_registers, - .pfmon_install_pmd_registers = pfmon_cell_install_pmd_registers, - .pfmon_print_header = pfmon_cell_print_header, - .pfmon_setup_ctx_flags = pfmon_cell_setup_ctx_flags, - .pfmon_verify_cmdline = pfmon_cell_verify_cmdline, + .name = "Cell/B.E PMU", + .pmu_type = PFMLIB_CELL_PMU, + .pfmon_initialize = pfmon_cell_initialize, + .pfmon_usage = pfmon_cell_usage, + .pfmon_parse_options = pfmon_cell_parse_options, + .pfmon_create_set = pfmon_cell_create_set, + .pfmon_setup = pfmon_cell_setup, + .pfmon_prepare_registers = pfmon_cell_prepare_registers, + .pfmon_install_pmc_registers = pfmon_cell_install_pmc_registers, + .pfmon_install_pmd_registers = pfmon_cell_install_pmd_registers, + .pfmon_print_header = pfmon_cell_print_header, + .pfmon_setup_ctx_flags = pfmon_cell_setup_ctx_flags, + .pfmon_verify_cmdline = pfmon_cell_verify_cmdline, }; --- a/pfmon/pfmon_cell.h +++ b/pfmon/pfmon_cell.h @@ -27,35 +27,35 @@ static __inline__ unsigned int bit_weight(unsigned long x) { - unsigned int cnt = 0; + unsigned int cnt = 0; - for (; x; x >>= 1) - if (x & 0x1) - cnt++; - return cnt; + for (; x; x >>= 1) + if (x & 0x1) + cnt++; + return cnt; } static inline unsigned long find_last_bit_set(unsigned long x) { - unsigned int bit, last_bit = ~0; + unsigned int bit, last_bit = ~0; - for (bit = 0; x; bit++, x >>= 1) - if (x & 0x1) - last_bit = bit; + for (bit = 0; x; bit++, x >>= 1) + if (x & 0x1) + last_bit = bit; - return last_bit; + return last_bit; } typedef struct { - int dummy; + int dummy; } pfmon_cache_info_t; typedef struct { - int dummy; + int dummy; } pfmon_cell_options_t; typedef struct { - int dummy; + int dummy; } pfmon_cell_args_t; -#endif /* __PFMON_CELL_H__ */ +#endif /* __PFMON_CELL_H__ */ --- a/pfmon/pfmon_util_cell.c +++ b/pfmon/pfmon_util_cell.c @@ -31,97 +31,97 @@ int pfmon_set_code_breakpoint(pid_t pid, pfmon_trigger_t *brk) { - DPRINT(("\n")); - return -1; + DPRINT(("\n")); + return -1; } int pfmon_clear_code_breakpoint(pid_t pid, pfmon_trigger_t *brk) { - DPRINT(("\n")); - return -1; + DPRINT(("\n")); + return -1; } int pfmon_set_data_breakpoint(pid_t pid, pfmon_trigger_t *brk) { - DPRINT(("\n")); - return -1; + DPRINT(("\n")); + return -1; } int pfmon_clear_data_breakpoint(pid_t pid, pfmon_trigger_t *brk) { - DPRINT(("\n")); - return -1; + DPRINT(("\n")); + return -1; } int pfmon_resume_after_code_breakpoint(pid_t pid, pfmon_trigger_t *brk) { - DPRINT(("\n")); - return -1; + DPRINT(("\n")); + return -1; } int pfmon_resume_after_data_breakpoint(pid_t pid, pfmon_trigger_t *brk) { - DPRINT(("\n")); - return -1; + DPRINT(("\n")); + return -1; } void pfmon_arch_initialize(void) { - DPRINT(("\n")); - options.opt_support_gen = 0; - options.libpfm_generic = 0; - options.nibrs = 0; - options.ndbrs = 0; + DPRINT(("\n")); + options.opt_support_gen = 0; + options.libpfm_generic = 0; + options.nibrs = 0; + options.ndbrs = 0; } int pfmon_enable_all_breakpoints(pid_t pid) { - DPRINT(("\n")); - return -1; + DPRINT(("\n")); + return -1; } int pfmon_disable_all_breakpoints(pid_t pid) { - DPRINT(("\n")); - return -1; + DPRINT(("\n")); + return -1; } int pfmon_validate_code_trigger_address(unsigned long addr) { - DPRINT(("\n")); - return -1; + DPRINT(("\n")); + return -1; } int pfmon_validate_data_trigger_address(unsigned long addr) { - DPRINT(("\n")); - return -1; + DPRINT(("\n")); + return -1; } void pfmon_segv_handler_info(struct siginfo *si, void *sc) { - DPRINT(("\n")); + DPRINT(("\n")); } -int pfmon_get_breakpoint_addr(pid_t pid, unsigned long *addr, int -*is_data) +int pfmon_get_breakpoint_addr(pid_t pid, unsigned long *addr, int + *is_data) { - DPRINT(("\n")); - return -1; + DPRINT(("\n")); + return -1; } int pfmon_get_return_pointer(pid_t pid, unsigned long *rp) { - DPRINT(("\n")); - return -1; + DPRINT(("\n")); + return -1; } void pfmon_print_simple_cpuinfo(FILE *fp, const char *msg) { - fprintf(fp, "%sCell Broadband Engine. \n", msg); + fprintf(fp, "%sCell Broadband Engine. \n", msg); } -void pfmon_print_cpuinfo(FILE * fp) +void pfmon_print_cpuinfo(FILE *fp) { - fprintf(fp, "# CPU name: Cell Broadband Engine. \n"); + fprintf(fp, "# CPU name: Cell Broadband Engine. \n"); }