D32197.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D32197.diff
View Options

	diff --git a/lib/libpmc/libpmc.c b/lib/libpmc/libpmc.c
	--- a/lib/libpmc/libpmc.c
	+++ b/lib/libpmc/libpmc.c
	@@ -178,7 +178,7 @@

	static const struct pmc_event_descr tsc_event_table[] =
	{
	- __PMC_EV_TSC()
	+ __PMC_EV_ALIAS_TSC()
	};

	#undef PMC_CLASS_TABLE_DESC
	diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c
	--- a/lib/libpmc/libpmc_pmu_util.c
	+++ b/lib/libpmc/libpmc_pmu_util.c
	@@ -74,7 +74,6 @@
	{"BRANCH-INSTRUCTION-RETIRED", "BR_INST_RETIRED.ALL_BRANCHES"},
	{"BRANCH_MISSES_RETIRED", "BR_MISP_RETIRED.ALL_BRANCHES"},
	{"BRANCH-MISSES-RETIRED", "BR_MISP_RETIRED.ALL_BRANCHES"},
	- {"cycles", "tsc-tsc"},
	{"unhalted-cycles", "CPU_CLK_UNHALTED.THREAD_P_ANY"},
	{"instructions", "inst_retired.any_p"},
	{"branch-mispredicts", "br_misp_retired.all_branches"},
	diff --git a/sys/dev/hwpmc/pmc_events.h b/sys/dev/hwpmc/pmc_events.h
	--- a/sys/dev/hwpmc/pmc_events.h
	+++ b/sys/dev/hwpmc/pmc_events.h
	@@ -54,6 +54,9 @@
	#define PMC_EV_TSC_FIRST PMC_EV_TSC_TSC
	#define PMC_EV_TSC_LAST PMC_EV_TSC_TSC

	+#define __PMC_EV_ALIAS_TSC() \
	+__PMC_EV_ALIAS("cycles", TSC_TSC)
	+
	/*
	* Software events are dynamically defined.
	*/