Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 184f412c authored by Ingo Molnar's avatar Ingo Molnar
Browse files

perf, x86: Clean up event constraints code a bit 



- Remove stray debug code
 - Improve ugly macros a bit
 - Remove some whitespace damage
 - (Also fix up some accumulated damage in perf_event.h)

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: Stephane Eranian <eranian@google.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
parent 6c9687ab

arch/x86/kernel/cpu/perf_event.c

+8 −29
Original line number Diff line number Diff line
@@ -100,17 +100,12 @@ struct cpu_hw_events { 
	.weight = HWEIGHT64((u64)(n)),	\

}



#define INTEL_EVENT_CONSTRAINT(c, n)	\

	EVENT_CONSTRAINT(c, n, INTEL_ARCH_EVENT_MASK)

#define INTEL_EVENT_CONSTRAINT(c, n)		EVENT_CONSTRAINT(c, n, INTEL_ARCH_EVENT_MASK)

#define FIXED_EVENT_CONSTRAINT(c, n)		EVENT_CONSTRAINT(c, n, INTEL_ARCH_FIXED_MASK)



#define FIXED_EVENT_CONSTRAINT(c, n)	\

	EVENT_CONSTRAINT(c, n, INTEL_ARCH_FIXED_MASK)

#define EVENT_CONSTRAINT_END			EVENT_CONSTRAINT(0, 0, 0)



#define EVENT_CONSTRAINT_END \

	EVENT_CONSTRAINT(0, 0, 0)



#define for_each_event_constraint(e, c) \

	for ((e) = (c); (e)->cmask; (e)++)

#define for_each_event_constraint(e, c)		for ((e) = (c); (e)->cmask; (e)++)



/*

 * struct x86_pmu - generic x86 pmu
@@ -1276,14 +1271,6 @@ static int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign) 
		if (test_bit(hwc->idx, used_mask))

			break;



#if 0

		pr_debug("CPU%d fast config=0x%llx idx=%d assign=%c\n",

			 smp_processor_id(),

			 hwc->config,

			 hwc->idx,

			 assign ? 'y' : 'n');

#endif



		set_bit(hwc->idx, used_mask);

		if (assign)

			assign[i] = hwc->idx;
@@ -1333,14 +1320,6 @@ static int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign) 
			if (j == X86_PMC_IDX_MAX)

				break;



#if 0

			pr_debug("CPU%d slow config=0x%llx idx=%d assign=%c\n",

				smp_processor_id(),

				hwc->config,

				j,

				assign ? 'y' : 'n');

#endif



			set_bit(j, used_mask);



			if (assign)

include/linux/perf_event.h

+11 −13
Original line number Diff line number Diff line
@@ -752,8 +752,7 @@ extern int perf_max_events; 
extern const struct pmu *hw_perf_event_init(struct perf_event *event);



extern void perf_event_task_sched_in(struct task_struct *task);

extern void perf_event_task_sched_out(struct task_struct *task,

					struct task_struct *next);

extern void perf_event_task_sched_out(struct task_struct *task, struct task_struct *next);

extern void perf_event_task_tick(struct task_struct *task);

extern int perf_event_init_task(struct task_struct *child);

extern void perf_event_exit_task(struct task_struct *child);
@@ -853,8 +852,7 @@ extern int sysctl_perf_event_mlock; 
extern int sysctl_perf_event_sample_rate;



extern void perf_event_init(void);

extern void perf_tp_event(int event_id, u64 addr, u64 count,

				 void *record, int entry_size);

extern void perf_tp_event(int event_id, u64 addr, u64 count, void *record, int entry_size);

extern void perf_bp_event(struct perf_event *event, void *data);



#ifndef perf_misc_flags