From 4dfb9d9fceec4a36ff6d7a7419bbd5ecd9ddcafe Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 15 Apr 2020 16:06:03 -0500 Subject: [PATCH] anv: Report correct SLM size Fixes: d787a2d0 "anv: Implement VK_KHR_pipeline_executable_properties" Reviewed-by: Caio Marcelo de Oliveira Filho Part-of: (cherry picked from commit b8acf9a3d4af33cf8b6b8c870167c2aa348990a0) --- .pick_status.json | 2 +- src/intel/vulkan/anv_pipeline.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index ca7d4d1554b..8a1e6257160 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1012,7 +1012,7 @@ "description": "anv: Report correct SLM size", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "d787a2d05e20642a7ec52ce80a830c7795a6bdc0" }, diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index cfcbcc131ef..c5059204978 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -2099,7 +2099,7 @@ VkResult anv_GetPipelineExecutableStatisticsKHR( "Number of bytes of workgroup shared memory used by this " "compute shader including any padding."); stat->format = VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_UINT64_KHR; - stat->value.u64 = prog_data->total_scratch; + stat->value.u64 = brw_cs_prog_data_const(prog_data)->slm_size; } }