[v1] perf MANIFEST: Add gen-sysreg for ARM SPE

Message ID 20231122022805.511839-1-irogers@google.com
State New
Headers
Series [v1] perf MANIFEST: Add gen-sysreg for ARM SPE |

Commit Message

Ian Rogers Nov. 22, 2023, 2:28 a.m. UTC
  The necessary files for generating sysreg-defs.h need adding to the
perf tool MANIFEST that lists the files for packaging the perf tool
source code. Fix for the following:

```
$ make perf-tar-src-pkg
$ tar xvf perf-6.7.0-rc2.tar
$ cd perf-6.7.0-rc2
$ make -C tools/perf
...
  PERF_VERSION = 6.7.rc2.gc2d5304e6c64
make[3]: *** No rule to make target 'perf-6.7.0-rc2/arch/arm64/tools/gen-sysreg.awk', needed by 'perf-6.7.0-rc2/tools/arch/arm64/include/generated/asm/sysreg-defs.h'.  Stop.
make[2]: *** [Makefile.perf:456: arm64-sysreg-defs] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [Makefile.perf:242: sub-make] Error 2
make: *** [Makefile:70: all] Error 2
make: Leaving directory 'perf-6.7.0-rc2/tools/perf'
...
```

Fixes: e2bdd172e665 ("perf build: Generate arm64's sysreg-defs.h and add to include path")
---
Note: the breakage is in Linus' tree and perf-tools, not yet in perf-tools-next.

Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/MANIFEST | 2 ++
 1 file changed, 2 insertions(+)
  

Comments

Arnaldo Carvalho de Melo Nov. 22, 2023, 12:18 p.m. UTC | #1
Em Tue, Nov 21, 2023 at 06:28:05PM -0800, Ian Rogers escreveu:
> The necessary files for generating sysreg-defs.h need adding to the
> perf tool MANIFEST that lists the files for packaging the perf tool
> source code. Fix for the following:
> 
> ```
> $ make perf-tar-src-pkg
> $ tar xvf perf-6.7.0-rc2.tar
> $ cd perf-6.7.0-rc2
> $ make -C tools/perf
> ...
>   PERF_VERSION = 6.7.rc2.gc2d5304e6c64
> make[3]: *** No rule to make target 'perf-6.7.0-rc2/arch/arm64/tools/gen-sysreg.awk', needed by 'perf-6.7.0-rc2/tools/arch/arm64/include/generated/asm/sysreg-defs.h'.  Stop.
> make[2]: *** [Makefile.perf:456: arm64-sysreg-defs] Error 2
> make[2]: *** Waiting for unfinished jobs....
> make[1]: *** [Makefile.perf:242: sub-make] Error 2
> make: *** [Makefile:70: all] Error 2
> make: Leaving directory 'perf-6.7.0-rc2/tools/perf'
> ...
> ```
> 
> Fixes: e2bdd172e665 ("perf build: Generate arm64's sysreg-defs.h and add to include path")

Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Namhyung, I'm testing this together with your headers sync series + what
is in perf-tools/tmp.perf-tools, will report results soon.

- Arnaldo

> ---
> Note: the breakage is in Linus' tree and perf-tools, not yet in perf-tools-next.
> 
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
>  tools/perf/MANIFEST | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST
> index 1da7f4b91b4f..dc42de1785ce 100644
> --- a/tools/perf/MANIFEST
> +++ b/tools/perf/MANIFEST
> @@ -1,3 +1,5 @@
> +arch/arm64/tools/gen-sysreg.awk
> +arch/arm64/tools/sysreg
>  tools/perf
>  tools/arch
>  tools/scripts
> -- 
> 2.43.0.rc1.413.gea7ed67945-goog
>
  
Arnaldo Carvalho de Melo Nov. 22, 2023, 12:20 p.m. UTC | #2
Em Wed, Nov 22, 2023 at 09:18:03AM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Tue, Nov 21, 2023 at 06:28:05PM -0800, Ian Rogers escreveu:
> > The necessary files for generating sysreg-defs.h need adding to the
> > perf tool MANIFEST that lists the files for packaging the perf tool
> > source code. Fix for the following:
> > 
> > ```
> > $ make perf-tar-src-pkg
> > $ tar xvf perf-6.7.0-rc2.tar
> > $ cd perf-6.7.0-rc2
> > $ make -C tools/perf

And I detected this while doing these tests on
perf-tools/tmp.perf-tools:

[acme@toolbox perf-tools]$ git log --oneline -1 ; time make -C tools/perf build-test
4dbc034e08146c48 (HEAD -> perf-tools) tools/perf: Update tools's copy of mips syscall table
make: Entering directory '/home/acme/git/perf-tools/tools/perf'
egrep: warning: egrep is obsolescent; using grep -E
- tarpkg: ./tests/perf-targz-src-pkg .
make[1]: *** [tests/make:348: tarpkg] Error 2
make: *** [Makefile:103: build-test] Error 2
make: Leaving directory '/home/acme/git/perf-tools/tools/perf'

real	0m7.498s
user	0m12.059s
sys	0m5.491s
⬢[acme@toolbox perf-tools]$

> > Fixes: e2bdd172e665 ("perf build: Generate arm64's sysreg-defs.h and add to include path")
> 
> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> 
> Namhyung, I'm testing this together with your headers sync series + what
> is in perf-tools/tmp.perf-tools, will report results soon.
> 
> - Arnaldo
> 
> > ---
> > Note: the breakage is in Linus' tree and perf-tools, not yet in perf-tools-next.
> > 
> > Signed-off-by: Ian Rogers <irogers@google.com>
> > ---
> >  tools/perf/MANIFEST | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST
> > index 1da7f4b91b4f..dc42de1785ce 100644
> > --- a/tools/perf/MANIFEST
> > +++ b/tools/perf/MANIFEST
> > @@ -1,3 +1,5 @@
> > +arch/arm64/tools/gen-sysreg.awk
> > +arch/arm64/tools/sysreg
> >  tools/perf
> >  tools/arch
> >  tools/scripts
> > -- 
> > 2.43.0.rc1.413.gea7ed67945-goog
> > 
> 
> -- 
> 
> - Arnaldo
  
Oliver Upton Nov. 22, 2023, 5:04 p.m. UTC | #3
Hi Ian,

On Tue, Nov 21, 2023 at 06:28:05PM -0800, Ian Rogers wrote:
> The necessary files for generating sysreg-defs.h need adding to the
> perf tool MANIFEST that lists the files for packaging the perf tool
> source code. Fix for the following:
> 
> ```
> $ make perf-tar-src-pkg
> $ tar xvf perf-6.7.0-rc2.tar
> $ cd perf-6.7.0-rc2
> $ make -C tools/perf
> ...
>   PERF_VERSION = 6.7.rc2.gc2d5304e6c64
> make[3]: *** No rule to make target 'perf-6.7.0-rc2/arch/arm64/tools/gen-sysreg.awk', needed by 'perf-6.7.0-rc2/tools/arch/arm64/include/generated/asm/sysreg-defs.h'.  Stop.
> make[2]: *** [Makefile.perf:456: arm64-sysreg-defs] Error 2
> make[2]: *** Waiting for unfinished jobs....
> make[1]: *** [Makefile.perf:242: sub-make] Error 2
> make: *** [Makefile:70: all] Error 2
> make: Leaving directory 'perf-6.7.0-rc2/tools/perf'
> ...
> ```
> 
> Fixes: e2bdd172e665 ("perf build: Generate arm64's sysreg-defs.h and add to include path")
> ---
> Note: the breakage is in Linus' tree and perf-tools, not yet in perf-tools-next.
> 
> Signed-off-by: Ian Rogers <irogers@google.com>

I had sent out fixes for both of your comments [*], no preference as to
which gets applied. So, FWIW:

Reviewed-by: Oliver Upton <oliver.upton@linux.dev>

[*] https://lore.kernel.org/linux-perf-users/20231121192956.919380-1-oliver.upton@linux.dev/
  
Namhyung Kim Nov. 22, 2023, 5:22 p.m. UTC | #4
Hi Arnaldo,

On Wed, Nov 22, 2023 at 4:20 AM Arnaldo Carvalho de Melo
<acme@kernel.org> wrote:
>
> Em Wed, Nov 22, 2023 at 09:18:03AM -0300, Arnaldo Carvalho de Melo escreveu:
> > Em Tue, Nov 21, 2023 at 06:28:05PM -0800, Ian Rogers escreveu:
> > > The necessary files for generating sysreg-defs.h need adding to the
> > > perf tool MANIFEST that lists the files for packaging the perf tool
> > > source code. Fix for the following:
> > >
> > > ```
> > > $ make perf-tar-src-pkg
> > > $ tar xvf perf-6.7.0-rc2.tar
> > > $ cd perf-6.7.0-rc2
> > > $ make -C tools/perf
>
> And I detected this while doing these tests on
> perf-tools/tmp.perf-tools:
>
> [acme@toolbox perf-tools]$ git log --oneline -1 ; time make -C tools/perf build-test
> 4dbc034e08146c48 (HEAD -> perf-tools) tools/perf: Update tools's copy of mips syscall table
> make: Entering directory '/home/acme/git/perf-tools/tools/perf'
> egrep: warning: egrep is obsolescent; using grep -E
> - tarpkg: ./tests/perf-targz-src-pkg .
> make[1]: *** [tests/make:348: tarpkg] Error 2
> make: *** [Makefile:103: build-test] Error 2
> make: Leaving directory '/home/acme/git/perf-tools/tools/perf'
>
> real    0m7.498s
> user    0m12.059s
> sys     0m5.491s
> ⬢[acme@toolbox perf-tools]$
>
> > > Fixes: e2bdd172e665 ("perf build: Generate arm64's sysreg-defs.h and add to include path")
> >
> > Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> >
> > Namhyung, I'm testing this together with your headers sync series + what
> > is in perf-tools/tmp.perf-tools, will report results soon.

