Mesa (main): v3dv: Use vk_pipeline_hash_shader_stage()
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Jun 28 09:37:15 UTC 2022
Module: Mesa
Branch: main
Commit: a8cd159538b2087fc4fd8894a4d415722d0d55fa
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a8cd159538b2087fc4fd8894a4d415722d0d55fa
Author: Boris Brezillon <boris.brezillon at collabora.com>
Date: Wed Jun 22 18:08:03 2022 +0200
v3dv: Use vk_pipeline_hash_shader_stage()
Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17186>
---
src/broadcom/vulkan/v3dv_meta_clear.c | 7 ++--
src/broadcom/vulkan/v3dv_meta_copy.c | 8 ++--
src/broadcom/vulkan/v3dv_pipeline.c | 71 ++++++-----------------------------
src/broadcom/vulkan/v3dv_private.h | 4 --
4 files changed, 18 insertions(+), 72 deletions(-)
diff --git a/src/broadcom/vulkan/v3dv_meta_clear.c b/src/broadcom/vulkan/v3dv_meta_clear.c
index 0cf1a217619..a799b9e2a18 100644
--- a/src/broadcom/vulkan/v3dv_meta_clear.c
+++ b/src/broadcom/vulkan/v3dv_meta_clear.c
@@ -482,12 +482,11 @@ create_pipeline(struct v3dv_device *device,
VkPipeline *pipeline)
{
VkPipelineShaderStageCreateInfo stages[3] = { 0 };
- struct vk_shader_module vs_m;
+ struct vk_shader_module vs_m = vk_shader_module_from_nir(vs_nir);
struct vk_shader_module gs_m;
struct vk_shader_module fs_m;
uint32_t stage_count = 0;
- v3dv_shader_module_internal_init(device, &vs_m, vs_nir);
stages[stage_count].sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
stages[stage_count].stage = VK_SHADER_STAGE_VERTEX_BIT;
stages[stage_count].module = vk_shader_module_to_handle(&vs_m);
@@ -495,7 +494,7 @@ create_pipeline(struct v3dv_device *device,
stage_count++;
if (gs_nir) {
- v3dv_shader_module_internal_init(device, &gs_m, gs_nir);
+ gs_m = vk_shader_module_from_nir(gs_nir);
stages[stage_count].sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
stages[stage_count].stage = VK_SHADER_STAGE_GEOMETRY_BIT;
stages[stage_count].module = vk_shader_module_to_handle(&gs_m);
@@ -504,7 +503,7 @@ create_pipeline(struct v3dv_device *device,
}
if (fs_nir) {
- v3dv_shader_module_internal_init(device, &fs_m, fs_nir);
+ fs_m = vk_shader_module_from_nir(fs_nir);
stages[stage_count].sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
stages[stage_count].stage = VK_SHADER_STAGE_FRAGMENT_BIT;
stages[stage_count].module = vk_shader_module_to_handle(&fs_m);
diff --git a/src/broadcom/vulkan/v3dv_meta_copy.c b/src/broadcom/vulkan/v3dv_meta_copy.c
index bc915814092..6739df24942 100644
--- a/src/broadcom/vulkan/v3dv_meta_copy.c
+++ b/src/broadcom/vulkan/v3dv_meta_copy.c
@@ -3412,14 +3412,12 @@ create_pipeline(struct v3dv_device *device,
const VkPipelineLayout layout,
VkPipeline *pipeline)
{
- struct vk_shader_module vs_m;
+ struct vk_shader_module vs_m = vk_shader_module_from_nir(vs_nir);
+ struct vk_shader_module fs_m = vk_shader_module_from_nir(fs_nir);
struct vk_shader_module gs_m;
- struct vk_shader_module fs_m;
uint32_t num_stages = gs_nir ? 3 : 2;
- v3dv_shader_module_internal_init(device, &vs_m, vs_nir);
- v3dv_shader_module_internal_init(device, &fs_m, fs_nir);
VkPipelineShaderStageCreateInfo stages[3] = {
{
@@ -3443,7 +3441,7 @@ create_pipeline(struct v3dv_device *device,
};
if (gs_nir) {
- v3dv_shader_module_internal_init(device, &gs_m, gs_nir);
+ gs_m = vk_shader_module_from_nir(gs_nir);
stages[2].module = vk_shader_module_to_handle(&gs_m);
}
diff --git a/src/broadcom/vulkan/v3dv_pipeline.c b/src/broadcom/vulkan/v3dv_pipeline.c
index 6ab88a6d511..a441c74ac07 100644
--- a/src/broadcom/vulkan/v3dv_pipeline.c
+++ b/src/broadcom/vulkan/v3dv_pipeline.c
@@ -36,6 +36,7 @@
#include "util/u_prim.h"
#include "util/os_time.h"
+#include "vk_pipeline.h"
#include "vulkan/util/vk_format.h"
static VkResult
@@ -60,31 +61,15 @@ v3dv_print_v3d_key(struct v3d_key *key,
}
static void
-pipeline_compute_sha1_from_nir(nir_shader *nir,
- unsigned char sha1[20])
+pipeline_compute_sha1_from_nir(struct v3dv_pipeline_stage *p_stage)
{
- assert(nir);
- struct blob blob;
- blob_init(&blob);
-
- nir_serialize(&blob, nir, false);
- if (!blob.out_of_memory)
- _mesa_sha1_compute(blob.data, blob.size, sha1);
-
- blob_finish(&blob);
-}
-
-void
-v3dv_shader_module_internal_init(struct v3dv_device *device,
- struct vk_shader_module *module,
- nir_shader *nir)
-{
- vk_object_base_init(&device->vk, &module->base,
- VK_OBJECT_TYPE_SHADER_MODULE);
- module->nir = nir;
- module->size = 0;
+ VkPipelineShaderStageCreateInfo info = {
+ .module = vk_shader_module_handle_from_nir(p_stage->nir),
+ .pName = p_stage->entrypoint,
+ .stage = mesa_to_vk_shader_stage(p_stage->nir->info.stage),
+ };
- pipeline_compute_sha1_from_nir(nir, module->sha1);
+ vk_pipeline_hash_shader_stage(&info, p_stage->shader_sha1);
}
void
@@ -1889,30 +1874,6 @@ pipeline_stage_get_nir(struct v3dv_pipeline_stage *p_stage,
return NULL;
}
-static void
-pipeline_hash_shader(const struct vk_shader_module *module,
- const char *entrypoint,
- gl_shader_stage stage,
- const VkSpecializationInfo *spec_info,
- unsigned char *sha1_out)
-{
- struct mesa_sha1 ctx;
- _mesa_sha1_init(&ctx);
-
- _mesa_sha1_update(&ctx, module->sha1, sizeof(module->sha1));
- _mesa_sha1_update(&ctx, entrypoint, strlen(entrypoint));
- _mesa_sha1_update(&ctx, &stage, sizeof(stage));
- if (spec_info) {
- _mesa_sha1_update(&ctx, spec_info->pMapEntries,
- spec_info->mapEntryCount *
- sizeof(*spec_info->pMapEntries));
- _mesa_sha1_update(&ctx, spec_info->pData,
- spec_info->dataSize);
- }
-
- _mesa_sha1_final(&ctx, sha1_out);
-}
-
static VkResult
pipeline_compile_vertex_shader(struct v3dv_pipeline *pipeline,
const VkAllocationCallbacks *pAllocator,
@@ -2364,7 +2325,7 @@ pipeline_add_multiview_gs(struct v3dv_pipeline *pipeline,
p_stage->entrypoint = "main";
p_stage->module = 0;
p_stage->nir = nir;
- pipeline_compute_sha1_from_nir(p_stage->nir, p_stage->shader_sha1);
+ pipeline_compute_sha1_from_nir(p_stage);
p_stage->program_id = p_atomic_inc_return(&physical_device->next_program_id);
pipeline->has_gs = true;
@@ -2433,11 +2394,7 @@ pipeline_compile_graphics(struct v3dv_pipeline *pipeline,
p_stage->module = vk_shader_module_from_handle(sinfo->module);
p_stage->spec_info = sinfo->pSpecializationInfo;
- pipeline_hash_shader(p_stage->module,
- p_stage->entrypoint,
- stage,
- p_stage->spec_info,
- p_stage->shader_sha1);
+ vk_pipeline_hash_shader_stage(&pCreateInfo->pStages[i], p_stage->shader_sha1);
pipeline->active_stages |= sinfo->stage;
@@ -2491,7 +2448,7 @@ pipeline_compile_graphics(struct v3dv_pipeline *pipeline,
p_stage->entrypoint = "main";
p_stage->module = 0;
p_stage->nir = b.shader;
- pipeline_compute_sha1_from_nir(p_stage->nir, p_stage->shader_sha1);
+ pipeline_compute_sha1_from_nir(p_stage);
p_stage->program_id =
p_atomic_inc_return(&physical_device->next_program_id);
@@ -3214,11 +3171,7 @@ pipeline_compile_compute(struct v3dv_pipeline *pipeline,
p_stage->spec_info = sinfo->pSpecializationInfo;
p_stage->feedback = (VkPipelineCreationFeedbackEXT) { 0 };
- pipeline_hash_shader(p_stage->module,
- p_stage->entrypoint,
- stage,
- p_stage->spec_info,
- p_stage->shader_sha1);
+ vk_pipeline_hash_shader_stage(&info->stage, p_stage->shader_sha1);
p_stage->nir = NULL;
diff --git a/src/broadcom/vulkan/v3dv_private.h b/src/broadcom/vulkan/v3dv_private.h
index cfd32ec7ad6..fc78e037f06 100644
--- a/src/broadcom/vulkan/v3dv_private.h
+++ b/src/broadcom/vulkan/v3dv_private.h
@@ -2217,10 +2217,6 @@ struct v3dv_bo *
v3dv_pipeline_create_default_attribute_values(struct v3dv_device *device,
struct v3dv_pipeline *pipeline);
-void v3dv_shader_module_internal_init(struct v3dv_device *device,
- struct vk_shader_module *module,
- nir_shader *nir);
-
#define V3DV_FROM_HANDLE(__v3dv_type, __name, __handle) \
VK_FROM_HANDLE(__v3dv_type, __name, __handle)
More information about the mesa-commit
mailing list