tools/perf/util/event.h | 2 +- tools/perf/util/trace-event-scripting.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
BRACH -> BRANCH
Fixes: 88b1473135e4 ("perf script: Separate events from branch types")
Signed-off-by: Yujie Liu <yujie.liu@intel.com>
---
tools/perf/util/event.h | 2 +-
tools/perf/util/trace-event-scripting.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index c7f4b4b841ca..664bf39567ce 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -91,7 +91,7 @@ enum {
PERF_IP_FLAG_VMENTRY |\
PERF_IP_FLAG_VMEXIT)
-#define PERF_IP_FLAG_BRACH_EVENT_MASK \
+#define PERF_IP_FLAG_BRANCH_EVENT_MASK \
(PERF_IP_FLAG_BRANCH_MISS | \
PERF_IP_FLAG_NOT_TAKEN)
diff --git a/tools/perf/util/trace-event-scripting.c b/tools/perf/util/trace-event-scripting.c
index 29cc467be14a..72abb28b7b5a 100644
--- a/tools/perf/util/trace-event-scripting.c
+++ b/tools/perf/util/trace-event-scripting.c
@@ -347,7 +347,7 @@ static int sample_flags_to_name(u32 flags, char *str, size_t size)
flags &= ~(PERF_IP_FLAG_TRACE_BEGIN | PERF_IP_FLAG_TRACE_END);
- types = flags & ~PERF_IP_FLAG_BRACH_EVENT_MASK;
+ types = flags & ~PERF_IP_FLAG_BRANCH_EVENT_MASK;
for (i = 0; sample_flags[i].name; i++) {
if (sample_flags[i].flags != types)
continue;
@@ -359,7 +359,7 @@ static int sample_flags_to_name(u32 flags, char *str, size_t size)
break;
}
- events = flags & PERF_IP_FLAG_BRACH_EVENT_MASK;
+ events = flags & PERF_IP_FLAG_BRANCH_EVENT_MASK;
for (i = 0; branch_events[i].name; i++) {
if (!(branch_events[i].flags & events))
continue;
base-commit: b10f74308e1305275e69ddde711ec817cc69e306
--
2.34.1
On Wed, 12 Mar 2025 15:56:36 +0800, Yujie Liu wrote: > BRACH -> BRANCH > > Applied to perf-tools-next, thanks! Best regards, Namhyung
On 12/03/2025 7:56 am, Yujie Liu wrote:
> BRACH -> BRANCH
>
> Fixes: 88b1473135e4 ("perf script: Separate events from branch types")
> Signed-off-by: Yujie Liu <yujie.liu@intel.com>
> ---
> tools/perf/util/event.h | 2 +-
> tools/perf/util/trace-event-scripting.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
> index c7f4b4b841ca..664bf39567ce 100644
> --- a/tools/perf/util/event.h
> +++ b/tools/perf/util/event.h
> @@ -91,7 +91,7 @@ enum {
> PERF_IP_FLAG_VMENTRY |\
> PERF_IP_FLAG_VMEXIT)
>
> -#define PERF_IP_FLAG_BRACH_EVENT_MASK \
> +#define PERF_IP_FLAG_BRANCH_EVENT_MASK \
> (PERF_IP_FLAG_BRANCH_MISS | \
> PERF_IP_FLAG_NOT_TAKEN)
>
> diff --git a/tools/perf/util/trace-event-scripting.c b/tools/perf/util/trace-event-scripting.c
> index 29cc467be14a..72abb28b7b5a 100644
> --- a/tools/perf/util/trace-event-scripting.c
> +++ b/tools/perf/util/trace-event-scripting.c
> @@ -347,7 +347,7 @@ static int sample_flags_to_name(u32 flags, char *str, size_t size)
>
> flags &= ~(PERF_IP_FLAG_TRACE_BEGIN | PERF_IP_FLAG_TRACE_END);
>
> - types = flags & ~PERF_IP_FLAG_BRACH_EVENT_MASK;
> + types = flags & ~PERF_IP_FLAG_BRANCH_EVENT_MASK;
> for (i = 0; sample_flags[i].name; i++) {
> if (sample_flags[i].flags != types)
> continue;
> @@ -359,7 +359,7 @@ static int sample_flags_to_name(u32 flags, char *str, size_t size)
> break;
> }
>
> - events = flags & PERF_IP_FLAG_BRACH_EVENT_MASK;
> + events = flags & PERF_IP_FLAG_BRANCH_EVENT_MASK;
> for (i = 0; branch_events[i].name; i++) {
> if (!(branch_events[i].flags & events))
> continue;
>
> base-commit: b10f74308e1305275e69ddde711ec817cc69e306
Reviewed-by: James Clark <james.clark@linaro.org>
On Wed, Mar 12, 2025 at 03:56:36PM +0800, Yujie Liu wrote:
> BRACH -> BRANCH
>
> Fixes: 88b1473135e4 ("perf script: Separate events from branch types")
> Signed-off-by: Yujie Liu <yujie.liu@intel.com>
Reviewed-by: Leo Yan <leo.yan@arm.com>
> ---
> tools/perf/util/event.h | 2 +-
> tools/perf/util/trace-event-scripting.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
> index c7f4b4b841ca..664bf39567ce 100644
> --- a/tools/perf/util/event.h
> +++ b/tools/perf/util/event.h
> @@ -91,7 +91,7 @@ enum {
> PERF_IP_FLAG_VMENTRY |\
> PERF_IP_FLAG_VMEXIT)
>
> -#define PERF_IP_FLAG_BRACH_EVENT_MASK \
> +#define PERF_IP_FLAG_BRANCH_EVENT_MASK \
> (PERF_IP_FLAG_BRANCH_MISS | \
> PERF_IP_FLAG_NOT_TAKEN)
>
> diff --git a/tools/perf/util/trace-event-scripting.c b/tools/perf/util/trace-event-scripting.c
> index 29cc467be14a..72abb28b7b5a 100644
> --- a/tools/perf/util/trace-event-scripting.c
> +++ b/tools/perf/util/trace-event-scripting.c
> @@ -347,7 +347,7 @@ static int sample_flags_to_name(u32 flags, char *str, size_t size)
>
> flags &= ~(PERF_IP_FLAG_TRACE_BEGIN | PERF_IP_FLAG_TRACE_END);
>
> - types = flags & ~PERF_IP_FLAG_BRACH_EVENT_MASK;
> + types = flags & ~PERF_IP_FLAG_BRANCH_EVENT_MASK;
> for (i = 0; sample_flags[i].name; i++) {
> if (sample_flags[i].flags != types)
> continue;
> @@ -359,7 +359,7 @@ static int sample_flags_to_name(u32 flags, char *str, size_t size)
> break;
> }
>
> - events = flags & PERF_IP_FLAG_BRACH_EVENT_MASK;
> + events = flags & PERF_IP_FLAG_BRANCH_EVENT_MASK;
> for (i = 0; branch_events[i].name; i++) {
> if (!(branch_events[i].flags & events))
> continue;
>
> base-commit: b10f74308e1305275e69ddde711ec817cc69e306
> --
> 2.34.1
>
© 2016 - 2025 Red Hat, Inc.