perf intel-pt/bts: remove unused SAMPLE_SIZE defines and bts priv array

PATCH Applied Kim Phillips 5 participants 6 messages Jun 15, 2017 – Jun 20, 2017 perf events

lore

Share & tools

lore

Kim Phillips

author

2017-06-15 17:55 UTC #0 lore raw

PATCH 1/2 perf intel-pt/bts: remove unused SAMPLE_SIZE defines and bts priv array

Signed-off-by Kim Phillips <[email protected]>

---
 tools/perf/arch/x86/util/intel-bts.c | 4 ----
 tools/perf/arch/x86/util/intel-pt.c  | 4 ----
 tools/perf/util/intel-bts.c          | 2 --
 3 files changed, 10 deletions(-)

tools/perf/arch/x86/util/intel-bts.c +0 -4

index af2bce7a2cd6..781df40b2966 100644
@@ -35,10 +35,6 @@
 #define KiB_MASK(x) (KiB(x) - 1)
 #define MiB_MASK(x) (MiB(x) - 1)
 
-#define INTEL_BTS_DFLT_SAMPLE_SIZE	KiB(4)
-
-#define INTEL_BTS_MAX_SAMPLE_SIZE	KiB(60)
-
 struct intel_bts_snapshot_ref {
 	void	*ref_buf;
 	size_t	ref_offset;

tools/perf/arch/x86/util/intel-pt.c +0 -4

index f630de0206a1..6fe667b3269e 100644
@@ -40,10 +40,6 @@
 #define KiB_MASK(x) (KiB(x) - 1)
 #define MiB_MASK(x) (MiB(x) - 1)
 
-#define INTEL_PT_DEFAULT_SAMPLE_SIZE	KiB(4)
-
-#define INTEL_PT_MAX_SAMPLE_SIZE	KiB(60)
-
 #define INTEL_PT_PSB_PERIOD_NEAR	256
 
 struct intel_pt_snapshot_ref {

tools/perf/util/intel-bts.c +0 -2

index b2834ac7b1f5..218ee2bac9a5 100644
@@ -866,8 +866,6 @@ static void intel_bts_print_info(u64 *arr, int start, int finish)
 		fprintf(stdout, intel_bts_info_fmts[i], arr[i]);
 }
 
-u64 intel_bts_auxtrace_info_priv[INTEL_BTS_AUXTRACE_PRIV_SIZE];
-
 int intel_bts_process_auxtrace_info(union perf_event *event,
 				    struct perf_session *session)
 {

Signature · 1 line

2.11.0

Adrian Hunter

reviewer Acked-by on v1 1/2

2017-06-16 06:49 UTC #1 lore raw

Quoted 2 lines · Kim Phillips

Signed-off-by Kim Phillips <[email protected]>

Looks like defines for sampling support that got mixed in with earlier patches. We can always put them back when we need them, so:

Acked-by Adrian Hunter <[email protected]>

Quoted 50 lines

---
 tools/perf/arch/x86/util/intel-bts.c | 4 ----
 tools/perf/arch/x86/util/intel-pt.c  | 4 ----
 tools/perf/util/intel-bts.c          | 2 --
 3 files changed, 10 deletions(-)

tools/perf/arch/x86/util/intel-bts.c +0 -4

index af2bce7a2cd6..781df40b2966 100644
@@ -35,10 +35,6 @@
 #define KiB_MASK(x) (KiB(x) - 1)
 #define MiB_MASK(x) (MiB(x) - 1)
 
-#define INTEL_BTS_DFLT_SAMPLE_SIZE	KiB(4)
-
-#define INTEL_BTS_MAX_SAMPLE_SIZE	KiB(60)
-
 struct intel_bts_snapshot_ref {
 	void	*ref_buf;
 	size_t	ref_offset;

tools/perf/arch/x86/util/intel-pt.c +0 -4

index f630de0206a1..6fe667b3269e 100644
@@ -40,10 +40,6 @@
 #define KiB_MASK(x) (KiB(x) - 1)
 #define MiB_MASK(x) (MiB(x) - 1)
 
-#define INTEL_PT_DEFAULT_SAMPLE_SIZE	KiB(4)
-
-#define INTEL_PT_MAX_SAMPLE_SIZE	KiB(60)
-
 #define INTEL_PT_PSB_PERIOD_NEAR	256
 
 struct intel_pt_snapshot_ref {

tools/perf/util/intel-bts.c +0 -2

index b2834ac7b1f5..218ee2bac9a5 100644
@@ -866,8 +866,6 @@ static void intel_bts_print_info(u64 *arr, int start, int finish)
 		fprintf(stdout, intel_bts_info_fmts[i], arr[i]);
 }
 
-u64 intel_bts_auxtrace_info_priv[INTEL_BTS_AUXTRACE_PRIV_SIZE];
-
 int intel_bts_process_auxtrace_info(union perf_event *event,
 				    struct perf_session *session)
 {

Ingo Molnar

2017-06-16 08:07 UTC #2 lore raw

Quoted 8 lines · Adrian Hunter

Quoted 2 lines · Kim Phillips
Signed-off-by Kim Phillips <[email protected]>
Looks like defines for sampling support that got mixed in with earlier patches. We can always put them back when we need them, so:
Acked-by Adrian Hunter <[email protected]>

The non-existent changelog is wholly inadequate though.

Thanks,

Ingo

Kim Phillips

author

2017-06-16 16:23 UTC #3 lore raw

PATCH v2 1/2 perf intel-pt/bts: remove unused SAMPLE_SIZE defines and bts priv array

These defines were probably dragged in from sampling support in earlier patches. They can be put back when needed.

Acked-by Adrian Hunter <[email protected]>

Signed-off-by Kim Phillips <[email protected]>

---
v2: addressed Ingo's comment by populating changelog with Adrian's explanation of why they were unused

 tools/perf/arch/x86/util/intel-bts.c | 4 ----
 tools/perf/arch/x86/util/intel-pt.c  | 4 ----
 tools/perf/util/intel-bts.c          | 2 --
 3 files changed, 10 deletions(-)

tools/perf/arch/x86/util/intel-bts.c +0 -4

index af2bce7a2cd6..781df40b2966 100644
@@ -35,10 +35,6 @@
 #define KiB_MASK(x) (KiB(x) - 1)
 #define MiB_MASK(x) (MiB(x) - 1)
 
-#define INTEL_BTS_DFLT_SAMPLE_SIZE	KiB(4)
-
-#define INTEL_BTS_MAX_SAMPLE_SIZE	KiB(60)
-
 struct intel_bts_snapshot_ref {
 	void	*ref_buf;
 	size_t	ref_offset;

tools/perf/arch/x86/util/intel-pt.c +0 -4

index f630de0206a1..6fe667b3269e 100644
@@ -40,10 +40,6 @@
 #define KiB_MASK(x) (KiB(x) - 1)
 #define MiB_MASK(x) (MiB(x) - 1)
 
-#define INTEL_PT_DEFAULT_SAMPLE_SIZE	KiB(4)
-
-#define INTEL_PT_MAX_SAMPLE_SIZE	KiB(60)
-
 #define INTEL_PT_PSB_PERIOD_NEAR	256
 
 struct intel_pt_snapshot_ref {

tools/perf/util/intel-bts.c +0 -2

index b2834ac7b1f5..218ee2bac9a5 100644
@@ -866,8 +866,6 @@ static void intel_bts_print_info(u64 *arr, int start, int finish)
 		fprintf(stdout, intel_bts_info_fmts[i], arr[i]);
 }
 
-u64 intel_bts_auxtrace_info_priv[INTEL_BTS_AUXTRACE_PRIV_SIZE];
-
 int intel_bts_process_auxtrace_info(union perf_event *event,
 				    struct perf_session *session)
 {

Signature · 1 line

2.11.0

Arnaldo Carvalho de Melo

maintainer Applied

2017-06-16 16:27 UTC #4 lore raw

Em Fri, Jun 16, 2017 at 11:23:39AM -0500, Kim Phillips escreveu:

Quoted 2 lines

These defines were probably dragged in from sampling support in earlier patches. They can be put back when needed.

Applied.

Ah, please capitalize the first word after the : in the summary, i.e.:

[PATCH 1/2 v2] perf intel-pt/bts: Remove unused SAMPLE_SIZE

Thanks,

- Arnaldo

Quoted 56 lines

Acked-by Adrian Hunter <[email protected]>

Signed-off-by Kim Phillips <[email protected]>

---
v2: addressed Ingo's comment by populating changelog with Adrian's explanation of why they were unused

 tools/perf/arch/x86/util/intel-bts.c | 4 ----
 tools/perf/arch/x86/util/intel-pt.c  | 4 ----
 tools/perf/util/intel-bts.c          | 2 --
 3 files changed, 10 deletions(-)

tools/perf/arch/x86/util/intel-bts.c +0 -4

index af2bce7a2cd6..781df40b2966 100644
@@ -35,10 +35,6 @@
 #define KiB_MASK(x) (KiB(x) - 1)
 #define MiB_MASK(x) (MiB(x) - 1)
 
-#define INTEL_BTS_DFLT_SAMPLE_SIZE	KiB(4)
-
-#define INTEL_BTS_MAX_SAMPLE_SIZE	KiB(60)
-
 struct intel_bts_snapshot_ref {
 	void	*ref_buf;
 	size_t	ref_offset;

tools/perf/arch/x86/util/intel-pt.c +0 -4

index f630de0206a1..6fe667b3269e 100644
@@ -40,10 +40,6 @@
 #define KiB_MASK(x) (KiB(x) - 1)
 #define MiB_MASK(x) (MiB(x) - 1)
 
-#define INTEL_PT_DEFAULT_SAMPLE_SIZE	KiB(4)
-
-#define INTEL_PT_MAX_SAMPLE_SIZE	KiB(60)
-
 #define INTEL_PT_PSB_PERIOD_NEAR	256
 
 struct intel_pt_snapshot_ref {

tools/perf/util/intel-bts.c +0 -2

index b2834ac7b1f5..218ee2bac9a5 100644
@@ -866,8 +866,6 @@ static void intel_bts_print_info(u64 *arr, int start, int finish)
 		fprintf(stdout, intel_bts_info_fmts[i], arr[i]);
 }
 
-u64 intel_bts_auxtrace_info_priv[INTEL_BTS_AUXTRACE_PRIV_SIZE];
-
 int intel_bts_process_auxtrace_info(union perf_event *event,
 				    struct perf_session *session)
 {

Signature · 1 line

2.11.0

tip-bot for Kim Phillips

merge bot

2017-06-20 09:05 UTC #5 lore raw

[tip:perf/core] perf intel-pt/bts: Remove unused SAMPLE_SIZE defines and bts priv array

In reply to Kim Phillips

perf intel-pt/bts: Remove unused SAMPLE_SIZE defines and bts priv array

Commit-ID:  d3cef7fe5151eabcd97ad8f9e595ec55f6ffb318
Gitweb:     http://git.kernel.org/tip/d3cef7fe5151eabcd97ad8f9e595ec55f6ffb318
Author:     Kim Phillips <[email protected]>
AuthorDate: Fri, 16 Jun 2017 11:23:39 -0500
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 19 Jun 2017 15:27:09 -0300

perf intel-pt/bts: Remove unused SAMPLE_SIZE defines and bts priv array

These defines were probably dragged in from sampling support in earlier patches. They can be put back when needed.

Signed-off-by Kim Phillips <[email protected]>

Acked-by Adrian Hunter <[email protected]>

Cc Alexander Shishkin <[email protected]>

Cc Andi Kleen <[email protected]>

Cc Peter Zijlstra <[email protected]>

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/arch/x86/util/intel-bts.c | 4 ----
 tools/perf/arch/x86/util/intel-pt.c  | 4 ----
 tools/perf/util/intel-bts.c          | 2 --
 3 files changed, 10 deletions(-)

tools/perf/arch/x86/util/intel-bts.c +0 -4

index af2bce7..781df40 100644
@@ -35,10 +35,6 @@
 #define KiB_MASK(x) (KiB(x) - 1)
 #define MiB_MASK(x) (MiB(x) - 1)
 
-#define INTEL_BTS_DFLT_SAMPLE_SIZE	KiB(4)
-
-#define INTEL_BTS_MAX_SAMPLE_SIZE	KiB(60)
-
 struct intel_bts_snapshot_ref {
 	void	*ref_buf;
 	size_t	ref_offset;

tools/perf/arch/x86/util/intel-pt.c +0 -4

index f630de0..6fe667b 100644
@@ -40,10 +40,6 @@
 #define KiB_MASK(x) (KiB(x) - 1)
 #define MiB_MASK(x) (MiB(x) - 1)
 
-#define INTEL_PT_DEFAULT_SAMPLE_SIZE	KiB(4)
-
-#define INTEL_PT_MAX_SAMPLE_SIZE	KiB(60)
-
 #define INTEL_PT_PSB_PERIOD_NEAR	256
 
 struct intel_pt_snapshot_ref {

tools/perf/util/intel-bts.c +0 -2

index b2834ac..218ee2b 100644
@@ -866,8 +866,6 @@ static void intel_bts_print_info(u64 *arr, int start, int finish)
 		fprintf(stdout, intel_bts_info_fmts[i], arr[i]);
 }
 
-u64 intel_bts_auxtrace_info_priv[INTEL_BTS_AUXTRACE_PRIV_SIZE];
-
 int intel_bts_process_auxtrace_info(union perf_event *event,
 				    struct perf_session *session)
 {