Skip to contentSkip to conversation

drm/amdgpu: fix ocl test performance drop

PATCH In review Flora Cui 3 participants 5 messages May 22, 2017 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

Flora Cui

author
#0 lore raw

PATCH 1/1 drm/amdgpu: fix ocl test performance drop

partial revert commit <6971d3d> - drm/amdgpu: cleanup logic in amdgpu_vm_flush

Change-Id Iadce9d613dfe9a739643a74050cea55854832adb
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +3 -3
index 4573d8c..11d58f7 100644
@@ -743,8 +743,7 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job)
 		id->gws_size != job->gws_size ||
 		id->oa_base != job->oa_base ||
 		id->oa_size != job->oa_size);
-	bool vm_flush_needed = job->vm_needs_flush ||
-		amdgpu_vm_ring_has_compute_vm_bug(ring);
+	bool vm_flush_needed = job->vm_needs_flush;
 	unsigned patch_offset = 0;
 	int r;
 
@@ -753,7 +752,8 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job)
 		vm_flush_needed = true;
 	}
 
-	if (!vm_flush_needed && !gds_switch_needed)
+	if (!vm_flush_needed && !gds_switch_needed &&
+	    !amdgpu_vm_ring_has_compute_vm_bug(ring))
 		return 0;
 
 	if (ring->funcs->init_cond_exec)
Signature · 6 lines
2.7.4

_______________________________________________
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): 1495442049-7481-1-git-send-email-Flora.Cui-5C7GfCeVMHo@public.gmane.org

#2 lore raw
Quoted 24 lines · Flora Cui

partial revert commit <6971d3d> - drm/amdgpu: cleanup logic in amdgpu_vm_flush

Change-Id Iadce9d613dfe9a739643a74050cea55854832adb
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -2
index 4573d8c..11d58f7 100644
@@ -743,8 +743,7 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job)
  		id->gws_size != job->gws_size ||
  		id->oa_base != job->oa_base ||
  		id->oa_size != job->oa_size);
-	bool vm_flush_needed = job->vm_needs_flush ||
-		amdgpu_vm_ring_has_compute_vm_bug(ring);
+	bool vm_flush_needed = job->vm_needs_flush;
  	unsigned patch_offset = 0;
  	int r;
 

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job) · line 757

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2 -1
@@ -753,7 +752,8 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job)
  		vm_flush_needed = true;
  	}
 
-	if (!vm_flush_needed && !gds_switch_needed)
+	if (!vm_flush_needed && !gds_switch_needed &&
+	    !amdgpu_vm_ring_has_compute_vm_bug(ring))
  		return 0;

here change isn't needed.

Regards,
David Zhou

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job) · line 759

Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -0
  	if (ring->funcs->init_cond_exec)

_______________________________________________
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): [email protected]

author
#4 lore raw

partial revert commit <6971d3d> - drm/amdgpu: cleanup logic in amdgpu_vm_flush

Change-Id Iadce9d613dfe9a739643a74050cea55854832adb
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -2
index 4573d8c..5b9a73d 100644
@@ -743,8 +743,7 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job)
 		id->gws_size != job->gws_size ||
 		id->oa_base != job->oa_base ||
 		id->oa_size != job->oa_size);
-	bool vm_flush_needed = job->vm_needs_flush ||
-		amdgpu_vm_ring_has_compute_vm_bug(ring);
+	bool vm_flush_needed = job->vm_needs_flush;
 	unsigned patch_offset = 0;
 	int r;
 
Signature · 1 line
2.7.4
Quoted 34 lines · On Mon, May 22, 2017 at 04:58:00PM +0800, zhoucm1 wrote:
Quoted 23 lines · Flora Cui

partial revert commit <6971d3d> - drm/amdgpu: cleanup logic in amdgpu_vm_flush

Change-Id Iadce9d613dfe9a739643a74050cea55854832adb
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -2
index 4573d8c..11d58f7 100644
@@ -743,8 +743,7 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job)
 		id->gws_size != job->gws_size ||
 		id->oa_base != job->oa_base ||
 		id->oa_size != job->oa_size);
