1. Patchew
  2. linux
  3. [PATCHSET 0/8] perf tools: Do not set attr.exclude_guest by default (v4)
  4. View patch

[PATCH 6/8] perf tools: Move x86__is_amd_cpu() to util/env.c

Namhyung Kim posted 8 patches 1 month, 4 weeks ago
[PATCH 6/8] perf tools: Move x86__is_amd_cpu() to util/env.c
Posted by Namhyung Kim 1 month, 4 weeks ago 
It can be called from non-x86 platform so let's move it to the general
util directory.  Also add a new helper perf_env__is_x86_amd_cpu() so
that it can be called with an existing perf_env as well.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/arch/x86/util/Build |  1 -
 tools/perf/arch/x86/util/env.c | 19 -------------------
 tools/perf/arch/x86/util/env.h |  7 -------
 tools/perf/arch/x86/util/pmu.c |  2 +-
 tools/perf/util/env.c          | 24 ++++++++++++++++++++++++
 tools/perf/util/env.h          |  4 ++++
 6 files changed, 29 insertions(+), 28 deletions(-)
 delete mode 100644 tools/perf/arch/x86/util/env.c
 delete mode 100644 tools/perf/arch/x86/util/env.h

diff --git a/tools/perf/arch/x86/util/Build b/tools/perf/arch/x86/util/Build
index 2607ed5c42966543..ce6d802a1381c5ab 100644
--- a/tools/perf/arch/x86/util/Build
+++ b/tools/perf/arch/x86/util/Build
@@ -10,7 +10,6 @@ perf-util-y += evlist.o
 perf-util-y += mem-events.o
 perf-util-y += evsel.o
 perf-util-y += iostat.o
-perf-util-y += env.o
 
 perf-util-$(CONFIG_DWARF) += dwarf-regs.o
 perf-util-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o
diff --git a/tools/perf/arch/x86/util/env.c b/tools/perf/arch/x86/util/env.c
deleted file mode 100644
index 3e537ffb1353aab2..0000000000000000
--- a/tools/perf/arch/x86/util/env.c
+++ /dev/null
@@ -1,19 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include "linux/string.h"
-#include "util/env.h"
-#include "env.h"
-
-bool x86__is_amd_cpu(void)
-{
-	struct perf_env env = { .total_mem = 0, };
-	static int is_amd; /* 0: Uninitialized, 1: Yes, -1: No */
-
-	if (is_amd)
-		goto ret;
-
-	perf_env__cpuid(&env);
-	is_amd = env.cpuid && strstarts(env.cpuid, "AuthenticAMD") ? 1 : -1;
-	perf_env__exit(&env);
-ret:
-	return is_amd >= 1 ? true : false;
-}
diff --git a/tools/perf/arch/x86/util/env.h b/tools/perf/arch/x86/util/env.h
deleted file mode 100644
index d78f080b6b3f889a..0000000000000000
--- a/tools/perf/arch/x86/util/env.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _X86_ENV_H
-#define _X86_ENV_H
-
-bool x86__is_amd_cpu(void);
-
-#endif /* _X86_ENV_H */
diff --git a/tools/perf/arch/x86/util/pmu.c b/tools/perf/arch/x86/util/pmu.c
index c3d89d6ba1bf03ad..e0060dac2a9f9242 100644
--- a/tools/perf/arch/x86/util/pmu.c
+++ b/tools/perf/arch/x86/util/pmu.c
@@ -16,7 +16,7 @@
 #include "../../../util/fncache.h"
 #include "../../../util/pmus.h"
 #include "mem-events.h"
-#include "env.h"
+#include "util/env.h"
 
 void perf_pmu__arch_init(struct perf_pmu *pmu __maybe_unused)
 {
diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c
index 1edbccfc3281d2b1..470a0156e0722e4e 100644
--- a/tools/perf/util/env.c
+++ b/tools/perf/util/env.c
@@ -5,6 +5,7 @@
 #include "util/header.h"
 #include "linux/compiler.h"
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/zalloc.h>
 #include "cgroup.h"
 #include <errno.h>
@@ -625,6 +626,7 @@ char *perf_env__find_pmu_cap(struct perf_env *env, const char *pmu_name,
 	return NULL;
 }
 
+
 void perf_env__find_br_cntr_info(struct perf_env *env,
 				 unsigned int *nr,
 				 unsigned int *width)
@@ -639,3 +641,25 @@ void perf_env__find_br_cntr_info(struct perf_env *env,
 					     env->pmu_caps->br_cntr_width;
 	}
 }
