[PATCH] perf beauty: Reuse the generic switch.

[PATCH] perf beauty: Reuse the generic switch.

[Ian Rogers]

Previously the code would see if, for example,
tools/perf/arch/arm/include/uapi/asm/errno.h exists and if not generate
a "generic" switch statement using the asm-generic/errno.h. This creates
multiple identical "generic" switch statements before the default
generic switch statement for an unknown architecture. By simplifying the
archlist to be only for architectures that are not "generic" the amount
of generated code can be reduced from 14 down to 6 functions.

Remove the special case of x86, instead reverse the architecture names
so that it comes first.

Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/trace/beauty/arch_errno_names.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tools/perf/trace/beauty/arch_errno_names.sh b/tools/perf/trace/beauty/arch_errno_names.sh
index 9f9ea45cddc4..2c5f72fa8108 100755
--- a/tools/perf/trace/beauty/arch_errno_names.sh
+++ b/tools/perf/trace/beauty/arch_errno_names.sh
@@ -87,14 +87,13 @@ cat <<EoHEADER
 
 EoHEADER
 
-# Create list of architectures and ignore those that do not appear
-# in tools/perf/arch
+# Create list of architectures that have a specific errno.h.
 archlist=""
-for arch in $(find $toolsdir/arch -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | grep -v x86 | sort); do
-	test -d $toolsdir/perf/arch/$arch && archlist="$archlist $arch"
+for arch in $(find $toolsdir/arch -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | sort -r); do
+	test -f $toolsdir/arch/$arch/include/uapi/asm/errno.h && archlist="$archlist $arch"
 done
 
-for arch in x86 $archlist generic; do
+for arch in generic $archlist; do
 	process_arch "$arch"
 done
-create_arch_errno_table_func "x86 $archlist" "generic"
+create_arch_errno_table_func "$archlist" "generic"
-- 
2.31.1.751.gd2f1c929bd-goog

Re: [PATCH] perf beauty: Reuse the generic switch.

[Ian Rogers]

On Wed, May 12, 2021 at 11:04 PM Ian Rogers <irogers@google.com> wrote:
>
> Previously the code would see if, for example,
> tools/perf/arch/arm/include/uapi/asm/errno.h exists and if not generate
> a "generic" switch statement using the asm-generic/errno.h. This creates
> multiple identical "generic" switch statements before the default
> generic switch statement for an unknown architecture. By simplifying the
> archlist to be only for architectures that are not "generic" the amount
> of generated code can be reduced from 14 down to 6 functions.
>
> Remove the special case of x86, instead reverse the architecture names
> so that it comes first.
>
> Signed-off-by: Ian Rogers <irogers@google.com>

Ping.

Thanks!
Ian

> ---
>  tools/perf/trace/beauty/arch_errno_names.sh | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/tools/perf/trace/beauty/arch_errno_names.sh b/tools/perf/trace/beauty/arch_errno_names.sh
> index 9f9ea45cddc4..2c5f72fa8108 100755
> --- a/tools/perf/trace/beauty/arch_errno_names.sh
> +++ b/tools/perf/trace/beauty/arch_errno_names.sh
> @@ -87,14 +87,13 @@ cat <<EoHEADER
>
>  EoHEADER
>
> -# Create list of architectures and ignore those that do not appear
> -# in tools/perf/arch
> +# Create list of architectures that have a specific errno.h.
>  archlist=""
> -for arch in $(find $toolsdir/arch -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | grep -v x86 | sort); do
> -       test -d $toolsdir/perf/arch/$arch && archlist="$archlist $arch"
> +for arch in $(find $toolsdir/arch -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | sort -r); do
> +       test -f $toolsdir/arch/$arch/include/uapi/asm/errno.h && archlist="$archlist $arch"
>  done
>
> -for arch in x86 $archlist generic; do
> +for arch in generic $archlist; do
>         process_arch "$arch"
>  done
> -create_arch_errno_table_func "x86 $archlist" "generic"
> +create_arch_errno_table_func "$archlist" "generic"
> --
> 2.31.1.751.gd2f1c929bd-goog
>

Re: [PATCH] perf beauty: Reuse the generic switch.

[Ian Rogers]