Great, thanks for the testing!
Namhyung
  
Namhyung Kim Nov. 22, 2023, 5:24 p.m. UTC | #5
Hi Oliver,

On Wed, Nov 22, 2023 at 9:05 AM Oliver Upton <oliver.upton@linux.dev> wrote:
>
> Hi Ian,
>
> On Tue, Nov 21, 2023 at 06:28:05PM -0800, Ian Rogers wrote:
> > The necessary files for generating sysreg-defs.h need adding to the
> > perf tool MANIFEST that lists the files for packaging the perf tool
> > source code. Fix for the following:
> >
> > ```
> > $ make perf-tar-src-pkg
> > $ tar xvf perf-6.7.0-rc2.tar
> > $ cd perf-6.7.0-rc2
> > $ make -C tools/perf
> > ...
> >   PERF_VERSION = 6.7.rc2.gc2d5304e6c64
> > make[3]: *** No rule to make target 'perf-6.7.0-rc2/arch/arm64/tools/gen-sysreg.awk', needed by 'perf-6.7.0-rc2/tools/arch/arm64/include/generated/asm/sysreg-defs.h'.  Stop.
> > make[2]: *** [Makefile.perf:456: arm64-sysreg-defs] Error 2
> > make[2]: *** Waiting for unfinished jobs....
> > make[1]: *** [Makefile.perf:242: sub-make] Error 2
> > make: *** [Makefile:70: all] Error 2
> > make: Leaving directory 'perf-6.7.0-rc2/tools/perf'
> > ...
> > ```
> >
> > Fixes: e2bdd172e665 ("perf build: Generate arm64's sysreg-defs.h and add to include path")
> > ---
> > Note: the breakage is in Linus' tree and perf-tools, not yet in perf-tools-next.
> >
> > Signed-off-by: Ian Rogers <irogers@google.com>
>
> I had sent out fixes for both of your comments [*], no preference as to
> which gets applied. So, FWIW:
>
> Reviewed-by: Oliver Upton <oliver.upton@linux.dev>

Thanks, I think I can pick up your patches as they came before.
Namhyung

>
> [*] https://lore.kernel.org/linux-perf-users/20231121192956.919380-1-oliver.upton@linux.dev/
  

Patch

diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST
index 1da7f4b91b4f..dc42de1785ce 100644
--- a/tools/perf/MANIFEST
+++ b/tools/perf/MANIFEST
@@ -1,3 +1,5 @@ 
+arch/arm64/tools/gen-sysreg.awk
+arch/arm64/tools/sysreg
 tools/perf
 tools/arch
 tools/scripts