+
+bool perf_env__is_x86_amd_cpu(struct perf_env *env)
+{
+	static int is_amd; /* 0: Uninitialized, 1: Yes, -1: No */
+
+	if (is_amd == 0)
+		is_amd = env->cpuid && strstarts(env->cpuid, "AuthenticAMD") ? 1 : -1;
+
+	return is_amd >= 1 ? true : false;
+}
+
+bool x86__is_amd_cpu(void)
+{
+	struct perf_env env = { .total_mem = 0, };
+	bool is_amd;
+
+	perf_env__cpuid(&env);
+	is_amd = perf_env__is_x86_amd_cpu(&env);
+	perf_env__exit(&env);
+
+	return is_amd;
+}
diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h
index 51b36c36019be666..ae604c4edbb7eb44 100644
--- a/tools/perf/util/env.h
+++ b/tools/perf/util/env.h
@@ -195,4 +195,8 @@ bool perf_env__has_pmu_mapping(struct perf_env *env, const char *pmu_name);
 void perf_env__find_br_cntr_info(struct perf_env *env,
 				 unsigned int *nr,
 				 unsigned int *width);
+
+bool x86__is_amd_cpu(void);
+bool perf_env__is_x86_amd_cpu(struct perf_env *env);
+
 #endif /* __PERF_ENV_H */
-- 
2.46.1.824.gd892dcdcdd-goog
Re: [PATCH 6/8] perf tools: Move x86__is_amd_cpu() to util/env.c
Posted by Liang, Kan 1 month, 3 weeks ago 

