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

panfrost/ci: Add environment variable to suppress warnings

Browse Source 
Without it, our test log fills up with warnings that crawling index
buffers from the CPU isn't valid. We know that.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26449>
This commit is contained in:
Daniel Stone
2023-11-15 11:20:26 +00:00
committed by Marge Bot
parent ac613b9e44
commit f51d99def6
5 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci/common/generate-env.sh
View File

@@ -91,6 +91,7 @@ for var in \
NIR_DEBUG \ NIR_DEBUG \
PAN_I_WANT_A_BROKEN_VULKAN_DRIVER \ PAN_I_WANT_A_BROKEN_VULKAN_DRIVER \
PAN_MESA_DEBUG \ PAN_MESA_DEBUG \
PANVK_DEBUG \
PIGLIT_FRACTION \ PIGLIT_FRACTION \
PIGLIT_NO_WINDOW \ PIGLIT_NO_WINDOW \
PIGLIT_OPTIONS \ PIGLIT_OPTIONS \

1
src/panfrost/ci/gitlab-ci.yml
View File

@@ -210,6 +210,7 @@ panfrost-g52-vk:arm64:
VK_DRIVER: panfrost VK_DRIVER: panfrost
MESA_VK_IGNORE_CONFORMANCE_WARNING: 1 MESA_VK_IGNORE_CONFORMANCE_WARNING: 1
PAN_I_WANT_A_BROKEN_VULKAN_DRIVER: 1 PAN_I_WANT_A_BROKEN_VULKAN_DRIVER: 1
PANVK_DEBUG: no_known_warn
DEQP_SUITE: panfrost-g52-vk DEQP_SUITE: panfrost-g52-vk
panfrost-g52-piglit-gles2:arm64: panfrost-g52-piglit-gles2:arm64:

13
src/panfrost/vulkan/panvk_device.c
View File

@@ -112,10 +112,15 @@ panvk_get_device_uuid(void *uuid)
} }
static const struct debug_control panvk_debug_options[] = { static const struct debug_control panvk_debug_options[] = {
{"startup", PANVK_DEBUG_STARTUP}, {"nir", PANVK_DEBUG_NIR}, {"startup", PANVK_DEBUG_STARTUP},
{"trace", PANVK_DEBUG_TRACE}, {"sync", PANVK_DEBUG_SYNC}, {"nir", PANVK_DEBUG_NIR},
{"afbc", PANVK_DEBUG_AFBC}, {"linear", PANVK_DEBUG_LINEAR}, {"trace", PANVK_DEBUG_TRACE},
{"dump", PANVK_DEBUG_DUMP}, {NULL, 0}}; {"sync", PANVK_DEBUG_SYNC},
{"afbc", PANVK_DEBUG_AFBC},
{"linear", PANVK_DEBUG_LINEAR},
{"dump", PANVK_DEBUG_DUMP},
{"no_known_warn", PANVK_DEBUG_NO_KNOWN_WARN},
{NULL, 0}};
#if defined(VK_USE_PLATFORM_WAYLAND_KHR) #if defined(VK_USE_PLATFORM_WAYLAND_KHR)
#define PANVK_USE_WSI_PLATFORM #define PANVK_USE_WSI_PLATFORM

1
src/panfrost/vulkan/panvk_private.h
View File

@@ -199,6 +199,7 @@ enum panvk_debug_flags {
PANVK_DEBUG_AFBC = 1 << 4, PANVK_DEBUG_AFBC = 1 << 4,
PANVK_DEBUG_LINEAR = 1 << 5, PANVK_DEBUG_LINEAR = 1 << 5,
PANVK_DEBUG_DUMP = 1 << 6, PANVK_DEBUG_DUMP = 1 << 6,
PANVK_DEBUG_NO_KNOWN_WARN = 1 << 7,
}; };
struct panvk_instance { struct panvk_instance {

13
src/panfrost/vulkan/panvk_vX_cmd_buffer.c
View File

@@ -798,14 +798,19 @@ panvk_index_minmax_search(struct panvk_cmd_buffer *cmdbuf, uint32_t start,
void *ptr = cmdbuf->state.ib.buffer->bo->ptr.cpu + void *ptr = cmdbuf->state.ib.buffer->bo->ptr.cpu +
cmdbuf->state.ib.buffer->bo_offset + cmdbuf->state.ib.offset; cmdbuf->state.ib.buffer->bo_offset + cmdbuf->state.ib.offset;
fprintf(
stderr,
"WARNING: Crawling index buffers from the CPU isn't valid in Vulkan\n");
assert(cmdbuf->state.ib.buffer); assert(cmdbuf->state.ib.buffer);
assert(cmdbuf->state.ib.buffer->bo); assert(cmdbuf->state.ib.buffer->bo);
assert(cmdbuf->state.ib.buffer->bo->ptr.cpu); assert(cmdbuf->state.ib.buffer->bo->ptr.cpu);
uint32_t debug_flags =
cmdbuf->device->physical_device->instance->debug_flags;
if (!(debug_flags & PANVK_DEBUG_NO_KNOWN_WARN)) {
fprintf(
stderr,
"WARNING: Crawling index buffers from the CPU isn't valid in Vulkan\n");
}
*max = 0; *max = 0;
/* TODO: Use panfrost_minmax_cache */ /* TODO: Use panfrost_minmax_cache */