On Thu, May 27, 2021 at 8:52 AM Ian Rogers <irogers@google.com> wrote:
>
> On Wed, May 12, 2021 at 11:04 PM Ian Rogers <irogers@google.com> wrote:
> >
> > Previously the code would see if, for example,
> > tools/perf/arch/arm/include/uapi/asm/errno.h exists and if not generate
> > a "generic" switch statement using the asm-generic/errno.h. This creates
> > multiple identical "generic" switch statements before the default
> > generic switch statement for an unknown architecture. By simplifying the
> > archlist to be only for architectures that are not "generic" the amount
> > of generated code can be reduced from 14 down to 6 functions.
> >
> > Remove the special case of x86, instead reverse the architecture names
> > so that it comes first.
> >
> > Signed-off-by: Ian Rogers <irogers@google.com>
>
> Ping.
>
> Thanks!
> Ian

Ping,

Thanks!
Ian

> > ---
> >  tools/perf/trace/beauty/arch_errno_names.sh | 11 +++++------
> >  1 file changed, 5 insertions(+), 6 deletions(-)
> >
> > diff --git a/tools/perf/trace/beauty/arch_errno_names.sh b/tools/perf/trace/beauty/arch_errno_names.sh
> > index 9f9ea45cddc4..2c5f72fa8108 100755
> > --- a/tools/perf/trace/beauty/arch_errno_names.sh
> > +++ b/tools/perf/trace/beauty/arch_errno_names.sh
> > @@ -87,14 +87,13 @@ cat <<EoHEADER
> >
> >  EoHEADER
> >
> > -# Create list of architectures and ignore those that do not appear
> > -# in tools/perf/arch
> > +# Create list of architectures that have a specific errno.h.
> >  archlist=""
> > -for arch in $(find $toolsdir/arch -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | grep -v x86 | sort); do
> > -       test -d $toolsdir/perf/arch/$arch && archlist="$archlist $arch"
> > +for arch in $(find $toolsdir/arch -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | sort -r); do
> > +       test -f $toolsdir/arch/$arch/include/uapi/asm/errno.h && archlist="$archlist $arch"
> >  done
> >
> > -for arch in x86 $archlist generic; do
> > +for arch in generic $archlist; do
> >         process_arch "$arch"
> >  done
> > -create_arch_errno_table_func "x86 $archlist" "generic"
> > +create_arch_errno_table_func "$archlist" "generic"
> > --
> > 2.31.1.751.gd2f1c929bd-goog
> >

Re: [PATCH] perf beauty: Reuse the generic switch.

[Arnaldo Carvalho de Melo]

Em Wed, May 12, 2021 at 11:04:41PM -0700, Ian Rogers escreveu:
> Previously the code would see if, for example,
> tools/perf/arch/arm/include/uapi/asm/errno.h exists and if not generate

If tools/arch/arm/include/uapi/asm/errno.h exists, drop that 'perf/'
after 'tools/':

