2021-02-11 18:42:16

by Ian Rogers

[permalink] [raw]
Subject: [PATCH] perf env: Remove unneeded internal/cpumap inclusions

Minor cleanup.

Signed-off-by: Ian Rogers <[email protected]>
---
tools/perf/bench/epoll-ctl.c | 1 -
tools/perf/bench/epoll-wait.c | 1 -
tools/perf/bench/futex-hash.c | 1 -
tools/perf/bench/futex-lock-pi.c | 1 -
tools/perf/bench/futex-requeue.c | 1 -
tools/perf/bench/futex-wake-parallel.c | 1 -
tools/perf/bench/futex-wake.c | 1 -
tools/perf/tests/openat-syscall-all-cpus.c | 1 -
tools/perf/util/synthetic-events.c | 1 -
9 files changed, 9 deletions(-)

diff --git a/tools/perf/bench/epoll-ctl.c b/tools/perf/bench/epoll-ctl.c
index ca2d591aad8a..ddaca75c3bc0 100644
--- a/tools/perf/bench/epoll-ctl.c
+++ b/tools/perf/bench/epoll-ctl.c
@@ -21,7 +21,6 @@
#include <sys/resource.h>
#include <sys/epoll.h>
#include <sys/eventfd.h>
-#include <internal/cpumap.h>
#include <perf/cpumap.h>

#include "../util/stat.h"
diff --git a/tools/perf/bench/epoll-wait.c b/tools/perf/bench/epoll-wait.c
index 75dca9773186..0a0ff1247c83 100644
--- a/tools/perf/bench/epoll-wait.c
+++ b/tools/perf/bench/epoll-wait.c
@@ -76,7 +76,6 @@
#include <sys/epoll.h>
#include <sys/eventfd.h>
#include <sys/types.h>
-#include <internal/cpumap.h>
#include <perf/cpumap.h>

#include "../util/stat.h"
diff --git a/tools/perf/bench/futex-hash.c b/tools/perf/bench/futex-hash.c
index 915bf3da7ce2..b65373ce5c4f 100644
--- a/tools/perf/bench/futex-hash.c
+++ b/tools/perf/bench/futex-hash.c
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/zalloc.h>
#include <sys/time.h>
-#include <internal/cpumap.h>
#include <perf/cpumap.h>

