drm/amdkfd: simplify kgd_gfx_v9_get_cu_occupancy()
Subsystems (3)
PATCH 1/1 drm/amdkfd: simplify kgd_gfx_v9_get_cu_occupancy()
Switch inner loop in kgd_gfx_v9_get_cu_occupancy() to the dedicated for_each(), and drop most of housekeeping code.
Signed-off-by Yury Norov <[email protected]>
--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 32 +++++++------------ 1 file changed, 11 insertions(+), 21 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +11 -21
@@ -1026,9 +1026,8 @@ void kgd_gfx_v9_get_cu_occupancy(struct amdgpu_device *adev,int qidx;int se_idx;int se_cnt; -int queue_map; -int max_queue_cnt; -DECLARE_BITMAP (cp_queue_bitmap,AMDGPU_MAX_QUEUES ); +DECLARE_BITMAP (queue_map,32 ); +int max_queue_cnt, queue_reg;lock_spi_csq_mutexes (adev);soc15_grbm_select (adev,1 ,0 ,0 ,0 ,GET_INST (GC , inst));
@@ -1037,35 +1036,26 @@ void kgd_gfx_v9_get_cu_occupancy(struct amdgpu_device *adev,* Iterate through the shader engines and arrays of the device * to get number of waves in flight */ -bitmap_complement (cp_queue_bitmap, adev->gfx.mec_bitmap[0 ].queue_bitmap, -AMDGPU_MAX_QUEUES ); max_queue_cnt = adev->gfx.mec.num_pipe_per_mec * adev->gfx.mec.num_queue_per_pipe; se_cnt = adev->gfx.config.max_shader_engines;for (se_idx =0 ; se_idx < se_cnt; se_idx++) {amdgpu_gfx_select_se_sh (adev, se_idx,0 ,0xffffffff , inst); - queue_map =RREG32_SOC15 (GC ,GET_INST (GC , inst), mmSPI_CSQ_WF_ACTIVE_STATUS); + queue_reg =RREG32_SOC15 (GC ,GET_INST (GC , inst), mmSPI_CSQ_WF_ACTIVE_STATUS); +bitmap_from_arr32 (queue_map, &queue_reg,32 );/* * Assumption: queue map encodes following schema: four * pipes per each micro-engine, with each pipe mapping * eight queues. This schema is true for GFX9 devices -* and must be verified for newer device families +* and must be verified for newer device families. +* +* Get number of waves in flight and aggregate them, and skip +* queues that are not associated with compute functions. */ -for (qidx =0 ; qidx < max_queue_cnt; qidx++) { -/* Skip qeueus that are not associated with -* compute functions -*/ -if (!test_bit (qidx, cp_queue_bitmap)) -continue ; - -if (!(queue_map & (1 << qidx))) -continue ; - -/* Get number of waves in flight and aggregate them */ -get_wave_count (adev, qidx, &cu_occupancy[qidx], - inst); - } +for_each_andnot_bit (qidx, adev->gfx.mec_bitmap[0 ].queue_bitmap, + queue_map, max_queue_cnt) +get_wave_count (adev, qidx, &cu_occupancy[qidx], inst); }amdgpu_gfx_select_se_sh (adev,0xffffffff ,0xffffffff ,0xffffffff , inst);
Signature · 1 line
2.51.0
Kuehling, Felix
maintainerQuoted 55 lines · Yury Norov
Switch inner loop in
kgd_gfx_v9_get_cu_occupancy()to the dedicatedfor_each(), and drop most of housekeeping code.Signed-off-by Yury Norov <[email protected]>--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 32 +++++++------------ 1 file changed, 11 insertions(+), 21 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +8
-13@@ -1026,9 +1026,8 @@ void kgd_gfx_v9_get_cu_occupancy(struct amdgpu_device *adev,int qidx;int se_idx;int se_cnt; -int queue_map; -int max_queue_cnt; -DECLARE_BITMAP (cp_queue_bitmap,AMDGPU_MAX_QUEUES ); +DECLARE_BITMAP (queue_map,32 ); +int max_queue_cnt, queue_reg;lock_spi_csq_mutexes (adev);soc15_grbm_select (adev,1 ,0 ,0 ,0 ,GET_INST (GC , inst));@@ -1037,35 +1036,26 @@ void kgd_gfx_v9_get_cu_occupancy(struct amdgpu_device *adev,* Iterate through the shader engines and arrays of the device * to get number of waves in flight */ -bitmap_complement (cp_queue_bitmap, adev->gfx.mec_bitmap[0 ].queue_bitmap, -AMDGPU_MAX_QUEUES ); max_queue_cnt = adev->gfx.mec.num_pipe_per_mec * adev->gfx.mec.num_queue_per_pipe; se_cnt = adev->gfx.config.max_shader_engines;for (se_idx =0 ; se_idx < se_cnt; se_idx++) {amdgpu_gfx_select_se_sh (adev, se_idx,0 ,0xffffffff , inst); - queue_map =RREG32_SOC15 (GC ,GET_INST (GC , inst), mmSPI_CSQ_WF_ACTIVE_STATUS); + queue_reg =RREG32_SOC15 (GC ,GET_INST (GC , inst), mmSPI_CSQ_WF_ACTIVE_STATUS); +bitmap_from_arr32 (queue_map, &queue_reg,32 );/* * Assumption: queue map encodes following schema: four * pipes per each micro-engine, with each pipe mapping * eight queues. This schema is true for GFX9 devices -* and must be verified for newer device families +* and must be verified for newer device families. +* +* Get number of waves in flight and aggregate them, and skip +* queues that are not associated with compute functions. */ -for (qidx =0 ; qidx < max_queue_cnt; qidx++) { -/* Skip qeueus that are not associated with -* compute functions -*/ -if (!test_bit (qidx, cp_queue_bitmap)) -continue ;
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c void kgd_gfx_v9_get_cu_occupancy(struct amdgpu_device *adev, · line 1057
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +2
-8- -if (!(queue_map & (1 << qidx))) -continue ; - -/* Get number of waves in flight and aggregate them */ -get_wave_count (adev, qidx, &cu_occupancy[qidx], - inst); - } +for_each_andnot_bit (qidx, adev->gfx.mec_bitmap[0 ].queue_bitmap, + queue_map, max_queue_cnt)
If I'm reading the old code correctly, get_wave_count is only executed if the corresponding bit in cp_queue_bitmap is set and the corresponding bit in queue_map is also set. That means, for_each_and_bit should be used to replace the open-coded tests. Am I missing something?
Regards,
Felix
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +1
-0+get_wave_count (adev, qidx, &cu_occupancy[qidx], inst); }amdgpu_gfx_select_se_sh (adev,0xffffffff ,0xffffffff ,0xffffffff , inst);