2023-05-23 10:23:16

by Tiezhu Yang

Subject: [PATCH 2/2] perf LoongArch: Simplify mksyscalltbl

In order to print the numerical entries of the syscall table,
there is no need to call the host compiler to build and then
run a program, this can be done directly by the shell script.

This is similar with commit 9854e7ad35fe ("perf arm64: Simplify
mksyscalltbl").

Signed-off-by: Tiezhu Yang <[email protected]>
---
.../arch/loongarch/entry/syscalls/mksyscalltbl | 32 ++++++----------------
1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/tools/perf/arch/loongarch/entry/syscalls/mksyscalltbl b/tools/perf/arch/loongarch/entry/syscalls/mksyscalltbl
index c52156f..d7d97d5 100755
--- a/tools/perf/arch/loongarch/entry/syscalls/mksyscalltbl
+++ b/tools/perf/arch/loongarch/entry/syscalls/mksyscalltbl
@@ -22,40 +22,24 @@ create_table_from_c()
{
local sc nr last_sc

- create_table_exe=`mktemp ${TMPDIR:-/tmp}/create-table-XXXXXX`
-
- {
-
- cat <<-_EoHEADER
- #include <stdio.h>
- #include "$input"
- int main(int argc, char *argv[])
- {
- _EoHEADER
-
while read sc nr; do
- printf "%s\n" " printf(\"\\t[%d] = \\\"$sc\\\",\\n\", $nr);"
- last_sc=$nr
+ printf "%s\n" " [$nr] = \"$sc\","
+ last_sc=$sc
done

- printf "%s\n" " printf(\"#define SYSCALLTBL_LOONGARCH_MAX_ID %d\\n\", $last_sc);"
- printf "}\n"
-
- } | $hostcc -I $incpath/include/uapi -o $create_table_exe -x c -
-
- $create_table_exe
-
- rm -f $create_table_exe
+ printf "%s\n" "#define SYSCALLTBL_LOONGARCH_MAX_ID __NR_$last_sc"
}

create_table()
{
+ echo "#include \"$input\""
echo "static const char *syscalltbl_loongarch[] = {"
create_table_from_c
echo "};"
}

-$gcc -E -dM -x c -I $incpath/include/uapi $input \
- |sed -ne 's/^#define __NR_//p' \
- |sort -t' ' -k2 -n \
+$gcc -E -dM -x c -I $incpath/include/uapi $input \
+ |awk '{if ($2~"__NR" && $3 !~"__NR3264_") {print}}' \
+ |sed -ne 's/^#define __NR_//p;s/^#define __NR3264_//p' \
+ |sort -t' ' -k2 -n \
|create_table
--
2.1.0

2023-05-27 02:18:19

by Leo Yan

Subject: Re: [PATCH 2/2] perf LoongArch: Simplify mksyscalltbl

On Tue, May 23, 2023 at 06:22:07PM +0800, Tiezhu Yang wrote:
> In order to print the numerical entries of the syscall table,
> there is no need to call the host compiler to build and then
> run a program, this can be done directly by the shell script.
>
> This is similar with commit 9854e7ad35fe ("perf arm64: Simplify
> mksyscalltbl").
>
> Signed-off-by: Tiezhu Yang <[email protected]>
> ---
> .../arch/loongarch/entry/syscalls/mksyscalltbl | 32 ++++++----------------
> 1 file changed, 8 insertions(+), 24 deletions(-)
>
> diff --git a/tools/perf/arch/loongarch/entry/syscalls/mksyscalltbl b/tools/perf/arch/loongarch/entry/syscalls/mksyscalltbl
> index c52156f..d7d97d5 100755
> --- a/tools/perf/arch/loongarch/entry/syscalls/mksyscalltbl
> +++ b/tools/perf/arch/loongarch/entry/syscalls/mksyscalltbl
> @@ -22,40 +22,24 @@ create_table_from_c()

Nitpick: since this patch tries to remove the temporary C program and
simply use shell to generate syscall table, to avoid confusion, it's
good to update the function name from create_table_from_c() to
create_sc_table().

I know Arm64's mksyscalltbl has the same issue, we can use a separate
patch to address it.

Otherwise, this patch LGTM:

Reviewed-by: Leo Yan <[email protected]>