Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 312346
b: refs/heads/master
c: 81e9b99
h: refs/heads/master
v: v3
  • Loading branch information
Arnaldo Carvalho de Melo committed Jul 5, 2012
1 parent 2ec1553 commit 6f108d4
Show file tree
Hide file tree
Showing 5 changed files with 141 additions and 82 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f6ced60fb6c0ee115982157457c47e48802d6e1d
refs/heads/master: 81e9b994bb20716d1f6c47e048e4ae4a43de2f83
29 changes: 10 additions & 19 deletions trunk/tools/perf/util/parse-events-test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -634,8 +634,6 @@ static struct test__event_st test__events[] = {
},
};

#define TEST__EVENTS_CNT (sizeof(test__events) / sizeof(struct test__event_st))

static struct test__event_st test__events_pmu[] = {
[0] = {
.name = "cpu/config=10,config1,config2=3,period=1000/u",
Expand All @@ -647,9 +645,6 @@ static struct test__event_st test__events_pmu[] = {
},
};

#define TEST__EVENTS_PMU_CNT (sizeof(test__events_pmu) / \
sizeof(struct test__event_st))

struct test__term {
const char *str;
__u32 type;
Expand Down Expand Up @@ -765,21 +760,17 @@ int parse_events__test(void)
{
int ret;

do {
ret = test_events(test__events, TEST__EVENTS_CNT);
if (ret)
break;

if (test_pmu()) {
ret = test_events(test__events_pmu,
TEST__EVENTS_PMU_CNT);
if (ret)
break;
}
#define TEST_EVENTS(tests) \
do { \
ret = test_events(tests, ARRAY_SIZE(tests)); \
if (ret) \
return ret; \
} while (0)

ret = test_terms(test__terms, TEST__TERMS_CNT);
TEST_EVENTS(test__events);

} while (0);
if (test_pmu())
TEST_EVENTS(test__events_pmu);

return ret;
return test_terms(test__terms, ARRAY_SIZE(test__terms));
}
174 changes: 117 additions & 57 deletions trunk/tools/perf/util/parse-events.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
#define MAX_NAME_LEN 100

struct event_symbol {
u8 type;
u64 config;
const char *symbol;
const char *alias;
};
Expand All @@ -30,30 +28,86 @@ extern int parse_events_debug;
#endif
int parse_events_parse(void *data, void *scanner);

#define CHW(x) .type = PERF_TYPE_HARDWARE, .config = PERF_COUNT_HW_##x
#define CSW(x) .type = PERF_TYPE_SOFTWARE, .config = PERF_COUNT_SW_##x

static struct event_symbol event_symbols[] = {
{ CHW(CPU_CYCLES), "cpu-cycles", "cycles" },
{ CHW(STALLED_CYCLES_FRONTEND), "stalled-cycles-frontend", "idle-cycles-frontend" },
{ CHW(STALLED_CYCLES_BACKEND), "stalled-cycles-backend", "idle-cycles-backend" },
{ CHW(INSTRUCTIONS), "instructions", "" },
{ CHW(CACHE_REFERENCES), "cache-references", "" },
{ CHW(CACHE_MISSES), "cache-misses", "" },
{ CHW(BRANCH_INSTRUCTIONS), "branch-instructions", "branches" },
{ CHW(BRANCH_MISSES), "branch-misses", "" },
{ CHW(BUS_CYCLES), "bus-cycles", "" },
{ CHW(REF_CPU_CYCLES), "ref-cycles", "" },

{ CSW(CPU_CLOCK), "cpu-clock", "" },
{ CSW(TASK_CLOCK), "task-clock", "" },
{ CSW(PAGE_FAULTS), "page-faults", "faults" },
{ CSW(PAGE_FAULTS_MIN), "minor-faults", "" },
{ CSW(PAGE_FAULTS_MAJ), "major-faults", "" },
{ CSW(CONTEXT_SWITCHES), "context-switches", "cs" },
{ CSW(CPU_MIGRATIONS), "cpu-migrations", "migrations" },
{ CSW(ALIGNMENT_FAULTS), "alignment-faults", "" },
{ CSW(EMULATION_FAULTS), "emulation-faults", "" },
static struct event_symbol event_symbols_hw[PERF_COUNT_HW_MAX] = {
[PERF_COUNT_HW_CPU_CYCLES] = {
.symbol = "cpu-cycles",
.alias = "cycles",
},
[PERF_COUNT_HW_INSTRUCTIONS] = {
.symbol = "instructions",
.alias = "",
},
[PERF_COUNT_HW_CACHE_REFERENCES] = {
.symbol = "cache-references",
.alias = "",
},
[PERF_COUNT_HW_CACHE_MISSES] = {
.symbol = "cache-misses",
.alias = "",
},
[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = {
.symbol = "branch-instructions",
.alias = "branches",
},
[PERF_COUNT_HW_BRANCH_MISSES] = {
.symbol = "branch-misses",
.alias = "",
},
[PERF_COUNT_HW_BUS_CYCLES] = {
.symbol = "bus-cycles",
.alias = "",
},
[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = {
.symbol = "stalled-cycles-frontend",
.alias = "idle-cycles-frontend",
},
[PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = {
.symbol = "stalled-cycles-backend",
.alias = "idle-cycles-backend",
},
[PERF_COUNT_HW_REF_CPU_CYCLES] = {
.symbol = "ref-cycles",
.alias = "",
},
};

static struct event_symbol event_symbols_sw[PERF_COUNT_SW_MAX] = {
[PERF_COUNT_SW_CPU_CLOCK] = {
.symbol = "cpu-clock",
.alias = "",
},
[PERF_COUNT_SW_TASK_CLOCK] = {
.symbol = "task-clock",
.alias = "",
},
[PERF_COUNT_SW_PAGE_FAULTS] = {
.symbol = "page-faults",
.alias = "faults",
},
[PERF_COUNT_SW_CONTEXT_SWITCHES] = {
.symbol = "context-switches",
.alias = "cs",
},
[PERF_COUNT_SW_CPU_MIGRATIONS] = {
.symbol = "cpu-migrations",
.alias = "migrations",
},
[PERF_COUNT_SW_PAGE_FAULTS_MIN] = {
.symbol = "minor-faults",
.alias = "",
},
[PERF_COUNT_SW_PAGE_FAULTS_MAJ] = {
.symbol = "major-faults",
.alias = "",
},
[PERF_COUNT_SW_ALIGNMENT_FAULTS] = {
.symbol = "alignment-faults",
.alias = "",
},
[PERF_COUNT_SW_EMULATION_FAULTS] = {
.symbol = "emulation-faults",
.alias = "",
},
};

#define __PERF_EVENT_FIELD(config, name) \
Expand Down Expand Up @@ -824,16 +878,13 @@ int is_valid_tracepoint(const char *event_string)
return 0;
}

void print_events_type(u8 type)
static void __print_events_type(u8 type, struct event_symbol *syms,
unsigned max)
{
struct event_symbol *syms = event_symbols;
unsigned int i;
char name[64];
unsigned i;

for (i = 0; i < ARRAY_SIZE(event_symbols); i++, syms++) {
if (type != syms->type)
continue;

for (i = 0; i < max ; i++, syms++) {
if (strlen(syms->alias))
snprintf(name, sizeof(name), "%s OR %s",
syms->symbol, syms->alias);
Expand All @@ -845,6 +896,14 @@ void print_events_type(u8 type)
}
}

void print_events_type(u8 type)
{
if (type == PERF_TYPE_SOFTWARE)
__print_events_type(type, event_symbols_sw, PERF_COUNT_SW_MAX);
else
__print_events_type(type, event_symbols_hw, PERF_COUNT_HW_MAX);
}

int print_hwcache_events(const char *event_glob)
{
unsigned int type, op, i, printed = 0;
Expand Down Expand Up @@ -872,26 +931,13 @@ int print_hwcache_events(const char *event_glob)
return printed;
}

/*
* Print the help text for the event symbols:
*/
void print_events(const char *event_glob)
static void print_symbol_events(const char *event_glob, unsigned type,
struct event_symbol *syms, unsigned max)
{
unsigned int i, type, prev_type = -1, printed = 0, ntypes_printed = 0;
struct event_symbol *syms = event_symbols;
unsigned i, printed = 0;
char name[MAX_NAME_LEN];

printf("\n");
printf("List of pre-defined events (to be used in -e):\n");

for (i = 0; i < ARRAY_SIZE(event_symbols); i++, syms++) {
type = syms->type;

if (type != prev_type && printed) {
printf("\n");
printed = 0;
ntypes_printed++;
}
for (i = 0; i < max; i++, syms++) {

if (event_glob != NULL &&
!(strglobmatch(syms->symbol, event_glob) ||
Expand All @@ -902,17 +948,31 @@ void print_events(const char *event_glob)
snprintf(name, MAX_NAME_LEN, "%s OR %s", syms->symbol, syms->alias);
else
strncpy(name, syms->symbol, MAX_NAME_LEN);
printf(" %-50s [%s]\n", name,
event_type_descriptors[type]);

prev_type = type;
++printed;
printf(" %-50s [%s]\n", name, event_type_descriptors[type]);

printed++;
}

if (ntypes_printed) {
printed = 0;
if (printed)
printf("\n");
}
}

/*
* Print the help text for the event symbols:
*/
void print_events(const char *event_glob)
{

printf("\n");
printf("List of pre-defined events (to be used in -e):\n");

print_symbol_events(event_glob, PERF_TYPE_HARDWARE,
event_symbols_hw, PERF_COUNT_HW_MAX);

print_symbol_events(event_glob, PERF_TYPE_SOFTWARE,
event_symbols_sw, PERF_COUNT_SW_MAX);

print_hwcache_events(event_glob);

if (event_glob != NULL)
Expand Down
3 changes: 2 additions & 1 deletion trunk/tools/perf/util/parse-events.l
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static int sym(yyscan_t scanner, int type, int config)
YYSTYPE *yylval = parse_events_get_lval(scanner);

yylval->num = (type << 16) + config;
return PE_VALUE_SYM;
return type == PERF_TYPE_HARDWARE ? PE_VALUE_SYM_HW : PE_VALUE_SYM_SW;
}

static int term(yyscan_t scanner, int type)
Expand Down Expand Up @@ -152,6 +152,7 @@ r{num_raw_hex} { return raw(yyscanner); }
, { return ','; }
: { return ':'; }
= { return '='; }
\n { }

<mem>{
{modifier_bp} { return str(yyscanner, PE_MODIFIER_BP); }
Expand Down
15 changes: 11 additions & 4 deletions trunk/tools/perf/util/parse-events.y
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,23 @@ do { \
%}

%token PE_START_EVENTS PE_START_TERMS
%token PE_VALUE PE_VALUE_SYM PE_RAW PE_TERM
%token PE_VALUE PE_VALUE_SYM_HW PE_VALUE_SYM_SW PE_RAW PE_TERM
%token PE_NAME
%token PE_MODIFIER_EVENT PE_MODIFIER_BP
%token PE_NAME_CACHE_TYPE PE_NAME_CACHE_OP_RESULT
%token PE_PREFIX_MEM PE_PREFIX_RAW
%token PE_ERROR
%type <num> PE_VALUE
%type <num> PE_VALUE_SYM
%type <num> PE_VALUE_SYM_HW
%type <num> PE_VALUE_SYM_SW
%type <num> PE_RAW
%type <num> PE_TERM
%type <str> PE_NAME
%type <str> PE_NAME_CACHE_TYPE
%type <str> PE_NAME_CACHE_OP_RESULT
%type <str> PE_MODIFIER_EVENT
%type <str> PE_MODIFIER_BP
%type <num> value_sym
%type <head> event_config
%type <term> event_term
%type <head> event_pmu
Expand Down Expand Up @@ -109,8 +111,13 @@ PE_NAME '/' event_config '/'
$$ = list;
}

value_sym:
PE_VALUE_SYM_HW
|
PE_VALUE_SYM_SW

event_legacy_symbol:
PE_VALUE_SYM '/' event_config '/'
value_sym '/' event_config '/'
{
struct parse_events_data__events *data = _data;
struct list_head *list = NULL;
Expand All @@ -123,7 +130,7 @@ PE_VALUE_SYM '/' event_config '/'
$$ = list;
}
|
PE_VALUE_SYM sep_slash_dc
value_sym sep_slash_dc
{
struct parse_events_data__events *data = _data;
struct list_head *list = NULL;
Expand Down

0 comments on commit 6f108d4

Please sign in to comment.