* [PATCH] drm/amdgpu: Use local64_try_cmpxchg in amdgpu_perf_read
@ 2023-07-03 15:00 ` Uros Bizjak
0 siblings, 0 replies; 5+ messages in thread
From: Uros Bizjak @ 2023-07-03 15:00 UTC (permalink / raw)
To: amd-gfx, dri-devel, linux-kernel
Cc: Uros Bizjak, Alex Deucher, Christian König, Pan, Xinhui,
David Airlie, Daniel Vetter
Use local64_try_cmpxchg instead of local64_cmpxchg (*ptr, old, new) == old
in amdgpu_perf_read. x86 CMPXCHG instruction returns success in ZF flag,
so this change saves a compare after cmpxchg (and related move instruction
in front of cmpxchg).
Also, try_cmpxchg implicitly assigns old *ptr value to "old" when cmpxchg
fails. There is no need to re-read the value in the loop.
No functional change intended.
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
Cc: David Airlie <airlied@gmail.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
index 71ee361d0972..6e91ea1de5aa 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
@@ -276,9 +276,8 @@ static void amdgpu_perf_read(struct perf_event *event)
(!pe->adev->df.funcs->pmc_get_count))
return;
+ prev = local64_read(&hwc->prev_count);
do {
- prev = local64_read(&hwc->prev_count);
-
switch (hwc->config_base) {
case AMDGPU_PMU_EVENT_CONFIG_TYPE_DF:
case AMDGPU_PMU_EVENT_CONFIG_TYPE_XGMI:
@@ -289,7 +288,7 @@ static void amdgpu_perf_read(struct perf_event *event)
count = 0;
break;
}
- } while (local64_cmpxchg(&hwc->prev_count, prev, count) != prev);
+ } while (!local64_try_cmpxchg(&hwc->prev_count, &prev, count));
local64_add(count - prev, &event->count);
}
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] drm/amdgpu: Use local64_try_cmpxchg in amdgpu_perf_read
@ 2023-07-03 15:00 ` Uros Bizjak
0 siblings, 0 replies; 5+ messages in thread
From: Uros Bizjak @ 2023-07-03 15:00 UTC (permalink / raw)
To: amd-gfx, dri-devel, linux-kernel
Cc: Pan, Xinhui, Uros Bizjak, Alex Deucher, Christian König
Use local64_try_cmpxchg instead of local64_cmpxchg (*ptr, old, new) == old
in amdgpu_perf_read. x86 CMPXCHG instruction returns success in ZF flag,
so this change saves a compare after cmpxchg (and related move instruction
in front of cmpxchg).
Also, try_cmpxchg implicitly assigns old *ptr value to "old" when cmpxchg
fails. There is no need to re-read the value in the loop.
No functional change intended.
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
Cc: David Airlie <airlied@gmail.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
index 71ee361d0972..6e91ea1de5aa 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
@@ -276,9 +276,8 @@ static void amdgpu_perf_read(struct perf_event *event)
(!pe->adev->df.funcs->pmc_get_count))
return;
+ prev = local64_read(&hwc->prev_count);
do {
- prev = local64_read(&hwc->prev_count);
-
switch (hwc->config_base) {
case AMDGPU_PMU_EVENT_CONFIG_TYPE_DF:
case AMDGPU_PMU_EVENT_CONFIG_TYPE_XGMI:
@@ -289,7 +288,7 @@ static void amdgpu_perf_read(struct perf_event *event)
count = 0;
break;
}
- } while (local64_cmpxchg(&hwc->prev_count, prev, count) != prev);
+ } while (!local64_try_cmpxchg(&hwc->prev_count, &prev, count));
local64_add(count - prev, &event->count);
}
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] drm/amdgpu: Use local64_try_cmpxchg in amdgpu_perf_read
@ 2023-07-03 15:00 ` Uros Bizjak
0 siblings, 0 replies; 5+ messages in thread
From: Uros Bizjak @ 2023-07-03 15:00 UTC (permalink / raw)
To: amd-gfx, dri-devel, linux-kernel
Cc: Pan, Xinhui, Uros Bizjak, Daniel Vetter, Alex Deucher,
David Airlie, Christian König
Use local64_try_cmpxchg instead of local64_cmpxchg (*ptr, old, new) == old
in amdgpu_perf_read. x86 CMPXCHG instruction returns success in ZF flag,
so this change saves a compare after cmpxchg (and related move instruction
in front of cmpxchg).
Also, try_cmpxchg implicitly assigns old *ptr value to "old" when cmpxchg
fails. There is no need to re-read the value in the loop.
No functional change intended.
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
Cc: David Airlie <airlied@gmail.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
index 71ee361d0972..6e91ea1de5aa 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
@@ -276,9 +276,8 @@ static void amdgpu_perf_read(struct perf_event *event)
(!pe->adev->df.funcs->pmc_get_count))
return;
+ prev = local64_read(&hwc->prev_count);
do {
- prev = local64_read(&hwc->prev_count);
-
switch (hwc->config_base) {
case AMDGPU_PMU_EVENT_CONFIG_TYPE_DF:
case AMDGPU_PMU_EVENT_CONFIG_TYPE_XGMI:
@@ -289,7 +288,7 @@ static void amdgpu_perf_read(struct perf_event *event)
count = 0;
break;
}
- } while (local64_cmpxchg(&hwc->prev_count, prev, count) != prev);
+ } while (!local64_try_cmpxchg(&hwc->prev_count, &prev, count));
local64_add(count - prev, &event->count);
}
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/amdgpu: Use local64_try_cmpxchg in amdgpu_perf_read
2023-07-03 15:00 ` Uros Bizjak
@ 2023-08-09 22:09 ` Alex Deucher
-1 siblings, 0 replies; 5+ messages in thread
From: Alex Deucher @ 2023-08-09 22:09 UTC (permalink / raw)
To: Uros Bizjak
Cc: amd-gfx, dri-devel, linux-kernel, Pan, Xinhui, Alex Deucher,
Christian König
Applied. Thanks!
Alex
On Mon, Jul 3, 2023 at 7:16 PM Uros Bizjak <ubizjak@gmail.com> wrote:
>
> Use local64_try_cmpxchg instead of local64_cmpxchg (*ptr, old, new) == old
> in amdgpu_perf_read. x86 CMPXCHG instruction returns success in ZF flag,
> so this change saves a compare after cmpxchg (and related move instruction
> in front of cmpxchg).
>
> Also, try_cmpxchg implicitly assigns old *ptr value to "old" when cmpxchg
> fails. There is no need to re-read the value in the loop.
>
> No functional change intended.
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
> Cc: David Airlie <airlied@gmail.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
> index 71ee361d0972..6e91ea1de5aa 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
> @@ -276,9 +276,8 @@ static void amdgpu_perf_read(struct perf_event *event)
> (!pe->adev->df.funcs->pmc_get_count))
> return;
>
> + prev = local64_read(&hwc->prev_count);
> do {
> - prev = local64_read(&hwc->prev_count);
> -
> switch (hwc->config_base) {
> case AMDGPU_PMU_EVENT_CONFIG_TYPE_DF:
> case AMDGPU_PMU_EVENT_CONFIG_TYPE_XGMI:
> @@ -289,7 +288,7 @@ static void amdgpu_perf_read(struct perf_event *event)
> count = 0;
> break;
> }
> - } while (local64_cmpxchg(&hwc->prev_count, prev, count) != prev);
> + } while (!local64_try_cmpxchg(&hwc->prev_count, &prev, count));
>
> local64_add(count - prev, &event->count);
> }
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/amdgpu: Use local64_try_cmpxchg in amdgpu_perf_read
@ 2023-08-09 22:09 ` Alex Deucher
0 siblings, 0 replies; 5+ messages in thread
From: Alex Deucher @ 2023-08-09 22:09 UTC (permalink / raw)
To: Uros Bizjak
Cc: Pan, Xinhui, linux-kernel, dri-devel, amd-gfx, Alex Deucher,
Christian König
Applied. Thanks!
Alex
On Mon, Jul 3, 2023 at 7:16 PM Uros Bizjak <ubizjak@gmail.com> wrote:
>
> Use local64_try_cmpxchg instead of local64_cmpxchg (*ptr, old, new) == old
> in amdgpu_perf_read. x86 CMPXCHG instruction returns success in ZF flag,
> so this change saves a compare after cmpxchg (and related move instruction
> in front of cmpxchg).
>
> Also, try_cmpxchg implicitly assigns old *ptr value to "old" when cmpxchg
> fails. There is no need to re-read the value in the loop.
>
> No functional change intended.
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
> Cc: David Airlie <airlied@gmail.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
> index 71ee361d0972..6e91ea1de5aa 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
> @@ -276,9 +276,8 @@ static void amdgpu_perf_read(struct perf_event *event)
> (!pe->adev->df.funcs->pmc_get_count))
> return;
>
> + prev = local64_read(&hwc->prev_count);
> do {
> - prev = local64_read(&hwc->prev_count);
> -
> switch (hwc->config_base) {
> case AMDGPU_PMU_EVENT_CONFIG_TYPE_DF:
> case AMDGPU_PMU_EVENT_CONFIG_TYPE_XGMI:
> @@ -289,7 +288,7 @@ static void amdgpu_perf_read(struct perf_event *event)
> count = 0;
> break;
> }
> - } while (local64_cmpxchg(&hwc->prev_count, prev, count) != prev);
> + } while (!local64_try_cmpxchg(&hwc->prev_count, &prev, count));
>
> local64_add(count - prev, &event->count);
> }
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-08-09 22:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-03 15:00 [PATCH] drm/amdgpu: Use local64_try_cmpxchg in amdgpu_perf_read Uros Bizjak
2023-07-03 15:00 ` Uros Bizjak
2023-07-03 15:00 ` Uros Bizjak
2023-08-09 22:09 ` Alex Deucher
2023-08-09 22:09 ` Alex Deucher
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.