OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: Improve error message when pipeline creation fails during shader compilation

Browse Source 
Due the lack of SIMD8 in Xe2 platforms we are not able to compile
a shader for dEQP-VK.protected_memory.stack.stacksize_1024 that fits
into scratch space.

So before this patch when such failure happened it would return
VK_ERROR_OUT_OF_HOST_MEMORY error.
So here when available include the compiler error string to better
inform what the actual failure.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30380>
This commit is contained in:
José Roberto de Souza
2024-07-25 09:19:34 -07:00
committed by Marge Bot
parent 0b16d7ebb9
commit 196b3d7b5b
1 changed files with 52 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/intel/vulkan/anv_pipeline.c
View File

@@ -1208,7 +1208,8 @@ anv_pipeline_compile_vs(const struct brw_compiler *compiler,
void *mem_ctx, void *mem_ctx,
struct anv_graphics_base_pipeline *pipeline, struct anv_graphics_base_pipeline *pipeline,
struct anv_pipeline_stage *vs_stage, struct anv_pipeline_stage *vs_stage,
uint32_t view_mask) uint32_t view_mask,
char **error_str)
{ {
/* When using Primitive Replication for multiview, each view gets its own /* When using Primitive Replication for multiview, each view gets its own
* position slot. * position slot.
@@ -1241,6 +1242,7 @@ anv_pipeline_compile_vs(const struct brw_compiler *compiler,
}; };
vs_stage->code = brw_compile_vs(compiler, &params); vs_stage->code = brw_compile_vs(compiler, &params);
*error_str = params.base.error_str;
} }
static void static void
@@ -1311,7 +1313,8 @@ anv_pipeline_compile_tcs(const struct brw_compiler *compiler,
void *mem_ctx, void *mem_ctx,
struct anv_device *device, struct anv_device *device,
struct anv_pipeline_stage *tcs_stage, struct anv_pipeline_stage *tcs_stage,
struct anv_pipeline_stage *prev_stage) struct anv_pipeline_stage *prev_stage,
char **error_str)
{ {
tcs_stage->key.tcs.outputs_written = tcs_stage->key.tcs.outputs_written =
tcs_stage->nir->info.outputs_written; tcs_stage->nir->info.outputs_written;
@@ -1333,6 +1336,7 @@ anv_pipeline_compile_tcs(const struct brw_compiler *compiler,
}; };
tcs_stage->code = brw_compile_tcs(compiler, &params); tcs_stage->code = brw_compile_tcs(compiler, &params);
*error_str = params.base.error_str;
} }
static void static void
@@ -1349,7 +1353,8 @@ anv_pipeline_compile_tes(const struct brw_compiler *compiler,
void *mem_ctx, void *mem_ctx,
struct anv_device *device, struct anv_device *device,
struct anv_pipeline_stage *tes_stage, struct anv_pipeline_stage *tes_stage,
struct anv_pipeline_stage *tcs_stage) struct anv_pipeline_stage *tcs_stage,
char **error_str)
{ {
tes_stage->key.tes.inputs_read = tes_stage->key.tes.inputs_read =
tcs_stage->nir->info.outputs_written; tcs_stage->nir->info.outputs_written;
@@ -1372,6 +1377,7 @@ anv_pipeline_compile_tes(const struct brw_compiler *compiler,
}; };
tes_stage->code = brw_compile_tes(compiler, &params); tes_stage->code = brw_compile_tes(compiler, &params);
*error_str = params.base.error_str;
} }
static void static void
@@ -1388,7 +1394,8 @@ anv_pipeline_compile_gs(const struct brw_compiler *compiler,
void *mem_ctx, void *mem_ctx,
struct anv_device *device, struct anv_device *device,
struct anv_pipeline_stage *gs_stage, struct anv_pipeline_stage *gs_stage,
struct anv_pipeline_stage *prev_stage) struct anv_pipeline_stage *prev_stage,
char **error_str)
{ {
brw_compute_vue_map(compiler->devinfo, brw_compute_vue_map(compiler->devinfo,
&gs_stage->prog_data.gs.base.vue_map, &gs_stage->prog_data.gs.base.vue_map,
@@ -1410,6 +1417,7 @@ anv_pipeline_compile_gs(const struct brw_compiler *compiler,
}; };
gs_stage->code = brw_compile_gs(compiler, &params); gs_stage->code = brw_compile_gs(compiler, &params);
*error_str = params.base.error_str;
} }
static void static void
@@ -1426,7 +1434,8 @@ static void
anv_pipeline_compile_task(const struct brw_compiler *compiler, anv_pipeline_compile_task(const struct brw_compiler *compiler,
void *mem_ctx, void *mem_ctx,
struct anv_device *device, struct anv_device *device,
struct anv_pipeline_stage *task_stage) struct anv_pipeline_stage *task_stage,
char **error_str)
{ {
task_stage->num_stats = 1; task_stage->num_stats = 1;
@@ -1443,6 +1452,7 @@ anv_pipeline_compile_task(const struct brw_compiler *compiler,
}; };
task_stage->code = brw_compile_task(compiler, &params); task_stage->code = brw_compile_task(compiler, &params);
*error_str = params.base.error_str;
} }
static void static void
@@ -1460,7 +1470,8 @@ anv_pipeline_compile_mesh(const struct brw_compiler *compiler,
void *mem_ctx, void *mem_ctx,
struct anv_device *device, struct anv_device *device,
struct anv_pipeline_stage *mesh_stage, struct anv_pipeline_stage *mesh_stage,
struct anv_pipeline_stage *prev_stage) struct anv_pipeline_stage *prev_stage,
char **error_str)
{ {
mesh_stage->num_stats = 1; mesh_stage->num_stats = 1;
@@ -1482,6 +1493,7 @@ anv_pipeline_compile_mesh(const struct brw_compiler *compiler,
} }
mesh_stage->code = brw_compile_mesh(compiler, &params); mesh_stage->code = brw_compile_mesh(compiler, &params);
*error_str = params.base.error_str;
} }
static void static void
@@ -1556,7 +1568,8 @@ anv_pipeline_compile_fs(const struct brw_compiler *compiler,
struct anv_pipeline_stage *prev_stage, struct anv_pipeline_stage *prev_stage,
struct anv_graphics_base_pipeline *pipeline, struct anv_graphics_base_pipeline *pipeline,
uint32_t view_mask, uint32_t view_mask,
bool use_primitive_replication) bool use_primitive_replication,
char **error_str)
{ {
/* When using Primitive Replication for multiview, each view gets its own /* When using Primitive Replication for multiview, each view gets its own
* position slot. * position slot.
@@ -1602,6 +1615,7 @@ anv_pipeline_compile_fs(const struct brw_compiler *compiler,
} }
fs_stage->code = brw_compile_fs(compiler, &params); fs_stage->code = brw_compile_fs(compiler, &params);
*error_str = params.base.error_str;
fs_stage->num_stats = (uint32_t)!!fs_stage->prog_data.wm.dispatch_multi + fs_stage->num_stats = (uint32_t)!!fs_stage->prog_data.wm.dispatch_multi +
(uint32_t)fs_stage->prog_data.wm.dispatch_8 + (uint32_t)fs_stage->prog_data.wm.dispatch_8 +
@@ -2453,44 +2467,48 @@ anv_graphics_pipeline_compile(struct anv_graphics_base_pipeline *pipeline,
int64_t stage_start = os_time_get_nano(); int64_t stage_start = os_time_get_nano();
void *stage_ctx = ralloc_context(NULL); void *stage_ctx = ralloc_context(NULL);
char *error_str = NULL;
switch (s) { switch (s) {
case MESA_SHADER_VERTEX: case MESA_SHADER_VERTEX:
anv_pipeline_compile_vs(compiler, stage_ctx, pipeline, anv_pipeline_compile_vs(compiler, stage_ctx, pipeline,
stage, view_mask); stage, view_mask, &error_str);
break; break;
case MESA_SHADER_TESS_CTRL: case MESA_SHADER_TESS_CTRL:
anv_pipeline_compile_tcs(compiler, stage_ctx, device, anv_pipeline_compile_tcs(compiler, stage_ctx, device,
stage, prev_stage); stage, prev_stage, &error_str);
break; break;
case MESA_SHADER_TESS_EVAL: case MESA_SHADER_TESS_EVAL:
anv_pipeline_compile_tes(compiler, stage_ctx, device, anv_pipeline_compile_tes(compiler, stage_ctx, device,
stage, prev_stage); stage, prev_stage, &error_str);
break; break;
case MESA_SHADER_GEOMETRY: case MESA_SHADER_GEOMETRY:
anv_pipeline_compile_gs(compiler, stage_ctx, device, anv_pipeline_compile_gs(compiler, stage_ctx, device,
stage, prev_stage); stage, prev_stage, &error_str);
break; break;
case MESA_SHADER_TASK: case MESA_SHADER_TASK:
anv_pipeline_compile_task(compiler, stage_ctx, device, anv_pipeline_compile_task(compiler, stage_ctx, device,
stage); stage, &error_str);
break; break;
case MESA_SHADER_MESH: case MESA_SHADER_MESH:
anv_pipeline_compile_mesh(compiler, stage_ctx, device, anv_pipeline_compile_mesh(compiler, stage_ctx, device,
stage, prev_stage); stage, prev_stage, &error_str);
break; break;
case MESA_SHADER_FRAGMENT: case MESA_SHADER_FRAGMENT:
anv_pipeline_compile_fs(compiler, stage_ctx, device, anv_pipeline_compile_fs(compiler, stage_ctx, device,
stage, prev_stage, pipeline, stage, prev_stage, pipeline,
view_mask, view_mask, use_primitive_replication,
use_primitive_replication); &error_str);
break; break;
default: default:
unreachable("Invalid graphics shader stage"); unreachable("Invalid graphics shader stage");
} }
if (stage->code == NULL) { if (stage->code == NULL) {
if (error_str)
result = vk_errorf(pipeline, VK_ERROR_UNKNOWN, "%s", error_str);
else
result = vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
ralloc_free(stage_ctx); ralloc_free(stage_ctx);
result = vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
goto fail; goto fail;
} }
@@ -2679,8 +2697,15 @@ anv_pipeline_compile_cs(struct anv_compute_pipeline *pipeline,
stage.code = brw_compile_cs(compiler, &params); stage.code = brw_compile_cs(compiler, &params);
if (stage.code == NULL) { if (stage.code == NULL) {
VkResult result;
if (params.base.error_str)
result = vk_errorf(pipeline, VK_ERROR_UNKNOWN, "%s", params.base.error_str);
else
result = vk_error(pipeline, VK_ERROR_OUT_OF_HOST_MEMORY);
ralloc_free(mem_ctx); ralloc_free(mem_ctx);
return vk_error(pipeline, VK_ERROR_OUT_OF_HOST_MEMORY); return result;
} }
anv_nir_validate_push_layout(device->physical, &stage.prog_data.base, anv_nir_validate_push_layout(device->physical, &stage.prog_data.base,
@@ -3375,8 +3400,16 @@ compile_upload_rt_shader(struct anv_ray_tracing_pipeline *pipeline,
}; };
stage->code = brw_compile_bs(compiler, &params); stage->code = brw_compile_bs(compiler, &params);
if (stage->code == NULL) if (stage->code == NULL) {
return vk_error(pipeline, VK_ERROR_OUT_OF_HOST_MEMORY); VkResult result;
if (params.base.error_str)
result = vk_errorf(pipeline, VK_ERROR_UNKNOWN, "%s", params.base.error_str);
else
result = vk_error(pipeline, VK_ERROR_OUT_OF_HOST_MEMORY);
return result;
}
struct anv_shader_upload_params upload_params = { struct anv_shader_upload_params upload_params = {
.stage = stage->stage, .stage = stage->stage,