drm/amdgpu: optimize the padding with hw optimization
Subsystems (2)
PATCH 1/1 drm/amdgpu: optimize the padding with hw optimization
Adding NOP packets one by one in the ring
does not use the CP efficiently.
Solution:
Use CP optimization while adding NOP packet's so PFP can discard NOP packets based on information of count from the Header instead of fetching all NOP packets one by one.
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +21 -3
@@ -9397,6 +9397,24 @@ static void gfx_v10_0_emit_mem_sync(struct amdgpu_ring *ring)amdgpu_ring_write (ring, gcr_cntl);/* GCR_CNTL */ } +static void amdgpu_gfx10_ring_insert_nop (struct amdgpu_ring *ring,uint32_t num_nop) +{ +int i; + +/* Header itself is a NOP packet */ +if (num_nop ==1 ) { +amdgpu_ring_write (ring, ring->funcs->nop); +return ; + } + +/* Max HW optimization till 0x3ffe, followed by remaining one NOP at a time*/ +amdgpu_ring_write (ring,PACKET3 (PACKET3_NOP ,min (num_nop -2 ,0x3ffe ))); + +/* Header is at index 0, followed by num_nops - 1 NOP packet's */ +for (i =1 ; i < num_nop; i++) +amdgpu_ring_write (ring, ring->funcs->nop); +} +static void gfx_v10_ip_print (void *handle,struct drm_printer *p) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@@ -9588,7 +9606,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_gfx = { .emit_hdp_flush = gfx_v10_0_ring_emit_hdp_flush, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_switch_buffer = gfx_v10_0_ring_emit_sb, .emit_cntxcntl = gfx_v10_0_ring_emit_cntxcntl,
@@ -9629,7 +9647,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_compute = { .emit_hdp_flush = gfx_v10_0_ring_emit_hdp_flush, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_wreg = gfx_v10_0_ring_emit_wreg, .emit_reg_wait = gfx_v10_0_ring_emit_reg_wait,
@@ -9659,7 +9677,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_kiq = { .emit_fence = gfx_v10_0_ring_emit_fence_kiq, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_rreg = gfx_v10_0_ring_emit_rreg, .emit_wreg = gfx_v10_0_ring_emit_wreg,
Signature · 1 line
2.34.1
Am 30.07.24 um 14:43 schrieb Sunil Khatri:
Quoted 9 lines
Adding NOP packets one by one in the ring
does not use the CP efficiently.Solution:
Use CP optimization while adding NOP packet's so PFP can discard NOP packets based on information of count from the Header instead of fetching all NOP packets one by one.
Quoted 5 lines
Cc Christian König <[email protected]>Cc Pierre-Eric Pelloux-Prayer <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Marek Olšák <[email protected]>Signed-off-by Sunil Khatri <[email protected]>
Quoted 60 lines
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +21
-3@@ -9397,6 +9397,24 @@ static void gfx_v10_0_emit_mem_sync(struct amdgpu_ring *ring)amdgpu_ring_write (ring, gcr_cntl);/* GCR_CNTL */ } +static void amdgpu_gfx10_ring_insert_nop (struct amdgpu_ring *ring,uint32_t num_nop) +{ +int i; + +/* Header itself is a NOP packet */ +if (num_nop ==1 ) { +amdgpu_ring_write (ring, ring->funcs->nop); +return ; + } + +/* Max HW optimization till 0x3ffe, followed by remaining one NOP at a time*/ +amdgpu_ring_write (ring,PACKET3 (PACKET3_NOP ,min (num_nop -2 ,0x3ffe ))); + +/* Header is at index 0, followed by num_nops - 1 NOP packet's */ +for (i =1 ; i < num_nop; i++) +amdgpu_ring_write (ring, ring->funcs->nop); +} +static void gfx_v10_ip_print (void *handle,struct drm_printer *p) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;@@ -9588,7 +9606,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_gfx = { .emit_hdp_flush = gfx_v10_0_ring_emit_hdp_flush, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_switch_buffer = gfx_v10_0_ring_emit_sb, .emit_cntxcntl = gfx_v10_0_ring_emit_cntxcntl,@@ -9629,7 +9647,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_compute = { .emit_hdp_flush = gfx_v10_0_ring_emit_hdp_flush, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_wreg = gfx_v10_0_ring_emit_wreg, .emit_reg_wait = gfx_v10_0_ring_emit_reg_wait,@@ -9659,7 +9677,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_kiq = { .emit_fence = gfx_v10_0_ring_emit_fence_kiq, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_rreg = gfx_v10_0_ring_emit_rreg, .emit_wreg = gfx_v10_0_ring_emit_wreg,
Quoted 33 lines · Sunil Khatri
Adding NOP packets one by one in the ring
does not use the CP efficiently.Solution:
Use CP optimization while adding NOP packet's so PFP can discard NOP packets based on information of count from the Header instead of fetching all NOP packets one by one.Cc Christian König <[email protected]>Cc Pierre-Eric Pelloux-Prayer <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Marek Olšák <[email protected]>Signed-off-by Sunil Khatri <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +6
-0@@ -9397,6 +9397,24 @@ static void gfx_v10_0_emit_mem_sync(struct amdgpu_ring *ring)amdgpu_ring_write (ring, gcr_cntl);/* GCR_CNTL */ } +static void amdgpu_gfx10_ring_insert_nop (struct amdgpu_ring *ring,uint32_t num_nop) +{ +int i; + +/* Header itself is a NOP packet */ +if (num_nop ==1 ) {
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c static void gfx_v10_0_emit_mem_sync(struct amdgpu_ring *ring) · line 9415
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +10
-0+amdgpu_ring_write (ring, ring->funcs->nop); +return ; + } + +/* Max HW optimization till 0x3ffe, followed by remaining one NOP at a time*/ +amdgpu_ring_write (ring,PACKET3 (PACKET3_NOP ,min (num_nop -2 ,0x3ffe ))); + +/* Header is at index 0, followed by num_nops - 1 NOP packet's */ +for (i =1 ; i < num_nop; i++) +amdgpu_ring_write (ring, ring->funcs->nop);
This loop should be removed. It's unnecessary CPU overhead and we should never get more than 0x3fff NOPs (maybe use BUG_ON). Leaving the whole packet body uninitialized is the fastest option.
Marek
Quoted 35 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +5
-4+} +static void gfx_v10_ip_print (void *handle,struct drm_printer *p) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;@@ -9588,7 +9606,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_gfx = { .emit_hdp_flush = gfx_v10_0_ring_emit_hdp_flush, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_switch_buffer = gfx_v10_0_ring_emit_sb, .emit_cntxcntl = gfx_v10_0_ring_emit_cntxcntl,@@ -9629,7 +9647,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_compute = { .emit_hdp_flush = gfx_v10_0_ring_emit_hdp_flush, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_wreg = gfx_v10_0_ring_emit_wreg, .emit_reg_wait = gfx_v10_0_ring_emit_reg_wait,@@ -9659,7 +9677,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_kiq = { .emit_fence = gfx_v10_0_ring_emit_fence_kiq, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_rreg = gfx_v10_0_ring_emit_rreg, .emit_wreg = gfx_v10_0_ring_emit_wreg, --2.34.1
Quoted 41 lines · Marek Olšák
Quoted 39 lines · Sunil Khatri
Adding NOP packets one by one in the ring
does not use the CP efficiently.Solution:
Use CP optimization while adding NOP packet's so PFP can discard NOP packets based on information of count from the Header instead of fetching all NOP packets one by one.Cc Christian König <[email protected]>Cc Pierre-Eric Pelloux-Prayer <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Marek Olšák <[email protected]>Signed-off-by Sunil Khatri <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +12
-0@@ -9397,6 +9397,24 @@ static void gfx_v10_0_emit_mem_sync(struct amdgpu_ring *ring)amdgpu_ring_write (ring, gcr_cntl);/* GCR_CNTL */ } +static void amdgpu_gfx10_ring_insert_nop (struct amdgpu_ring *ring,uint32_t num_nop) +{ +int i; + +/* Header itself is a NOP packet */ +if (num_nop ==1 ) { +amdgpu_ring_write (ring, ring->funcs->nop); +return ; + } + +/* Max HW optimization till 0x3ffe, followed by remaining one NOP at a time*/ +amdgpu_ring_write (ring,PACKET3 (PACKET3_NOP ,min (num_nop -2 ,0x3ffe )));
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c static void gfx_v10_0_emit_mem_sync(struct amdgpu_ring *ring) · line 9415
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +4
-0+ +/* Header is at index 0, followed by num_nops - 1 NOP packet's */ +for (i =1 ; i < num_nop; i++) +amdgpu_ring_write (ring, ring->funcs->nop);This loop should be removed. It's unnecessary CPU overhead and we should never get more than
0x3fffNOPs (maybe useBUG_ON). Leaving the whole packet body uninitialized is the fastest option.
If you remove amdgpu_ring_write, you still need to move wptr somehow. amdgpu_ring_write_multiple gives a hint about how to do it:
ring->wptr += count_dw;ring->wptr &= ring->ptr_mask;ring->count_dw -= count_dw;
Marek
Quoted 38 lines
Marek
Quoted 35 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +5
-4+} +static void gfx_v10_ip_print (void *handle,struct drm_printer *p) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;@@ -9588,7 +9606,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_gfx = { .emit_hdp_flush = gfx_v10_0_ring_emit_hdp_flush, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_switch_buffer = gfx_v10_0_ring_emit_sb, .emit_cntxcntl = gfx_v10_0_ring_emit_cntxcntl,@@ -9629,7 +9647,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_compute = { .emit_hdp_flush = gfx_v10_0_ring_emit_hdp_flush, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_wreg = gfx_v10_0_ring_emit_wreg, .emit_reg_wait = gfx_v10_0_ring_emit_reg_wait,@@ -9659,7 +9677,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_kiq = { .emit_fence = gfx_v10_0_ring_emit_fence_kiq, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_rreg = gfx_v10_0_ring_emit_rreg, .emit_wreg = gfx_v10_0_ring_emit_wreg, --2.34.1
Quoted 47 lines · Marek Olšák
Quoted 38 lines · Marek Olšák
Quoted 37 lines · Sunil Khatri
Adding NOP packets one by one in the ring
does not use the CP efficiently.Solution:
Use CP optimization while adding NOP packet's so PFP can discard NOP packets based on information of count from the Header instead of fetching all NOP packets one by one.Cc Christian König <[email protected]>Cc Pierre-Eric Pelloux-Prayer <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Marek Olšák <[email protected]>Signed-off-by Sunil Khatri <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +11
-0@@ -9397,6 +9397,24 @@ static void gfx_v10_0_emit_mem_sync(struct amdgpu_ring *ring)amdgpu_ring_write (ring, gcr_cntl);/* GCR_CNTL */ } +static void amdgpu_gfx10_ring_insert_nop (struct amdgpu_ring *ring,uint32_t num_nop) +{ +int i; + +/* Header itself is a NOP packet */ +if (num_nop ==1 ) { +amdgpu_ring_write (ring, ring->funcs->nop); +return ; + } + +/* Max HW optimization till 0x3ffe, followed by remaining one NOP at a time*/ Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c static void gfx_v10_0_emit_mem_sync(struct amdgpu_ring *ring) · line 9415
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +5
-0+amdgpu_ring_write (ring,PACKET3 (PACKET3_NOP ,min (num_nop -2 ,0x3ffe ))); + +/* Header is at index 0, followed by num_nops - 1 NOP packet's */ +for (i =1 ; i < num_nop; i++) +amdgpu_ring_write (ring, ring->funcs->nop);This loop should be removed. It's unnecessary CPU overhead and we should never get more than
0x3fffNOPs (maybe useBUG_ON). Leaving the whole packet body uninitialized is the fastest option.
Quoted 6 lines
If you remove
amdgpu_ring_write, you still need to move wptr somehow.amdgpu_ring_write_multiplegives a hint about how to do it:
ring->wptr+=count_dw;ring->wptr&=ring->ptr_mask;ring->count_dw-=count_dw;
The reason i gave in the previous commit why we just dint just move the wptr instead or writing all nops in the ring. I also tried exactly what is given above to just move wptr but the device dint boot.
Possible the calculation is wrong or on some target the NOP isnt working as expected. With this approach if the NOP is working as per spec it would help in saving GPU cycles and if it does not in that case
also it wont crash as NOPS are still there in the ring.
I did not spend more time in analysing the crash due to just shifting the wptr for the reason explained in previous commit. Original understanding was to just move wptr but based on christian feedback we are still filling the ring with nops.
Quoted 40 lines
Marek
Quoted 37 lines
Marek
Quoted 35 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +5
-4+} +static void gfx_v10_ip_print (void *handle,struct drm_printer *p) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;@@ -9588,7 +9606,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_gfx = { .emit_hdp_flush = gfx_v10_0_ring_emit_hdp_flush, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_switch_buffer = gfx_v10_0_ring_emit_sb, .emit_cntxcntl = gfx_v10_0_ring_emit_cntxcntl,@@ -9629,7 +9647,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_compute = { .emit_hdp_flush = gfx_v10_0_ring_emit_hdp_flush, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_wreg = gfx_v10_0_ring_emit_wreg, .emit_reg_wait = gfx_v10_0_ring_emit_reg_wait,@@ -9659,7 +9677,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_kiq = { .emit_fence = gfx_v10_0_ring_emit_fence_kiq, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_rreg = gfx_v10_0_ring_emit_rreg, .emit_wreg = gfx_v10_0_ring_emit_wreg, --2.34.1
Quoted 38 lines · Marek Olšák
Quoted 37 lines · Sunil Khatri
Adding NOP packets one by one in the ring
does not use the CP efficiently.Solution:
Use CP optimization while adding NOP packet's so PFP can discard NOP packets based on information of count from the Header instead of fetching all NOP packets one by one.Cc Christian König <[email protected]>Cc Pierre-Eric Pelloux-Prayer <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Marek Olšák <[email protected]>Signed-off-by Sunil Khatri <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +11
-0@@ -9397,6 +9397,24 @@ static void gfx_v10_0_emit_mem_sync(struct amdgpu_ring *ring)amdgpu_ring_write (ring, gcr_cntl);/* GCR_CNTL */ } +static void amdgpu_gfx10_ring_insert_nop (struct amdgpu_ring *ring,uint32_t num_nop) +{ +int i; + +/* Header itself is a NOP packet */ +if (num_nop ==1 ) { +amdgpu_ring_write (ring, ring->funcs->nop); +return ; + } + +/* Max HW optimization till 0x3ffe, followed by remaining one NOP at a time*/
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c static void gfx_v10_0_emit_mem_sync(struct amdgpu_ring *ring) · line 9415
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +5
-0+amdgpu_ring_write (ring,PACKET3 (PACKET3_NOP ,min (num_nop -2 ,0x3ffe ))); + +/* Header is at index 0, followed by num_nops - 1 NOP packet's */ +for (i =1 ; i < num_nop; i++) +amdgpu_ring_write (ring, ring->funcs->nop);This loop should be removed. It's unnecessary CPU overhead and we should never get more than
0x3fffNOPs (maybe useBUG_ON). Leaving the whole packet body uninitialized is the fastest option.
That was the original intent to just move the WPTR for the no of nops and tried too. Based on Christian inputs we should not let the nops packet
as garbage or whatever was there originally as a threat/safety measure. So CPU side there isnt any optimization but just CP will skip all these so GPU side should see the benefit.
Regards
Sunil Khatri
Quoted 38 lines
Marek
Quoted 35 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +5
-4+} +static void gfx_v10_ip_print (void *handle,struct drm_printer *p) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;@@ -9588,7 +9606,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_gfx = { .emit_hdp_flush = gfx_v10_0_ring_emit_hdp_flush, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_switch_buffer = gfx_v10_0_ring_emit_sb, .emit_cntxcntl = gfx_v10_0_ring_emit_cntxcntl,@@ -9629,7 +9647,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_compute = { .emit_hdp_flush = gfx_v10_0_ring_emit_hdp_flush, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_wreg = gfx_v10_0_ring_emit_wreg, .emit_reg_wait = gfx_v10_0_ring_emit_reg_wait,@@ -9659,7 +9677,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_kiq = { .emit_fence = gfx_v10_0_ring_emit_fence_kiq, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_rreg = gfx_v10_0_ring_emit_rreg, .emit_wreg = gfx_v10_0_ring_emit_wreg, --2.34.1
Quoted 52 lines · Sunil
Quoted 1 line · Marek Olšák
On Tue, Jul 30, 2024 at 8:43 AM Sunil Khatri <[email protected]>
Quoted 18 lines · wrote:
Quoted 18 lines
Adding NOP packets one by one in the ring
does not use the CP efficiently.Solution:
Use CP optimization while adding NOP packet's so PFP can discard NOP packets based on information of count from the Header instead of fetching all NOP packets one by one.Cc Christian König <[email protected]>Cc Pierre-Eric Pelloux-Prayer <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Marek Olšák <[email protected]>Signed-off-by Sunil Khatri <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)Quoted 1 line
Review
Quoted 1 line
(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.cQuoted 4 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c static void gfx_v10_0_emit_mem_sync(struct
Quoted 4 lines
index
853084a2ce7f..edf5b5c4d185100644drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +0
-0@@ -9397,6 +9397,24 @@ static void gfx_v10_0_emit_mem_sync(struct
amdgpu_ring*ring)Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c static void gfx_v10_0_emit_mem_sync(struct amdgpu_ring *ring)
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +1
-0amdgpu_ring_write (ring, gcr_cntl);/* GCR_CNTL */ } +static void amdgpu_gfx10_ring_insert_nop(struct amdgpu_ring *ring,
uint32_tnum_nop)Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c static void gfx_v10_0_emit_mem_sync(struct amdgpu_ring *ring)
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +10
-0+{ +int i; + +/* Header itself is a NOP packet */ +if (num_nop ==1 ) { +amdgpu_ring_write (ring, ring->funcs->nop); +return ; + } + +/* Max HW optimization till 0x3ffe, followed by remaining one NOP at a time*/
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c static void gfx_v10_0_emit_mem_sync(struct · line 9411
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +1
-0+ amdgpu_ring_write(ring, PACKET3(PACKET3_NOP, min(num_nop - 2,
0x3ffe)));Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c static void gfx_v10_0_emit_mem_sync(struct · line 9413
Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +2
-0+ +/* Header is at index 0, followed by num_nops - 1 NOP packet's */
Quoted 2 lines
Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +2
-0+for (i =1 ; i < num_nop; i++) +amdgpu_ring_write (ring, ring->funcs->nop);
Quoted 7 lines
Quoted 3 lines
This loop should be removed. It's unnecessary CPU overhead and we should never get more than
0x3fffNOPs (maybe useBUG_ON). Leaving the whole packet body uninitialized is the fastest option.That was the original intent to just move the WPTR for the no of nops and tried too. Based on Christian inputs we should not let the nops packet
as garbage or whatever was there originally as a threat/safety measure.
It doesn't help safety. It can only be read by the GPU with kernel-level permissions.
Initializing the packet body is useless and adds CPU overhead, especially with the 256 NOPs or so that we use for no reason.
Marek
Quoted 48 lines
So CPU side there isnt any optimization but just CP will skip all these so GPU side should see the benefit.
Regards
Sunil KhatriQuoted 9 lines
Marek
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c static const struct amdgpu_ring_funcs
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +2
-0+} +static void gfx_v10_ip_print (void *handle,struct drm_printer *p) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;@@ -9588,7 +9606,7 @@ static const struct amdgpu_ring_funcs
gfx_v10_0_ring_funcs_gfx= {Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c static const struct amdgpu_ring_funcs
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +1
-1.emit_hdp_flush = gfx_v10_0_ring_emit_hdp_flush, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_switch_buffer = gfx_v10_0_ring_emit_sb, .emit_cntxcntl = gfx_v10_0_ring_emit_cntxcntl,@@ -9629,7 +9647,7 @@ static const struct amdgpu_ring_funcs
gfx_v10_0_ring_funcs_compute= {Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c static const struct amdgpu_ring_funcs
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +1
-1.emit_hdp_flush = gfx_v10_0_ring_emit_hdp_flush, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_wreg = gfx_v10_0_ring_emit_wreg, .emit_reg_wait = gfx_v10_0_ring_emit_reg_wait,@@ -9659,7 +9677,7 @@ static const struct amdgpu_ring_funcs
gfx_v10_0_ring_funcs_kiq= {Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +1
-2.emit_fence = gfx_v10_0_ring_emit_fence_kiq, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_rreg = gfx_v10_0_ring_emit_rreg, .emit_wreg = gfx_v10_0_ring_emit_wreg, --2.34.1
Christian König
maintainerAm 01.08.24 um 08:53 schrieb Marek Olšák:
Quoted 16 lines · Sunil
On 8/1/2024 8:49 AM, Marek Olšák wrote:
>> + /* Header is at index 0, followed bynum_nops- 1 NOP packet's */
>> + for (i = 1; i <num_nop; i++)
>> + amdgpu_ring_write(ring,ring->funcs->nop); > This loop should be removed. It's unnecessary CPU overhead and we > should never get more than0x3fffNOPs (maybe useBUG_ON). Leaving the
> whole packet body uninitialized is the fastest option. That was the original intent to just move the WPTR for the no of nops and tried too. Based on Christian inputs we should not let the nops packet
Quoted 7 lines
as garbage or whatever was there originally as a threat/safety measure.
It doesn't help safety. It can only be read by the GPU with kernel-level permissions.
Initializing the packet body is useless and adds CPU overhead, especially with the 256 NOPs or so that we use for no reason.
Not filling the remaining ring buffers with NOPs is a pretty clear NAK from my side. Leaving garbage in the ring buffer is not even remotely defensive.
What we can do is to optimize filling N DWs into the ring buffer without updating the WPTR each time.
Regards,
Christian.
Quoted 3 lines
Marek
Quoted 22 lines · On Thu, Aug 1, 2024, 03:37 Christian König <[email protected]> wrote:
Am 01.08.24 um 08:53 schrieb Marek Olšák:
Quoted 6 lines · Sunil
Quoted 1 line · Marek Olšák
Quoted 1 line
+ /* Header is at index 0, followed by
num_nops- 1 NOP packet's*/
Quoted 2 lines
Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +2
-0+for (i =1 ; i < num_nop; i++) +amdgpu_ring_write (ring, ring->funcs->nop);Quoted 7 lines
Quoted 3 lines
This loop should be removed. It's unnecessary CPU overhead and we should never get more than
0x3fffNOPs (maybe useBUG_ON). Leaving the whole packet body uninitialized is the fastest option.That was the original intent to just move the WPTR for the no of nops and tried too. Based on Christian inputs we should not let the nops packet
as garbage or whatever was there originally as a threat/safety measure.
It doesn't help safety. It can only be read by the GPU with kernel-level permissions.
Quoted 8 lines
Initializing the packet body is useless and adds CPU overhead, especially with the 256 NOPs or so that we use for no reason.
Not filling the remaining ring buffers with NOPs is a pretty clear NAK from my side. Leaving garbage in the ring buffer is not even remotely defensive.
What are you defending against? You know the ring is kernel-owned memory, right?
Marek
Quoted 10 lines
What we can do is to optimize filling N DWs into the ring buffer without updating the WPTR each time.
Regards,
Christian.Marek
Quoted 34 lines · Marek Olšák
On Thu, Aug 1, 2024, 03:37 Christian König <[email protected] <mailto:[email protected]>> wrote:
__ Am 01.08.24 um 08:53 schrieb Marek Olšák:Quoted 23 lines
On Thu, Aug 1, 2024, 00:28 Khatri, Sunil <[email protected] <mailto:[email protected]>> wrote:
On 8/1/2024 8:49 AM, Marek Olšák wrote:
>> + /* Header is at index 0, followed bynum_nops- 1 NOP packet's */
>> + for (i = 1; i <num_nop; i++)
>> + amdgpu_ring_write(ring,ring->funcs->nop); > This loop should be removed. It's unnecessary CPU overhead and we
> should never get more than0x3fffNOPs (maybe useBUG_ON). Leaving the
> whole packet body uninitialized is the fastest option. That was the original intent to just move the WPTR for the no of nops
and tried too. Based on Christian inputs we should not let the nops packetas garbage or whatever was there originally as a threat/safety measure.
Quoted 5 lines
It doesn't help safety. It can only be read by the GPU with kernel-level permissions.
Initializing the packet body is useless and adds CPU overhead, especially with the 256 NOPs or so that we use for no reason.
Quoted 8 lines
Not filling the remaining ring buffers with NOPs is a pretty clear NAK from my side. Leaving garbage in the ring buffer is not even remotely defensive.
What are you defending against? You know the ring is kernel-owned memory, right?
Aside from that, the true hardware behavior is that CP still fetches the words and discards them. It's not the same mentioned in the description. So the only optimization it allows is to move the pointer without filling/caring about the contents as hardware also doesn't care about them. The notion of filling those unused region is exactly opposite of the intention. If that's the case, nothing is gained and just drop these patches.
Thanks,
Lijo
Quoted 12 lines
Marek
What we can do is to optimize filling N DWs into the ring buffer without updating the WPTR each time.
Regards,
Christian.Quoted 3 lines
Marek
Quoted 47 lines · Lijo
Quoted 34 lines · Marek Olšák
On Thu, Aug 1, 2024, 03:37 Christian König <[email protected] <mailto:[email protected]>> wrote:
__ Am 01.08.24 um 08:53 schrieb Marek Olšák:Quoted 23 lines
On Thu, Aug 1, 2024, 00:28 Khatri, Sunil <[email protected] <mailto:[email protected]>> wrote:
On 8/1/2024 8:49 AM, Marek Olšák wrote:
>> + /* Header is at index 0, followed bynum_nops- 1
NOP packet's */
>> + for (i = 1; i <num_nop; i++)
>> +amdgpu_ring_write(ring, ring->funcs->nop);
> This loop should be removed. It's unnecessary CPU overhead and we
> should never get more than0x3fffNOPs (maybe useBUG_ON). Leaving the
> whole packet body uninitialized is the fastest option. That was the original intent to just move the WPTR for the no of nops
and tried too. Based on Christian inputs we should not let the nops packetas garbage or whatever was there originally as a threat/safety measure.
Quoted 5 lines
It doesn't help safety. It can only be read by the GPU with kernel-level permissions.
Initializing the packet body is useless and adds CPU overhead, especially with the 256 NOPs or so that we use for no reason.
Quoted 8 lines
Not filling the remaining ring buffers with NOPs is a pretty clear NAK from my side. Leaving garbage in the ring buffer is not even remotely defensive.
What are you defending against? You know the ring is kernel-owned memory, right?
Quoted 7 lines
Aside from that, the true hardware behavior is that CP still fetches the words and discards them. It's not the same mentioned in the description. So the only optimization it allows is to move the pointer without filling/caring about the contents as hardware also doesn't care about them. The notion of filling those unused region is exactly opposite of the intention. If that's the case, nothing is gained and just drop these patches.
It's correct that it doesn't reduce fetching, but this optimization is not about fetching. It's about reducing the number of instructions that the firmware must execute. Single dword NOPs are quite expensive for their size.
Marek
Quoted 23 lines · Marek Olšák
Quoted 21 lines · On Thu, Aug 1, 2024, 03:37 Christian König <[email protected]> wrote:
Am 01.08.24 um 08:53 schrieb Marek Olšák:
Quoted 6 lines · Sunil
Quoted 3 lines · Marek Olšák
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +3
-0+/* Header is at index 0, followed by num_nops - 1 NOP packet's */ +for (i =1 ; i < num_nop; i++) +amdgpu_ring_write (ring, ring->funcs->nop);Quoted 7 lines
Quoted 3 lines
This loop should be removed. It's unnecessary CPU overhead and we should never get more than
0x3fffNOPs (maybe useBUG_ON). Leaving the whole packet body uninitialized is the fastest option.That was the original intent to just move the WPTR for the no of nops and tried too. Based on Christian inputs we should not let the nops packet
as garbage or whatever was there originally as a threat/safety measure.
It doesn't help safety. It can only be read by the GPU with kernel-level permissions.
Quoted 7 lines
Quoted 4 lines
Initializing the packet body is useless and adds CPU overhead, especially with the 256 NOPs or so that we use for no reason.
Not filling the remaining ring buffers with NOPs is a pretty clear NAK from my side. Leaving garbage in the ring buffer is not even remotely defensive.
What are you defending against? You know the ring is kernel-owned memory, right?
This was pushed without any justification why you need to clear kernel-allocated memory with some constant number up to 30000 times per second that only the kernel can read.
Marek
Quoted 27 lines · Marek Olšák
Quoted 26 lines · Marek Olšák
Quoted 24 lines · On Thu, Aug 1, 2024, 03:37 Christian König <[email protected]> wrote:
Am 01.08.24 um 08:53 schrieb Marek Olšák:
Quoted 6 lines · Sunil
Quoted 3 lines · Marek Olšák
Quoted 3 lines
(quoted diff) +3
-0+ /* Header is at index 0, followed by num_nops - 1 NOP packet's */ + for (i = 1; i < num_nop; i++) + amdgpu_ring_write(ring, ring->funcs->nop);Quoted 7 lines
Quoted 3 lines
This loop should be removed. It's unnecessary CPU overhead and we should never get more than
0x3fffNOPs (maybe useBUG_ON). Leaving the whole packet body uninitialized is the fastest option.That was the original intent to just move the WPTR for the no of nops and tried too. Based on Christian inputs we should not let the nops packet
as garbage or whatever was there originally as a threat/safety measure.
It doesn't help safety. It can only be read by the GPU with kernel-level permissions.
Initializing the packet body is useless and adds CPU overhead, especially with the 256 NOPs or so that we use for no reason.
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Not filling the remaining ring buffers with NOPs is a pretty clear NAK from my side. Leaving garbage in the ring buffer is not even remotely defensive.
What are you defending against? You know the ring is kernel-owned memory, right?
This was pushed without any justification why you need to clear kernel-allocated memory with some constant number up to 30000 times per second that only the kernel can read.
I see that this seems to be controversial, but FWIW, if the loop ends up staying, at least we could replace it with memset32 as I have shown in https://lore.kernel.org/amd-gfx/[email protected]/ that the inefficient amdgpu_ring_write can show up in the profile.
And also maybe consider other than gfx? Again, I did something in https://lore.kernel.org/amd-gfx/[email protected]/, but AMD folks will know if there is a similar (like in this series) approach which also improves the GPU side processing and not just CPU side.
Regards,
Tvrtko
Quoted 44 lines · Tvrtko Ursulin
Quoted 27 lines · Marek Olšák
Quoted 26 lines · Marek Olšák
Quoted 24 lines · On Thu, Aug 1, 2024, 03:37 Christian König <[email protected]> wrote:
Am 01.08.24 um 08:53 schrieb Marek Olšák:
Quoted 6 lines · Sunil
Quoted 3 lines · Marek Olšák
Quoted 3 lines
(quoted diff) +3
-0+ /* Header is at index 0, followed by num_nops - 1 NOP packet's */ + for (i = 1; i < num_nop; i++) + amdgpu_ring_write(ring, ring->funcs->nop);Quoted 7 lines
Quoted 3 lines
This loop should be removed. It's unnecessary CPU overhead and we should never get more than
0x3fffNOPs (maybe useBUG_ON). Leaving the whole packet body uninitialized is the fastest option.That was the original intent to just move the WPTR for the no of nops and tried too. Based on Christian inputs we should not let the nops packet
as garbage or whatever was there originally as a threat/safety measure.
It doesn't help safety. It can only be read by the GPU with kernel-level permissions.
Initializing the packet body is useless and adds CPU overhead, especially with the 256 NOPs or so that we use for no reason.
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Not filling the remaining ring buffers with NOPs is a pretty clear NAK from my side. Leaving garbage in the ring buffer is not even remotely defensive.
What are you defending against? You know the ring is kernel-owned memory, right?
This was pushed without any justification why you need to clear kernel-allocated memory with some constant number up to 30000 times per second that only the kernel can read.
I see that this seems to be controversial, but FWIW, if the loop ends up staying, at least we could replace it with memset32 as I have shown in
https://lore.kernel.org/amd-gfx/[email protected]/
that the inefficientamdgpu_ring_writecan show up in the profile.
Quoted 4 lines
And also maybe consider other than gfx? Again, I did something in
https://lore.kernel.org/amd-gfx/[email protected]/,
but AMD folks will know if there is a similar (like in this series) approach which also improves the GPU side processing and not just CPU side.
1. Yes, we should reduce CPU overhead by not using amdgpu_ring_write to flll a ring buffer.
2. We should stop clearing NOP content.
3. We should stop padding to 256 dwords when we really just need to pad to 8 dwords.
4. We should get rid of amdgpu_ring_write and use a more efficient way to write into a ring buffer, which is described below. amdgpu_ring_write generates bad CPU code because the compiler can't determine pointer aliasing.
When starting to write into a ring buffer, count_dw, *ring, buf_mask, and wptr should be copied to local variables and ring writes should only use those. After everything has been written into the ring buffer, the local variables should be copied back to amdgpu_ring, and ptr_mask should be applied only then. That allows the compiler to use constant offsets for the writes, and reorder/merge/const-evaluate/optimize all operations on the local variables, which doesn't happen with non-local variables. 3 macros (amdgpu_ring_begin, amdgpu_ring_write, amdgpu_ring_end) can be created to encapsulate this logic. Example:
amdgpu_ring_begin(ring);amdgpu_ring_write(value0);amdgpu_ring_write(value1);amdgpu_ring_write(value2);amdgpu_ring_write(value3);amdgpu_ring_end();
Marek
Quoted 24 lines · Sunil Khatri
Adding NOP packets one by one in the ring
does not use the CP efficiently.Solution:
Use CP optimization while adding NOP packet's so PFP can discard NOP packets based on information of count from the Header instead of fetching all NOP packets one by one.Cc Christian König <[email protected]>Cc Pierre-Eric Pelloux-Prayer <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Marek Olšák <[email protected]>Signed-off-by Sunil Khatri <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +0
-0
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c static void gfx_v10_0_emit_mem_sync(struct amdgpu_ring *ring) · line 9400
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +1
-0@@ -9397,6 +9397,24 @@ static void gfx_v10_0_emit_mem_sync(struct amdgpu_ring *ring)amdgpu_ring_write (ring, gcr_cntl);/* GCR_CNTL */ } +static void amdgpu_gfx10_ring_insert_nop (struct amdgpu_ring *ring,uint32_t num_nop)
It would be better to have this function in common code instead of duplicating it in 5 files.
Marek
Quoted 50 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +20
-4+{ +int i; + +/* Header itself is a NOP packet */ +if (num_nop ==1 ) { +amdgpu_ring_write (ring, ring->funcs->nop); +return ; + } + +/* Max HW optimization till 0x3ffe, followed by remaining one NOP at a time*/ +amdgpu_ring_write (ring,PACKET3 (PACKET3_NOP ,min (num_nop -2 ,0x3ffe ))); + +/* Header is at index 0, followed by num_nops - 1 NOP packet's */ +for (i =1 ; i < num_nop; i++) +amdgpu_ring_write (ring, ring->funcs->nop); +} +static void gfx_v10_ip_print (void *handle,struct drm_printer *p) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;@@ -9588,7 +9606,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_gfx = { .emit_hdp_flush = gfx_v10_0_ring_emit_hdp_flush, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_switch_buffer = gfx_v10_0_ring_emit_sb, .emit_cntxcntl = gfx_v10_0_ring_emit_cntxcntl,@@ -9629,7 +9647,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_compute = { .emit_hdp_flush = gfx_v10_0_ring_emit_hdp_flush, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_wreg = gfx_v10_0_ring_emit_wreg, .emit_reg_wait = gfx_v10_0_ring_emit_reg_wait,@@ -9659,7 +9677,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_kiq = { .emit_fence = gfx_v10_0_ring_emit_fence_kiq, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_rreg = gfx_v10_0_ring_emit_rreg, .emit_wreg = gfx_v10_0_ring_emit_wreg, --2.34.1
Quoted 27 lines · Marek Olšák
Quoted 26 lines · Sunil Khatri
Adding NOP packets one by one in the ring
does not use the CP efficiently.Solution:
Use CP optimization while adding NOP packet's so PFP can discard NOP packets based on information of count from the Header instead of fetching all NOP packets one by one.Cc Christian König <[email protected]>Cc Pierre-Eric Pelloux-Prayer <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Marek Olšák <[email protected]>Signed-off-by Sunil Khatri <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +0
-0@@ -9397,6 +9397,24 @@ static void gfx_v10_0_emit_mem_sync(struct amdgpu_ring *ring)amdgpu_ring_write (ring, gcr_cntl);/* GCR_CNTL */ }
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c static void gfx_v10_0_emit_mem_sync(struct amdgpu_ring *ring) · line 9400
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +1
-0+static void amdgpu_gfx10_ring_insert_nop (struct amdgpu_ring *ring,uint32_t num_nop)It would be better to have this function in common code instead of duplicating it in 5 files.
Although the code here is seem but its architecture dependent. Keeping the code in common file also need to redefine PACKET3 and PACKET NOP etc in common which are defined in soc15.h So it was suggested not to move architecture specific changes to common code.
Quoted 53 lines
Marek
Quoted 50 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +20
-4+{ +int i; + +/* Header itself is a NOP packet */ +if (num_nop ==1 ) { +amdgpu_ring_write (ring, ring->funcs->nop); +return ; + } + +/* Max HW optimization till 0x3ffe, followed by remaining one NOP at a time*/ +amdgpu_ring_write (ring,PACKET3 (PACKET3_NOP ,min (num_nop -2 ,0x3ffe ))); + +/* Header is at index 0, followed by num_nops - 1 NOP packet's */ +for (i =1 ; i < num_nop; i++) +amdgpu_ring_write (ring, ring->funcs->nop); +} +static void gfx_v10_ip_print (void *handle,struct drm_printer *p) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;@@ -9588,7 +9606,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_gfx = { .emit_hdp_flush = gfx_v10_0_ring_emit_hdp_flush, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_switch_buffer = gfx_v10_0_ring_emit_sb, .emit_cntxcntl = gfx_v10_0_ring_emit_cntxcntl,@@ -9629,7 +9647,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_compute = { .emit_hdp_flush = gfx_v10_0_ring_emit_hdp_flush, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_wreg = gfx_v10_0_ring_emit_wreg, .emit_reg_wait = gfx_v10_0_ring_emit_reg_wait,@@ -9659,7 +9677,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_kiq = { .emit_fence = gfx_v10_0_ring_emit_fence_kiq, .test_ring = gfx_v10_0_ring_test_ring, .test_ib = gfx_v10_0_ring_test_ib, - .insert_nop = amdgpu_ring_insert_nop, + .insert_nop = amdgpu_gfx10_ring_insert_nop, .pad_ib = amdgpu_ring_generic_pad_ib, .emit_rreg = gfx_v10_0_ring_emit_rreg, .emit_wreg = gfx_v10_0_ring_emit_wreg, --2.34.1