⬢[acme@toolbox perf]$ ls -la tools/arch/*/include/uapi/asm/errno.h
-rw-r--r--. 1 acme acme 5434 Jul 15 16:17 tools/arch/alpha/include/uapi/asm/errno.h
-rw-r--r--. 1 acme acme 5792 Jul 15 16:17 tools/arch/mips/include/uapi/asm/errno.h
-rw-r--r--. 1 acme acme 5764 Jul 15 16:17 tools/arch/parisc/include/uapi/asm/errno.h
-rw-r--r--. 1 acme acme  278 Jul 15 16:17 tools/arch/powerpc/include/uapi/asm/errno.h
-rw-r--r--. 1 acme acme 5539 Jul 15 16:17 tools/arch/sparc/include/uapi/asm/errno.h
-rw-r--r--. 1 acme acme   31 Jul 15 16:17 tools/arch/x86/include/uapi/asm/errno.h
⬢[acme@toolbox perf]$

I added the steps needed to translate your description to verify
everything and added as committer notes.

Thanks, applied as:

commit b22cc9a6701143fb1fee397e0c2088ee0473340a
Author: Ian Rogers <irogers@google.com>
Date:   Wed May 12 23:04:41 2021 -0700

    perf beauty: Reuse the generic arch errno switch
    
    Previously the code would see if, for example,
    tools/perf/arch/arm/include/uapi/asm/errno.h exists and if not generate
    a "generic" switch statement using the asm-generic/errno.h.
    
    This creates multiple identical "generic" switch statements before the
    default generic switch statement for an unknown architecture.
    
    By simplifying the archlist to be only for architectures that are not
    "generic" the amount of generated code can be reduced from 14 down to 6
    functions.
    
    Remove the special case of x86, instead reverse the architecture names
    so that it comes first.
    
    Committer testing:
    
      $ tools/perf/trace/beauty/arch_errno_names.sh gcc tools > before
    
    Apply this patch and:
    
      $ tools/perf/trace/beauty/arch_errno_names.sh gcc tools > after
    
    14 arches down to 6, that are the ones with an explicit errno.h file:
    
      $ ls -1 tools/arch/*/include/uapi/asm/errno.h
      tools/arch/alpha/include/uapi/asm/errno.h
      tools/arch/mips/include/uapi/asm/errno.h
      tools/arch/parisc/include/uapi/asm/errno.h
      tools/arch/powerpc/include/uapi/asm/errno.h
      tools/arch/sparc/include/uapi/asm/errno.h
      tools/arch/x86/include/uapi/asm/errno.h
      $
    
      $ diff -u4 before after
      @@ -2099,32 +987,16 @@
       const char *arch_syscalls__strerrno(const char *arch, int err)
       {
            if (!strcmp(arch, "x86"))
                    return errno_to_name__x86(err);
      -     if (!strcmp(arch, "alpha"))
      -             return errno_to_name__alpha(err);
      -     if (!strcmp(arch, "arc"))
      -             return errno_to_name__arc(err);
      -     if (!strcmp(arch, "arm"))
      -             return errno_to_name__arm(err);
      -     if (!strcmp(arch, "arm64"))
      -             return errno_to_name__arm64(err);
      -     if (!strcmp(arch, "csky"))
      -             return errno_to_name__csky(err);
      -     if (!strcmp(arch, "mips"))
      -             return errno_to_name__mips(err);
      -     if (!strcmp(arch, "parisc"))
      -             return errno_to_name__parisc(err);
      -     if (!strcmp(arch, "powerpc"))
      -             return errno_to_name__powerpc(err);
      -     if (!strcmp(arch, "riscv"))
      -             return errno_to_name__riscv(err);
      -     if (!strcmp(arch, "s390"))
      -             return errno_to_name__s390(err);
      -     if (!strcmp(arch, "sh"))
      -             return errno_to_name__sh(err);
            if (!strcmp(arch, "sparc"))
                    return errno_to_name__sparc(err);
      -     if (!strcmp(arch, "xtensa"))
      -             return errno_to_name__xtensa(err);
      +     if (!strcmp(arch, "powerpc"))
      +             return errno_to_name__powerpc(err);
      +     if (!strcmp(arch, "parisc"))
      +             return errno_to_name__parisc(err);
      +     if (!strcmp(arch, "mips"))
      +             return errno_to_name__mips(err);
      +     if (!strcmp(arch, "alpha"))
      +             return errno_to_name__alpha(err);
            return errno_to_name__generic(err);
       }
    
    The rest of the patch is the removal of the errno_to_name__generic()
    unneeded clones.
    
    Signed-off-by: Ian Rogers <irogers@google.com>
    Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Mark Rutland <mark.rutland@arm.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Link: http://lore.kernel.org/lkml/20210513060441.408507-1-irogers@google.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/trace/beauty/arch_errno_names.sh b/tools/perf/trace/beauty/arch_errno_names.sh
index 9f9ea45cddc4384c..2c5f72fa81087956 100755
--- a/tools/perf/trace/beauty/arch_errno_names.sh
+++ b/tools/perf/trace/beauty/arch_errno_names.sh
@@ -87,14 +87,13 @@ cat <<EoHEADER
 
 EoHEADER
 
-# Create list of architectures and ignore those that do not appear
-# in tools/perf/arch
+# Create list of architectures that have a specific errno.h.
 archlist=""
-for arch in $(find $toolsdir/arch -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | grep -v x86 | sort); do
-	test -d $toolsdir/perf/arch/$arch && archlist="$archlist $arch"
+for arch in $(find $toolsdir/arch -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | sort -r); do
+	test -f $toolsdir/arch/$arch/include/uapi/asm/errno.h && archlist="$archlist $arch"
 done
 
-for arch in x86 $archlist generic; do
+for arch in generic $archlist; do
 	process_arch "$arch"
 done
-create_arch_errno_table_func "x86 $archlist" "generic"
+create_arch_errno_table_func "$archlist" "generic"