On 2024-09-30 8:20 p.m., Namhyung Kim wrote:
> It can be called from non-x86 platform so let's move it to the general
> util directory.  Also add a new helper perf_env__is_x86_amd_cpu() so
> that it can be called with an existing perf_env as well.
> 
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
>  tools/perf/arch/x86/util/Build |  1 -
>  tools/perf/arch/x86/util/env.c | 19 -------------------
>  tools/perf/arch/x86/util/env.h |  7 -------
>  tools/perf/arch/x86/util/pmu.c |  2 +-
>  tools/perf/util/env.c          | 24 ++++++++++++++++++++++++
>  tools/perf/util/env.h          |  4 ++++
>  6 files changed, 29 insertions(+), 28 deletions(-)
>  delete mode 100644 tools/perf/arch/x86/util/env.c
>  delete mode 100644 tools/perf/arch/x86/util/env.h
> 
> diff --git a/tools/perf/arch/x86/util/Build b/tools/perf/arch/x86/util/Build
> index 2607ed5c42966543..ce6d802a1381c5ab 100644
> --- a/tools/perf/arch/x86/util/Build
> +++ b/tools/perf/arch/x86/util/Build
> @@ -10,7 +10,6 @@ perf-util-y += evlist.o
>  perf-util-y += mem-events.o
>  perf-util-y += evsel.o
>  perf-util-y += iostat.o
> -perf-util-y += env.o
>  
>  perf-util-$(CONFIG_DWARF) += dwarf-regs.o
>  perf-util-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o
> diff --git a/tools/perf/arch/x86/util/env.c b/tools/perf/arch/x86/util/env.c
> deleted file mode 100644
> index 3e537ffb1353aab2..0000000000000000
> --- a/tools/perf/arch/x86/util/env.c
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -#include "linux/string.h"
> -#include "util/env.h"
> -#include "env.h"
> -
> -bool x86__is_amd_cpu(void)
> -{
> -	struct perf_env env = { .total_mem = 0, };
> -	static int is_amd; /* 0: Uninitialized, 1: Yes, -1: No */
> -
> -	if (is_amd)
> -		goto ret;
> -
> -	perf_env__cpuid(&env);
> -	is_amd = env.cpuid && strstarts(env.cpuid, "AuthenticAMD") ? 1 : -1;
> -	perf_env__exit(&env);
> -ret:
> -	return is_amd >= 1 ? true : false;
> -}
> diff --git a/tools/perf/arch/x86/util/env.h b/tools/perf/arch/x86/util/env.h
> deleted file mode 100644
> index d78f080b6b3f889a..0000000000000000
> --- a/tools/perf/arch/x86/util/env.h
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> -#ifndef _X86_ENV_H
> -#define _X86_ENV_H
> -
> -bool x86__is_amd_cpu(void);
> -
> -#endif /* _X86_ENV_H */
> diff --git a/tools/perf/arch/x86/util/pmu.c b/tools/perf/arch/x86/util/pmu.c
> index c3d89d6ba1bf03ad..e0060dac2a9f9242 100644
> --- a/tools/perf/arch/x86/util/pmu.c
> +++ b/tools/perf/arch/x86/util/pmu.c
> @@ -16,7 +16,7 @@
>  #include "../../../util/fncache.h"
>  #include "../../../util/pmus.h"
>  #include "mem-events.h"
> -#include "env.h"
> +#include "util/env.h"
>  
>  void perf_pmu__arch_init(struct perf_pmu *pmu __maybe_unused)
>  {
> diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c
> index 1edbccfc3281d2b1..470a0156e0722e4e 100644
> --- a/tools/perf/util/env.c
> +++ b/tools/perf/util/env.c
> @@ -5,6 +5,7 @@
>  #include "util/header.h"
>  #include "linux/compiler.h"
>  #include <linux/ctype.h>
> +#include <linux/string.h>
>  #include <linux/zalloc.h>
>  #include "cgroup.h"
>  #include <errno.h>
> @@ -625,6 +626,7 @@ char *perf_env__find_pmu_cap(struct perf_env *env, const char *pmu_name,
>  	return NULL;
>  }
>  
> +

Useless empty line.

Thanks,
Kan
>  void perf_env__find_br_cntr_info(struct perf_env *env,
>  				 unsigned int *nr,
>  				 unsigned int *width)
> @@ -639,3 +641,25 @@ void perf_env__find_br_cntr_info(struct perf_env *env,
>  					     env->pmu_caps->br_cntr_width;
>  	}
>  }
> +
> +bool perf_env__is_x86_amd_cpu(struct perf_env *env)
> +{
> +	static int is_amd; /* 0: Uninitialized, 1: Yes, -1: No */
> +
> +	if (is_amd == 0)
> +		is_amd = env->cpuid && strstarts(env->cpuid, "AuthenticAMD") ? 1 : -1;
> +
> +	return is_amd >= 1 ? true : false;
> +}
> +
> +bool x86__is_amd_cpu(void)
> +{
> +	struct perf_env env = { .total_mem = 0, };
> +	bool is_amd;
> +
> +	perf_env__cpuid(&env);
> +	is_amd = perf_env__is_x86_amd_cpu(&env);
> +	perf_env__exit(&env);
> +
> +	return is_amd;
> +}
> diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h
> index 51b36c36019be666..ae604c4edbb7eb44 100644
> --- a/tools/perf/util/env.h
> +++ b/tools/perf/util/env.h
> @@ -195,4 +195,8 @@ bool perf_env__has_pmu_mapping(struct perf_env *env, const char *pmu_name);
>  void perf_env__find_br_cntr_info(struct perf_env *env,
>  				 unsigned int *nr,
>  				 unsigned int *width);
> +
> +bool x86__is_amd_cpu(void);
> +bool perf_env__is_x86_amd_cpu(struct perf_env *env);
> +
>  #endif /* __PERF_ENV_H */
Re: [PATCH 6/8] perf tools: Move x86__is_amd_cpu() to util/env.c
Posted by Namhyung Kim 1 month, 3 weeks ago 
On Tue, Oct 01, 2024 at 12:03:29PM -0400, Liang, Kan wrote:
> 
> 
> On 2024-09-30 8:20 p.m., Namhyung Kim wrote:
> > It can be called from non-x86 platform so let's move it to the general
> > util directory.  Also add a new helper perf_env__is_x86_amd_cpu() so
> > that it can be called with an existing perf_env as well.
> > 
> > Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> > ---
> >  tools/perf/arch/x86/util/Build |  1 -
> >  tools/perf/arch/x86/util/env.c | 19 -------------------
> >  tools/perf/arch/x86/util/env.h |  7 -------
> >  tools/perf/arch/x86/util/pmu.c |  2 +-
> >  tools/perf/util/env.c          | 24 ++++++++++++++++++++++++
> >  tools/perf/util/env.h          |  4 ++++
> >  6 files changed, 29 insertions(+), 28 deletions(-)
> >  delete mode 100644 tools/perf/arch/x86/util/env.c
> >  delete mode 100644 tools/perf/arch/x86/util/env.h
> > 
> > diff --git a/tools/perf/arch/x86/util/Build b/tools/perf/arch/x86/util/Build
> > index 2607ed5c42966543..ce6d802a1381c5ab 100644
> > --- a/tools/perf/arch/x86/util/Build
> > +++ b/tools/perf/arch/x86/util/Build
> > @@ -10,7 +10,6 @@ perf-util-y += evlist.o
> >  perf-util-y += mem-events.o
> >  perf-util-y += evsel.o
> >  perf-util-y += iostat.o
> > -perf-util-y += env.o
> >  
> >  perf-util-$(CONFIG_DWARF) += dwarf-regs.o
> >  perf-util-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o
> > diff --git a/tools/perf/arch/x86/util/env.c b/tools/perf/arch/x86/util/env.c
> > deleted file mode 100644
> > index 3e537ffb1353aab2..0000000000000000
> > --- a/tools/perf/arch/x86/util/env.c
> > +++ /dev/null
> > @@ -1,19 +0,0 @@
> > -// SPDX-License-Identifier: GPL-2.0
> > -#include "linux/string.h"
> > -#include "util/env.h"
> > -#include "env.h"
> > -
> > -bool x86__is_amd_cpu(void)
> > -{
> > -	struct perf_env env = { .total_mem = 0, };
> > -	static int is_amd; /* 0: Uninitialized, 1: Yes, -1: No */
> > -
> > -	if (is_amd)
> > -		goto ret;
> > -
> > -	perf_env__cpuid(&env);
> > -	is_amd = env.cpuid && strstarts(env.cpuid, "AuthenticAMD") ? 1 : -1;
> > -	perf_env__exit(&env);
> > -ret:
> > -	return is_amd >= 1 ? true : false;
> > -}
> > diff --git a/tools/perf/arch/x86/util/env.h b/tools/perf/arch/x86/util/env.h
> > deleted file mode 100644
> > index d78f080b6b3f889a..0000000000000000
> > --- a/tools/perf/arch/x86/util/env.h
> > +++ /dev/null
> > @@ -1,7 +0,0 @@
> > -/* SPDX-License-Identifier: GPL-2.0 */
> > -#ifndef _X86_ENV_H
> > -#define _X86_ENV_H
> > -
> > -bool x86__is_amd_cpu(void);
> > -
> > -#endif /* _X86_ENV_H */
> > diff --git a/tools/perf/arch/x86/util/pmu.c b/tools/perf/arch/x86/util/pmu.c
> > index c3d89d6ba1bf03ad..e0060dac2a9f9242 100644
> > --- a/tools/perf/arch/x86/util/pmu.c
> > +++ b/tools/perf/arch/x86/util/pmu.c
> > @@ -16,7 +16,7 @@
> >  #include "../../../util/fncache.h"
> >  #include "../../../util/pmus.h"
> >  #include "mem-events.h"
> > -#include "env.h"
> > +#include "util/env.h"
> >  
> >  void perf_pmu__arch_init(struct perf_pmu *pmu __maybe_unused)
> >  {
> > diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c
> > index 1edbccfc3281d2b1..470a0156e0722e4e 100644
> > --- a/tools/perf/util/env.c
> > +++ b/tools/perf/util/env.c
> > @@ -5,6 +5,7 @@
> >  #include "util/header.h"
> >  #include "linux/compiler.h"
> >  #include <linux/ctype.h>
> > +#include <linux/string.h>
> >  #include <linux/zalloc.h>
> >  #include "cgroup.h"
> >  #include <errno.h>
> > @@ -625,6 +626,7 @@ char *perf_env__find_pmu_cap(struct perf_env *env, const char *pmu_name,
> >  	return NULL;
> >  }
> >  
> > +
> 
> Useless empty line.

Ugh, will remove.

Thanks,
Namhyung

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.