#include "../util/stat.h"
diff --git a/tools/perf/bench/futex-lock-pi.c b/tools/perf/bench/futex-lock-pi.c
index bb25d8beb3b8..89c6d160379c 100644
--- a/tools/perf/bench/futex-lock-pi.c
+++ b/tools/perf/bench/futex-lock-pi.c
@@ -14,7 +14,6 @@
#include <linux/kernel.h>
#include <linux/zalloc.h>
#include <errno.h>
-#include <internal/cpumap.h>
#include <perf/cpumap.h>
#include "bench.h"
#include "futex.h"
diff --git a/tools/perf/bench/futex-requeue.c b/tools/perf/bench/futex-requeue.c
index 7a15c2e61022..5fa23295ee5f 100644
--- a/tools/perf/bench/futex-requeue.c
+++ b/tools/perf/bench/futex-requeue.c
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/time64.h>
#include <errno.h>
-#include <internal/cpumap.h>
#include <perf/cpumap.h>
#include "bench.h"
#include "futex.h"
diff --git a/tools/perf/bench/futex-wake-parallel.c b/tools/perf/bench/futex-wake-parallel.c
index cd2b81a845ac..6e6f5247e1fe 100644
--- a/tools/perf/bench/futex-wake-parallel.c
+++ b/tools/perf/bench/futex-wake-parallel.c
@@ -29,7 +29,6 @@ int bench_futex_wake_parallel(int argc __maybe_unused, const char **argv __maybe
#include <linux/time64.h>
#include <errno.h>
#include "futex.h"
-#include <internal/cpumap.h>
#include <perf/cpumap.h>

#include <err.h>
diff --git a/tools/perf/bench/futex-wake.c b/tools/perf/bench/futex-wake.c
index 2dfcef3e371e..6d217868f53c 100644
--- a/tools/perf/bench/futex-wake.c
+++ b/tools/perf/bench/futex-wake.c
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/time64.h>
#include <errno.h>
-#include <internal/cpumap.h>
#include <perf/cpumap.h>
#include "bench.h"
#include "futex.h"
diff --git a/tools/perf/tests/openat-syscall-all-cpus.c b/tools/perf/tests/openat-syscall-all-cpus.c
index 71f85e2cc127..f7dd6c463f04 100644
--- a/tools/perf/tests/openat-syscall-all-cpus.c
+++ b/tools/perf/tests/openat-syscall-all-cpus.c
@@ -15,7 +15,6 @@
#include "tests.h"
#include "thread_map.h"
#include <perf/cpumap.h>
-#include <internal/cpumap.h>
#include "debug.h"
#include "stat.h"
#include "util/counts.h"
diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic-events.c
index c6f9db3faf83..0b767233ae1f 100644
--- a/tools/perf/util/synthetic-events.c
+++ b/tools/perf/util/synthetic-events.c
@@ -24,7 +24,6 @@
#include <linux/perf_event.h>
#include <asm/bug.h>
#include <perf/evsel.h>
-#include <internal/cpumap.h>
#include <perf/cpumap.h>
#include <internal/lib.h> // page_size
#include <internal/threadmap.h>
--
2.30.0.478.g8a0d178c01-goog


2021-02-12 08:37:48

by Jiri Olsa

[permalink] [raw]
Subject: Re: [PATCH] perf env: Remove unneeded internal/cpumap inclusions

On Thu, Feb 11, 2021 at 10:39:14AM -0800, Ian Rogers wrote:
> Minor cleanup.
>
> Signed-off-by: Ian Rogers <[email protected]>

Acked-by: Jiri Olsa <[email protected]>

thanks,
jirka

> ---
> tools/perf/bench/epoll-ctl.c | 1 -
> tools/perf/bench/epoll-wait.c | 1 -
> tools/perf/bench/futex-hash.c | 1 -
> tools/perf/bench/futex-lock-pi.c | 1 -
> tools/perf/bench/futex-requeue.c | 1 -
> tools/perf/bench/futex-wake-parallel.c | 1 -
> tools/perf/bench/futex-wake.c | 1 -
> tools/perf/tests/openat-syscall-all-cpus.c | 1 -
> tools/perf/util/synthetic-events.c | 1 -
> 9 files changed, 9 deletions(-)
>
> diff --git a/tools/perf/bench/epoll-ctl.c b/tools/perf/bench/epoll-ctl.c
> index ca2d591aad8a..ddaca75c3bc0 100644
> --- a/tools/perf/bench/epoll-ctl.c
> +++ b/tools/perf/bench/epoll-ctl.c
> @@ -21,7 +21,6 @@
> #include <sys/resource.h>
> #include <sys/epoll.h>
> #include <sys/eventfd.h>
> -#include <internal/cpumap.h>
> #include <perf/cpumap.h>
>
> #include "../util/stat.h"
> diff --git a/tools/perf/bench/epoll-wait.c b/tools/perf/bench/epoll-wait.c
> index 75dca9773186..0a0ff1247c83 100644
> --- a/tools/perf/bench/epoll-wait.c
> +++ b/tools/perf/bench/epoll-wait.c
> @@ -76,7 +76,6 @@
> #include <sys/epoll.h>
> #include <sys/eventfd.h>
> #include <sys/types.h>
> -#include <internal/cpumap.h>
> #include <perf/cpumap.h>
>
> #include "../util/stat.h"
> diff --git a/tools/perf/bench/futex-hash.c b/tools/perf/bench/futex-hash.c
> index 915bf3da7ce2..b65373ce5c4f 100644
> --- a/tools/perf/bench/futex-hash.c
> +++ b/tools/perf/bench/futex-hash.c
> @@ -20,7 +20,6 @@
> #include <linux/kernel.h>
> #include <linux/zalloc.h>
> #include <sys/time.h>
> -#include <internal/cpumap.h>
> #include <perf/cpumap.h>
>
> #include "../util/stat.h"
> diff --git a/tools/perf/bench/futex-lock-pi.c b/tools/perf/bench/futex-lock-pi.c
> index bb25d8beb3b8..89c6d160379c 100644
> --- a/tools/perf/bench/futex-lock-pi.c
> +++ b/tools/perf/bench/futex-lock-pi.c
> @@ -14,7 +14,6 @@
> #include <linux/kernel.h>
> #include <linux/zalloc.h>
> #include <errno.h>
> -#include <internal/cpumap.h>
> #include <perf/cpumap.h>
> #include "bench.h"
> #include "futex.h"
> diff --git a/tools/perf/bench/futex-requeue.c b/tools/perf/bench/futex-requeue.c
> index 7a15c2e61022..5fa23295ee5f 100644
> --- a/tools/perf/bench/futex-requeue.c
> +++ b/tools/perf/bench/futex-requeue.c
> @@ -20,7 +20,6 @@
> #include <linux/kernel.h>
> #include <linux/time64.h>
> #include <errno.h>
> -#include <internal/cpumap.h>
> #include <perf/cpumap.h>
> #include "bench.h"
> #include "futex.h"
> diff --git a/tools/perf/bench/futex-wake-parallel.c b/tools/perf/bench/futex-wake-parallel.c
> index cd2b81a845ac..6e6f5247e1fe 100644
> --- a/tools/perf/bench/futex-wake-parallel.c
> +++ b/tools/perf/bench/futex-wake-parallel.c
> @@ -29,7 +29,6 @@ int bench_futex_wake_parallel(int argc __maybe_unused, const char **argv __maybe
> #include <linux/time64.h>
> #include <errno.h>
> #include "futex.h"
> -#include <internal/cpumap.h>
> #include <perf/cpumap.h>
>
> #include <err.h>
> diff --git a/tools/perf/bench/futex-wake.c b/tools/perf/bench/futex-wake.c
> index 2dfcef3e371e..6d217868f53c 100644
> --- a/tools/perf/bench/futex-wake.c
> +++ b/tools/perf/bench/futex-wake.c
> @@ -20,7 +20,6 @@
> #include <linux/kernel.h>
> #include <linux/time64.h>
> #include <errno.h>
> -#include <internal/cpumap.h>
> #include <perf/cpumap.h>
> #include "bench.h"
> #include "futex.h"
> diff --git a/tools/perf/tests/openat-syscall-all-cpus.c b/tools/perf/tests/openat-syscall-all-cpus.c
> index 71f85e2cc127..f7dd6c463f04 100644
> --- a/tools/perf/tests/openat-syscall-all-cpus.c
> +++ b/tools/perf/tests/openat-syscall-all-cpus.c
> @@ -15,7 +15,6 @@
> #include "tests.h"
> #include "thread_map.h"
> #include <perf/cpumap.h>
> -#include <internal/cpumap.h>
> #include "debug.h"
> #include "stat.h"
> #include "util/counts.h"
> diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic-events.c
> index c6f9db3faf83..0b767233ae1f 100644
> --- a/tools/perf/util/synthetic-events.c
> +++ b/tools/perf/util/synthetic-events.c
> @@ -24,7 +24,6 @@
> #include <linux/perf_event.h>
> #include <asm/bug.h>
> #include <perf/evsel.h>
> -#include <internal/cpumap.h>
> #include <perf/cpumap.h>
> #include <internal/lib.h> // page_size
> #include <internal/threadmap.h>
> --
> 2.30.0.478.g8a0d178c01-goog
>

2021-02-12 20:39:56

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: Re: [PATCH] perf env: Remove unneeded internal/cpumap inclusions

Em Fri, Feb 12, 2021 at 09:33:45AM +0100, Jiri Olsa escreveu:
> On Thu, Feb 11, 2021 at 10:39:14AM -0800, Ian Rogers wrote:
> > Minor cleanup.
> >
> > Signed-off-by: Ian Rogers <[email protected]>
>
> Acked-by: Jiri Olsa <[email protected]>

Thanks, applied.

- Arnaldo


> thanks,
> jirka
>
> > ---
> > tools/perf/bench/epoll-ctl.c | 1 -
> > tools/perf/bench/epoll-wait.c | 1 -
> > tools/perf/bench/futex-hash.c | 1 -
> > tools/perf/bench/futex-lock-pi.c | 1 -
> > tools/perf/bench/futex-requeue.c | 1 -
> > tools/perf/bench/futex-wake-parallel.c | 1 -
> > tools/perf/bench/futex-wake.c | 1 -
> > tools/perf/tests/openat-syscall-all-cpus.c | 1 -
> > tools/perf/util/synthetic-events.c | 1 -
> > 9 files changed, 9 deletions(-)
> >
> > diff --git a/tools/perf/bench/epoll-ctl.c b/tools/perf/bench/epoll-ctl.c
> > index ca2d591aad8a..ddaca75c3bc0 100644
> > --- a/tools/perf/bench/epoll-ctl.c
> > +++ b/tools/perf/bench/epoll-ctl.c
> > @@ -21,7 +21,6 @@
> > #include <sys/resource.h>
> > #include <sys/epoll.h>
> > #include <sys/eventfd.h>
> > -#include <internal/cpumap.h>
> > #include <perf/cpumap.h>
> >
> > #include "../util/stat.h"
> > diff --git a/tools/perf/bench/epoll-wait.c b/tools/perf/bench/epoll-wait.c
> > index 75dca9773186..0a0ff1247c83 100644
> > --- a/tools/perf/bench/epoll-wait.c
> > +++ b/tools/perf/bench/epoll-wait.c
> > @@ -76,7 +76,6 @@
> > #include <sys/epoll.h>
> > #include <sys/eventfd.h>
> > #include <sys/types.h>
> > -#include <internal/cpumap.h>
> > #include <perf/cpumap.h>
> >
> > #include "../util/stat.h"
> > diff --git a/tools/perf/bench/futex-hash.c b/tools/perf/bench/futex-hash.c
> > index 915bf3da7ce2..b65373ce5c4f 100644
> > --- a/tools/perf/bench/futex-hash.c
> > +++ b/tools/perf/bench/futex-hash.c
> > @@ -20,7 +20,6 @@
> > #include <linux/kernel.h>
> > #include <linux/zalloc.h>
> > #include <sys/time.h>
> > -#include <internal/cpumap.h>
> > #include <perf/cpumap.h>
> >
> > #include "../util/stat.h"
> > diff --git a/tools/perf/bench/futex-lock-pi.c b/tools/perf/bench/futex-lock-pi.c
> > index bb25d8beb3b8..89c6d160379c 100644
> > --- a/tools/perf/bench/futex-lock-pi.c
> > +++ b/tools/perf/bench/futex-lock-pi.c
> > @@ -14,7 +14,6 @@
> > #include <linux/kernel.h>
> > #include <linux/zalloc.h>
> > #include <errno.h>
> > -#include <internal/cpumap.h>
> > #include <perf/cpumap.h>
> > #include "bench.h"
> > #include "futex.h"
> > diff --git a/tools/perf/bench/futex-requeue.c b/tools/perf/bench/futex-requeue.c
> > index 7a15c2e61022..5fa23295ee5f 100644
> > --- a/tools/perf/bench/futex-requeue.c
> > +++ b/tools/perf/bench/futex-requeue.c
> > @@ -20,7 +20,6 @@
> > #include <linux/kernel.h>
> > #include <linux/time64.h>
> > #include <errno.h>
> > -#include <internal/cpumap.h>
> > #include <perf/cpumap.h>
> > #include "bench.h"
> > #include "futex.h"
> > diff --git a/tools/perf/bench/futex-wake-parallel.c b/tools/perf/bench/futex-wake-parallel.c
> > index cd2b81a845ac..6e6f5247e1fe 100644
> > --- a/tools/perf/bench/futex-wake-parallel.c
> > +++ b/tools/perf/bench/futex-wake-parallel.c
> > @@ -29,7 +29,6 @@ int bench_futex_wake_parallel(int argc __maybe_unused, const char **argv __maybe
> > #include <linux/time64.h>
> > #include <errno.h>
> > #include "futex.h"
> > -#include <internal/cpumap.h>
> > #include <perf/cpumap.h>
> >
> > #include <err.h>
> > diff --git a/tools/perf/bench/futex-wake.c b/tools/perf/bench/futex-wake.c
> > index 2dfcef3e371e..6d217868f53c 100644
> > --- a/tools/perf/bench/futex-wake.c
> > +++ b/tools/perf/bench/futex-wake.c
> > @@ -20,7 +20,6 @@
> > #include <linux/kernel.h>
> > #include <linux/time64.h>
> > #include <errno.h>
> > -#include <internal/cpumap.h>
> > #include <perf/cpumap.h>
> > #include "bench.h"
> > #include "futex.h"
> > diff --git a/tools/perf/tests/openat-syscall-all-cpus.c b/tools/perf/tests/openat-syscall-all-cpus.c
> > index 71f85e2cc127..f7dd6c463f04 100644
> > --- a/tools/perf/tests/openat-syscall-all-cpus.c
> > +++ b/tools/perf/tests/openat-syscall-all-cpus.c
> > @@ -15,7 +15,6 @@
> > #include "tests.h"
> > #include "thread_map.h"
> > #include <perf/cpumap.h>
> > -#include <internal/cpumap.h>
> > #include "debug.h"
> > #include "stat.h"
> > #include "util/counts.h"
> > diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic-events.c
> > index c6f9db3faf83..0b767233ae1f 100644
> > --- a/tools/perf/util/synthetic-events.c
> > +++ b/tools/perf/util/synthetic-events.c
> > @@ -24,7 +24,6 @@
> > #include <linux/perf_event.h>
> > #include <asm/bug.h>
> > #include <perf/evsel.h>
> > -#include <internal/cpumap.h>
> > #include <perf/cpumap.h>
> > #include <internal/lib.h> // page_size
> > #include <internal/threadmap.h>
> > --
> > 2.30.0.478.g8a0d178c01-goog
> >
>

--

- Arnaldo