drm/amdgpu: simplify allocation of scratch regs
Subsystems (2)
PATCH 1/1 drm/amdgpu: simplify allocation of scratch regs
The scratch regs are sequential so there's no need to keep them in an array, we can just return the index of the first free register + the base register. Also change the array of bools for keeping track of the free regs to a bitfield.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 21 +++++++-------------- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 7 +------ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 7 +------ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 7 +------ 5 files changed, 11 insertions(+), 34 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -2
@@ -794,8 +794,7 @@ struct amdgpu_kiq {struct amdgpu_scratch {unsigned num_reg;uint32_t reg_base; -bool free[32 ]; -uint32_t reg[32 ]; +uint32_t free_mask; };/*
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +7 -14
@@ -42,12 +42,12 @@ int amdgpu_gfx_scratch_get(struct amdgpu_device *adev, uint32_t *reg) {int i; -for (i =0 ; i < adev->gfx.scratch.num_reg; i++) { -if (adev->gfx.scratch.free[i]) { - adev->gfx.scratch.free[i] = false; - *reg = adev->gfx.scratch.reg[i]; -return 0 ; - } + i =ffs (adev->gfx.scratch.free_mask); +if (i !=0 && i <= adev->gfx.scratch.num_reg) { + i--; + adev->gfx.scratch.free_mask &= ~(1u << i); + *reg = adev->gfx.scratch.reg_base + i; +return 0 ; }return -EINVAL ; }
@@ -62,14 +62,7 @@ int amdgpu_gfx_scratch_get(struct amdgpu_device *adev, uint32_t *reg)*/ void amdgpu_gfx_scratch_free (struct amdgpu_device *adev,uint32_t reg) { -int i; - -for (i =0 ; i < adev->gfx.scratch.num_reg; i++) { -if (adev->gfx.scratch.reg[i] == reg) { - adev->gfx.scratch.free[i] = true; -return ; - } - } + adev->gfx.scratch.free_mask |=1u << (reg - adev->gfx.scratch.reg_base); }/**
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -6
@@ -1794,14 +1794,9 @@ static void gfx_v6_0_gpu_init(struct amdgpu_device *adev)static void gfx_v6_0_scratch_init (struct amdgpu_device *adev) { -int i; - adev->gfx.scratch.num_reg =7 ; adev->gfx.scratch.reg_base = mmSCRATCH_REG0; -for (i =0 ; i < adev->gfx.scratch.num_reg; i++) { - adev->gfx.scratch.free[i] = true; - adev->gfx.scratch.reg[i] = adev->gfx.scratch.reg_base + i; - } + adev->gfx.scratch.free_mask = (1u << adev->gfx.scratch.num_reg) -1 ; }static int gfx_v6_0_ring_test_ring (struct amdgpu_ring *ring)
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +1 -6
@@ -2003,14 +2003,9 @@ static void gfx_v7_0_gpu_init(struct amdgpu_device *adev)*/ static void gfx_v7_0_scratch_init (struct amdgpu_device *adev) { -int i; - adev->gfx.scratch.num_reg =7 ; adev->gfx.scratch.reg_base = mmSCRATCH_REG0; -for (i =0 ; i < adev->gfx.scratch.num_reg; i++) { - adev->gfx.scratch.free[i] = true; - adev->gfx.scratch.reg[i] = adev->gfx.scratch.reg_base + i; - } + adev->gfx.scratch.free_mask = (1u << adev->gfx.scratch.num_reg) -1 ; }/**
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +1 -6
@@ -749,14 +749,9 @@ static void gfx_v8_0_init_golden_registers(struct amdgpu_device *adev)static void gfx_v8_0_scratch_init (struct amdgpu_device *adev) { -int i; - adev->gfx.scratch.num_reg =7 ; adev->gfx.scratch.reg_base = mmSCRATCH_REG0; -for (i =0 ; i < adev->gfx.scratch.num_reg; i++) { - adev->gfx.scratch.free[i] = true; - adev->gfx.scratch.reg[i] = adev->gfx.scratch.reg_base + i; - } + adev->gfx.scratch.free_mask = (1u << adev->gfx.scratch.num_reg) -1 ; }static int gfx_v8_0_ring_test_ring (struct amdgpu_ring *ring)
Signature · 6 lines
2.10.2 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20170116205648.2570-1-nils.wallmenius-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Christian König
Reviewed-byAm 16.01.2017 um 21:56 schrieb Nils Wallménius:
Quoted 6 lines
The scratch regs are sequential so there's no need to keep them in an array, we can just return the index of the first free register + the base register. Also change the array of bools for keeping track of the free regs to a bitfield.
Signed-off-by Nils Wallménius <[email protected]>
Quoted 111 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 21 +++++++-------------- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 7 +------ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 7 +------ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 7 +------ 5 files changed, 11 insertions(+), 34 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-2@@ -794,8 +794,7 @@ struct amdgpu_kiq {struct amdgpu_scratch {unsigned num_reg;uint32_t reg_base; -bool free[32 ]; -uint32_t reg[32 ]; +uint32_t free_mask; };/* drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +7
-14@@ -42,12 +42,12 @@ int amdgpu_gfx_scratch_get(struct amdgpu_device *adev, uint32_t *reg) {int i; -for (i =0 ; i < adev->gfx.scratch.num_reg; i++) { -if (adev->gfx.scratch.free[i]) { - adev->gfx.scratch.free[i] = false; - *reg = adev->gfx.scratch.reg[i]; -return 0 ; - } + i =ffs (adev->gfx.scratch.free_mask); +if (i !=0 && i <= adev->gfx.scratch.num_reg) { + i--; + adev->gfx.scratch.free_mask &= ~(1u << i); + *reg = adev->gfx.scratch.reg_base + i; +return 0 ; }return -EINVAL ; }@@ -62,14 +62,7 @@ int amdgpu_gfx_scratch_get(struct amdgpu_device *adev, uint32_t *reg)*/ void amdgpu_gfx_scratch_free (struct amdgpu_device *adev,uint32_t reg) { -int i; - -for (i =0 ; i < adev->gfx.scratch.num_reg; i++) { -if (adev->gfx.scratch.reg[i] == reg) { - adev->gfx.scratch.free[i] = true; -return ; - } - } + adev->gfx.scratch.free_mask |=1u << (reg - adev->gfx.scratch.reg_base); }/** drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1
-6@@ -1794,14 +1794,9 @@ static void gfx_v6_0_gpu_init(struct amdgpu_device *adev)static void gfx_v6_0_scratch_init (struct amdgpu_device *adev) { -int i; - adev->gfx.scratch.num_reg =7 ; adev->gfx.scratch.reg_base = mmSCRATCH_REG0; -for (i =0 ; i < adev->gfx.scratch.num_reg; i++) { - adev->gfx.scratch.free[i] = true; - adev->gfx.scratch.reg[i] = adev->gfx.scratch.reg_base + i; - } + adev->gfx.scratch.free_mask = (1u << adev->gfx.scratch.num_reg) -1 ; }static int gfx_v6_0_ring_test_ring (struct amdgpu_ring *ring)drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +1
-6@@ -2003,14 +2003,9 @@ static void gfx_v7_0_gpu_init(struct amdgpu_device *adev)*/ static void gfx_v7_0_scratch_init (struct amdgpu_device *adev) { -int i; - adev->gfx.scratch.num_reg =7 ; adev->gfx.scratch.reg_base = mmSCRATCH_REG0; -for (i =0 ; i < adev->gfx.scratch.num_reg; i++) { - adev->gfx.scratch.free[i] = true; - adev->gfx.scratch.reg[i] = adev->gfx.scratch.reg_base + i; - } + adev->gfx.scratch.free_mask = (1u << adev->gfx.scratch.num_reg) -1 ; }/** drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +0
-2@@ -749,14 +749,9 @@ static void gfx_v8_0_init_golden_registers(struct amdgpu_device *adev)static void gfx_v8_0_scratch_init (struct amdgpu_device *adev) { -int i; -
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c static void gfx_v8_0_init_golden_registers(struct amdgpu_device *adev) · line 757
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +1
-4adev->gfx.scratch.num_reg =7 ; adev->gfx.scratch.reg_base = mmSCRATCH_REG0; -for (i =0 ; i < adev->gfx.scratch.num_reg; i++) { - adev->gfx.scratch.free[i] = true; - adev->gfx.scratch.reg[i] = adev->gfx.scratch.reg_base + i; - } + adev->gfx.scratch.free_mask = (1u << adev->gfx.scratch.num_reg) -1 ; }static int gfx_v8_0_ring_test_ring (struct amdgpu_ring *ring)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): c3b5469d-be9d-f4a3-d158-8335b9a0f63a-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Alex Deucher
AppliedQuoted 11 lines · Christian König
Am 16.01.2017 um 21:56 schrieb Nils Wallménius:
Quoted 7 lines
The scratch regs are sequential so there's no need to keep them in an array, we can just return the index of the first free register + the base register. Also change the array of bools for keeping track of the free regs to a bitfield.
Signed-off-by Nils Wallménius <[email protected]>Reviewed-by Christian König <[email protected]>.
Applied. thanks!
Alex
Quoted 128 lines
Quoted 128 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 21 +++++++-------------- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 7 +------ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 7 +------ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 7 +------ 5 files changed, 11 insertions(+), 34 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-2@@ -794,8 +794,7 @@ struct amdgpu_kiq {struct amdgpu_scratch {unsigned num_reg;uint32_t reg_base; -bool free[32 ]; -uint32_t reg[32 ]; +uint32_t free_mask; };/* drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +7
-13@@ -42,12 +42,12 @@ int amdgpu_gfx_scratch_get(struct amdgpu_device *adev, uint32_t *reg) {int i; - for (i = 0; i < adev->gfx.scratch.num_reg; i++) { -if (adev->gfx.scratch.free[i]) { - adev->gfx.scratch.free[i] = false; - *reg = adev->gfx.scratch.reg[i]; -return 0 ; - } + i =ffs (adev->gfx.scratch.free_mask); +if (i !=0 && i <= adev->gfx.scratch.num_reg) { + i--; + adev->gfx.scratch.free_mask &= ~(1u << i); + *reg = adev->gfx.scratch.reg_base + i; +return 0 ; }return -EINVAL ; }@@ -62,14 +62,7 @@ int amdgpu_gfx_scratch_get(struct amdgpu_device *adev,uint32_t *reg) */ void amdgpu_gfx_scratch_free (struct amdgpu_device *adev,uint32_t reg) { -int i; - -for (i =0 ; i < adev->gfx.scratch.num_reg; i++) { -if (adev->gfx.scratch.reg[i] == reg) { - adev->gfx.scratch.free[i] = true; -return ; - } - } + adev->gfx.scratch.free_mask |=1u << (reg - adev->gfx.scratch.reg_base); }/**drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1
-6@@ -1794,14 +1794,9 @@ static void gfx_v6_0_gpu_init(struct amdgpu_device *adev)static void gfx_v6_0_scratch_init (struct amdgpu_device *adev) { -int i; - adev->gfx.scratch.num_reg =7 ; adev->gfx.scratch.reg_base = mmSCRATCH_REG0; -for (i =0 ; i < adev->gfx.scratch.num_reg; i++) { - adev->gfx.scratch.free[i] = true; - adev->gfx.scratch.reg[i] = adev->gfx.scratch.reg_base + i; - } + adev->gfx.scratch.free_mask = (1u << adev->gfx.scratch.num_reg) -1 ; }static int gfx_v6_0_ring_test_ring (struct amdgpu_ring *ring)drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +1
-6@@ -2003,14 +2003,9 @@ static void gfx_v7_0_gpu_init(struct amdgpu_device*adev) */ static void gfx_v7_0_scratch_init (struct amdgpu_device *adev) { -int i; - adev->gfx.scratch.num_reg =7 ; adev->gfx.scratch.reg_base = mmSCRATCH_REG0; -for (i =0 ; i < adev->gfx.scratch.num_reg; i++) { - adev->gfx.scratch.free[i] = true; - adev->gfx.scratch.reg[i] = adev->gfx.scratch.reg_base + i; - } + adev->gfx.scratch.free_mask = (1u << adev->gfx.scratch.num_reg) -1 ; }/**drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +1
-6@@ -749,14 +749,9 @@ static void gfx_v8_0_init_golden_registers(struct amdgpu_device *adev)static void gfx_v8_0_scratch_init (struct amdgpu_device *adev) { -int i; - adev->gfx.scratch.num_reg =7 ; adev->gfx.scratch.reg_base = mmSCRATCH_REG0; -for (i =0 ; i < adev->gfx.scratch.num_reg; i++) { - adev->gfx.scratch.free[i] = true; - adev->gfx.scratch.reg[i] = adev->gfx.scratch.reg_base + i; - } + adev->gfx.scratch.free_mask = (1u << adev->gfx.scratch.num_reg) -1 ; }
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c static void gfx_v8_0_init_golden_registers(struct amdgpu_device *adev) · line 757
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +0
-0static int gfx_v8_0_ring_test_ring (struct amdgpu_ring *ring)_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx