Attachment 144483 Details for Bug 105226 – [PATCH] anv/cmd_buffer: Reuse gen8 Cmd{Set,Reset}Event on gen7

[patch] [PATCH] anv/cmd_buffer: Reuse gen8 Cmd{Set,Reset}Event on gen7

0001-anv-cmd_buffer-Reuse-gen8-Cmd-Set-Reset-Event-on-gen.patch (text/plain), 7.78 KB, created by Ville Syrjala on 2019-06-08 12:54:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Syrjala

Created: 2019-06-08 12:54:58 UTC

Size: 7.78 KB

patch

obsolete

>From 08b0ac12aa426ad16a553baba278b5b2544e2dbc Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
>Date: Sat, 8 Jun 2019 15:17:29 +0300
>Subject: [PATCH] anv/cmd_buffer: Reuse gen8 Cmd{Set,Reset}Event on gen7
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Modern DXVK requires event support [1], but looks like it only
>uses vkCmdSetEvent() + vkGetEventStatus(). So we can just
>borrow the relevant code from gen8, leaving CmdWaitEvents still
>unimplemented.
>
>Caveat: Totally untested
>
>[1] https://github.com/doitsujin/dxvk/commit/8c3900c533d83d12c970b905183d17a1d3e8df1f
>
>Signed-off-by: Ville SyrjÃ¤lÃ¤ <ville.syrjala@linux.intel.com>
>---
> src/intel/vulkan/gen7_cmd_buffer.c | 16 -------
> src/intel/vulkan/gen8_cmd_buffer.c | 67 ------------------------------
> src/intel/vulkan/genX_cmd_buffer.c | 67 ++++++++++++++++++++++++++++++
> 3 files changed, 67 insertions(+), 83 deletions(-)
>
>diff --git a/src/intel/vulkan/gen7_cmd_buffer.c b/src/intel/vulkan/gen7_cmd_buffer.c
>index 380283bdd563..1f50f02ac57b 100644
>--- a/src/intel/vulkan/gen7_cmd_buffer.c
>+++ b/src/intel/vulkan/gen7_cmd_buffer.c
>@@ -287,22 +287,6 @@ genX(cmd_buffer_enable_pma_fix)(struct anv_cmd_buffer *cmd_buffer,
>    /* The NP PMA fix doesn't exist on gen7 */
> }
> 
>-void genX(CmdSetEvent)(
>-    VkCommandBuffer                             commandBuffer,
>-    VkEvent                                     event,
>-    VkPipelineStageFlags                        stageMask)
>-{
>-   anv_finishme("Implement events on gen7");
>-}
>-
>-void genX(CmdResetEvent)(
>-    VkCommandBuffer                             commandBuffer,
>-    VkEvent                                     event,
>-    VkPipelineStageFlags                        stageMask)
>-{
>-   anv_finishme("Implement events on gen7");
>-}
>-
> void genX(CmdWaitEvents)(
>     VkCommandBuffer                             commandBuffer,
>     uint32_t                                    eventCount,
>diff --git a/src/intel/vulkan/gen8_cmd_buffer.c b/src/intel/vulkan/gen8_cmd_buffer.c
>index 6568d2c75113..682a718e1807 100644
>--- a/src/intel/vulkan/gen8_cmd_buffer.c
>+++ b/src/intel/vulkan/gen8_cmd_buffer.c
>@@ -566,73 +566,6 @@ void genX(CmdBindIndexBuffer)(
>    cmd_buffer->state.gfx.dirty |= ANV_CMD_DIRTY_INDEX_BUFFER;
> }
> 
>-/* Set of stage bits for which are pipelined, i.e. they get queued by the
>- * command streamer for later execution.
>- */
>-#define ANV_PIPELINE_STAGE_PIPELINED_BITS \
>-   (VK_PIPELINE_STAGE_VERTEX_INPUT_BIT | \
>-    VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | \
>-    VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT | \
>-    VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT | \
>-    VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT | \
>-    VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | \
>-    VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | \
>-    VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT | \
>-    VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT | \
>-    VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT | \
>-    VK_PIPELINE_STAGE_TRANSFER_BIT | \
>-    VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT | \
>-    VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT | \
>-    VK_PIPELINE_STAGE_ALL_COMMANDS_BIT)
>-
>-void genX(CmdSetEvent)(
>-    VkCommandBuffer                             commandBuffer,
>-    VkEvent                                     _event,
>-    VkPipelineStageFlags                        stageMask)
>-{
>-   ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
>-   ANV_FROM_HANDLE(anv_event, event, _event);
>-
>-   anv_batch_emit(&cmd_buffer->batch, GENX(PIPE_CONTROL), pc) {
>-      if (stageMask & ANV_PIPELINE_STAGE_PIPELINED_BITS) {
>-         pc.StallAtPixelScoreboard = true;
>-         pc.CommandStreamerStallEnable = true;
>-      }
>-
>-      pc.DestinationAddressType  = DAT_PPGTT,
>-      pc.PostSyncOperation       = WriteImmediateData,
>-      pc.Address = (struct anv_address) {
>-         cmd_buffer->device->dynamic_state_pool.block_pool.bo,
>-         event->state.offset
>-      };
>-      pc.ImmediateData           = VK_EVENT_SET;
>-   }
>-}
>-
>-void genX(CmdResetEvent)(
>-    VkCommandBuffer                             commandBuffer,
>-    VkEvent                                     _event,
>-    VkPipelineStageFlags                        stageMask)
>-{
>-   ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
>-   ANV_FROM_HANDLE(anv_event, event, _event);
>-
>-   anv_batch_emit(&cmd_buffer->batch, GENX(PIPE_CONTROL), pc) {
>-      if (stageMask & ANV_PIPELINE_STAGE_PIPELINED_BITS) {
>-         pc.StallAtPixelScoreboard = true;
>-         pc.CommandStreamerStallEnable = true;
>-      }
>-
>-      pc.DestinationAddressType  = DAT_PPGTT;
>-      pc.PostSyncOperation       = WriteImmediateData;
>-      pc.Address = (struct anv_address) {
>-         cmd_buffer->device->dynamic_state_pool.block_pool.bo,
>-         event->state.offset
>-      };
>-      pc.ImmediateData           = VK_EVENT_RESET;
>-   }
>-}
>-
> void genX(CmdWaitEvents)(
>     VkCommandBuffer                             commandBuffer,
>     uint32_t                                    eventCount,
>diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
>index f171d02dab72..53978634a341 100644
>--- a/src/intel/vulkan/genX_cmd_buffer.c
>+++ b/src/intel/vulkan/genX_cmd_buffer.c
>@@ -4729,3 +4729,70 @@ void genX(CmdEndConditionalRenderingEXT)(
>    cmd_state->conditional_render_enabled = false;
> }
> #endif
>+
>+/* Set of stage bits for which are pipelined, i.e. they get queued by the
>+ * command streamer for later execution.
>+ */
>+#define ANV_PIPELINE_STAGE_PIPELINED_BITS \
>+   (VK_PIPELINE_STAGE_VERTEX_INPUT_BIT | \
>+    VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | \
>+    VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT | \
>+    VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT | \
>+    VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT | \
>+    VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | \
>+    VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | \
>+    VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT | \
>+    VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT | \
>+    VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT | \
>+    VK_PIPELINE_STAGE_TRANSFER_BIT | \
>+    VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT | \
>+    VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT | \
>+    VK_PIPELINE_STAGE_ALL_COMMANDS_BIT)
>+
>+void genX(CmdSetEvent)(
>+    VkCommandBuffer                             commandBuffer,
>+    VkEvent                                     _event,
>+    VkPipelineStageFlags                        stageMask)
>+{
>+   ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
>+   ANV_FROM_HANDLE(anv_event, event, _event);
>+
>+   anv_batch_emit(&cmd_buffer->batch, GENX(PIPE_CONTROL), pc) {
>+      if (stageMask & ANV_PIPELINE_STAGE_PIPELINED_BITS) {
>+         pc.StallAtPixelScoreboard = true;
>+         pc.CommandStreamerStallEnable = true;
>+      }
>+
>+      pc.DestinationAddressType  = DAT_PPGTT,
>+      pc.PostSyncOperation       = WriteImmediateData,
>+      pc.Address = (struct anv_address) {
>+         cmd_buffer->device->dynamic_state_pool.block_pool.bo,
>+         event->state.offset
>+      };
>+      pc.ImmediateData           = VK_EVENT_SET;
>+   }
>+}
>+
>+void genX(CmdResetEvent)(
>+    VkCommandBuffer                             commandBuffer,
>+    VkEvent                                     _event,
>+    VkPipelineStageFlags                        stageMask)
>+{
>+   ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
>+   ANV_FROM_HANDLE(anv_event, event, _event);
>+
>+   anv_batch_emit(&cmd_buffer->batch, GENX(PIPE_CONTROL), pc) {
>+      if (stageMask & ANV_PIPELINE_STAGE_PIPELINED_BITS) {
>+         pc.StallAtPixelScoreboard = true;
>+         pc.CommandStreamerStallEnable = true;
>+      }
>+
>+      pc.DestinationAddressType  = DAT_PPGTT;
>+      pc.PostSyncOperation       = WriteImmediateData;
>+      pc.Address = (struct anv_address) {
>+         cmd_buffer->device->dynamic_state_pool.block_pool.bo,
>+         event->state.offset
>+      };
>+      pc.ImmediateData           = VK_EVENT_RESET;
>+   }
>+}
>-- 
>2.21.0
>

Actions: View | Splinter Review

Attachments on bug 105226: 144483

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.