-	bool vm_flush_needed = job->vm_needs_flush ||
-		amdgpu_vm_ring_has_compute_vm_bug(ring);
+	bool vm_flush_needed = job->vm_needs_flush;
 	unsigned patch_offset = 0;
 	int r;

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job) · line 756

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2 -1
@@ -753,7 +752,8 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job)
 		vm_flush_needed = true;
 	}
-	if (!vm_flush_needed && !gds_switch_needed)
+	if (!vm_flush_needed && !gds_switch_needed &&
+	    !amdgpu_vm_ring_has_compute_vm_bug(ring))
 		return 0;

here change isn't needed.

Quoted 4 lines

Regards,
David Zhou

Quoted 1 line
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -0
 	if (ring->funcs->init_cond_exec)

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reviewed-by
#5 lore raw

Am 22.05.2017 um 12:10 schrieb Flora Cui:

Quoted 5 lines

partial revert commit <6971d3d> - drm/amdgpu: cleanup logic in amdgpu_vm_flush

Change-Id Iadce9d613dfe9a739643a74050cea55854832adb
Quoted 9 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -0
index 4573d8c..5b9a73d 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job) · line 749

Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -2
@@ -743,8 +743,7 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job)
  		id->gws_size != job->gws_size ||
  		id->oa_base != job->oa_base ||
  		id->oa_size != job->oa_size);
-	bool vm_flush_needed = job->vm_needs_flush ||
-		amdgpu_vm_ring_has_compute_vm_bug(ring);
+	bool vm_flush_needed = job->vm_needs_flush;
  	unsigned patch_offset = 0;
  	int r;
 

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reviewed-by Chunming Zhou
#6 lore raw
In reply to Flora Cui
Reviewed-by Chunming Zhou

-------- 原始邮件 --------
主题:Re: [PATCH] drm/amdgpu: fix ocl test performance drop 发件人:Flora Cui
收件人:"Zhou, David(ChunMing)" 抄送:[email protected]

partial revert commit <6971d3d> - drm/amdgpu: cleanup logic in amdgpu_vm_flush

Change-Id Iadce9d613dfe9a739643a74050cea55854832adb
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -2
index 4573d8c..5b9a73d 100644
@@ -743,8 +743,7 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job)
                 id->gws_size != job->gws_size ||
                 id->oa_base != job->oa_base ||
                 id->oa_size != job->oa_size);
-       bool vm_flush_needed = job->vm_needs_flush ||
-               amdgpu_vm_ring_has_compute_vm_bug(ring);
+       bool vm_flush_needed = job->vm_needs_flush;
         unsigned patch_offset = 0;
         int r;
 

--
2.7.4

Quoted 34 lines · On Mon, May 22, 2017 at 04:58:00PM +0800, zhoucm1 wrote:
Quoted 23 lines · Flora Cui

partial revert commit <6971d3d> - drm/amdgpu: cleanup logic in amdgpu_vm_flush

Change-Id Iadce9d613dfe9a739643a74050cea55854832adb
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -2
index 4573d8c..11d58f7 100644
@@ -743,8 +743,7 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job)
             id->gws_size != job->gws_size ||
             id->oa_base != job->oa_base ||
             id->oa_size != job->oa_size);
-    bool vm_flush_needed = job->vm_needs_flush ||
-            amdgpu_vm_ring_has_compute_vm_bug(ring);
+    bool vm_flush_needed = job->vm_needs_flush;
     unsigned patch_offset = 0;
     int r;

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job) · line 756

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2 -1
@@ -753,7 +752,8 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job)
             vm_flush_needed = true;
     }
-    if (!vm_flush_needed && !gds_switch_needed)
+    if (!vm_flush_needed && !gds_switch_needed &&
+        !amdgpu_vm_ring_has_compute_vm_bug(ring))
             return 0;

here change isn't needed.

Quoted 4 lines

Regards,
David Zhou

Quoted 1 line
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0 -0
     if (ring->funcs->init_cond_exec)

_______________________________________________
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