fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-01 15:30:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: add radv_query.h

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28510>
This commit is contained in:
Samuel Pitoiset 2024-04-01 17:00:03 +02:00 • committed by Marge Bot
parent bbb2e82e9a
commit bccaeab503
5 changed files with 54 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/amd/vulkan/meson.build
View file

@ -154,6 +154,7 @@ libradv_files = files(
'radv_spm.c',
'radv_sqtt.c',
'radv_query.c',
'radv_query.h',
'radv_video.c',
'radv_video.h',
'radv_wsi.c',

16
src/amd/vulkan/radv_private.h
View file

@ -63,7 +63,6 @@
#include "vk_instance.h"
#include "vk_log.h"
#include "vk_physical_device.h"
#include "vk_query_pool.h"
#include "vk_queue.h"
#include "vk_shader_module.h"
#include "vk_texcompress_astc.h"
@ -83,6 +82,7 @@
#include "ac_vcn.h"
#include "radv_constants.h"
#include "radv_descriptor_set.h"
#include "radv_query.h"
#include "radv_radeon_winsys.h"
#include "radv_shader.h"
#include "radv_shader_args.h"
@ -2104,8 +2104,6 @@ enum radv_cmd_flush_bits radv_src_access_flush(struct radv_cmd_buffer *cmd_buffe
enum radv_cmd_flush_bits radv_dst_access_flush(struct radv_cmd_buffer *cmd_buffer, VkAccessFlags2 dst_flags,
const struct radv_image *image);
void radv_write_timestamp(struct radv_cmd_buffer *cmd_buffer, uint64_t va, VkPipelineStageFlags2 stage);
void radv_cmd_buffer_trace_emit(struct radv_cmd_buffer *cmd_buffer);
void radv_cmd_buffer_annotate(struct radv_cmd_buffer *cmd_buffer, const char *annotation);
@ -2628,17 +2626,6 @@ struct radv_resolve_barrier {
void radv_emit_resolve_barrier(struct radv_cmd_buffer *cmd_buffer, const struct radv_resolve_barrier *barrier);
struct radv_query_pool {
struct vk_query_pool vk;
struct radeon_winsys_bo *bo;
uint32_t stride;
uint32_t availability_offset;
uint64_t size;
char *ptr;
bool uses_gds; /* For NGG GS on GFX10+ */
bool uses_ace; /* For task shader invocations on GFX10.3+ */
};
struct radv_perfcounter_impl;
struct radv_pc_query_pool {
@ -3353,7 +3340,6 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(radv_device_memory, base, VkDeviceMemory, VK_OBJE
VK_DEFINE_NONDISP_HANDLE_CASTS(radv_indirect_command_layout, base, VkIndirectCommandsLayoutNV,
VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NV)
VK_DEFINE_NONDISP_HANDLE_CASTS(radv_pipeline, base, VkPipeline, VK_OBJECT_TYPE_PIPELINE)
VK_DEFINE_NONDISP_HANDLE_CASTS(radv_query_pool, vk.base, VkQueryPool, VK_OBJECT_TYPE_QUERY_POOL)
VK_DEFINE_NONDISP_HANDLE_CASTS(radv_shader_object, base, VkShaderEXT, VK_OBJECT_TYPE_SHADER_EXT);
static inline uint64_t

1
src/amd/vulkan/radv_query.c
View file

@ -35,6 +35,7 @@
#include "vulkan/vulkan_core.h"
#include "radv_cs.h"
#include "radv_private.h"
#include "radv_query.h"
#include "sid.h"
#include "vk_acceleration_structure.h"
#include "vk_common_entrypoints.h"

50
src/amd/vulkan/radv_query.h Normal file
View file

@ -0,0 +1,50 @@
/*
* Copyright © 2016 Red Hat.
* Copyright © 2016 Bas Nieuwenhuizen
*
* based in part on anv driver which is:
* Copyright © 2015 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
#ifndef RADV_QUERY_H
#define RADV_QUERY_H
#include "vk_query_pool.h"
struct radv_cmd_buffer;
struct radv_query_pool {
struct vk_query_pool vk;
struct radeon_winsys_bo *bo;
uint32_t stride;
uint32_t availability_offset;
uint64_t size;
char *ptr;
bool uses_gds; /* For NGG GS on GFX10+ */
bool uses_ace; /* For task shader invocations on GFX10.3+ */
};
VK_DEFINE_NONDISP_HANDLE_CASTS(radv_query_pool, vk.base, VkQueryPool, VK_OBJECT_TYPE_QUERY_POOL)
void radv_write_timestamp(struct radv_cmd_buffer *cmd_buffer, uint64_t va, VkPipelineStageFlags2 stage);
#endif /* RADV_QUERY_H */

1
src/amd/vulkan/radv_rmv.c
View file

@ -34,6 +34,7 @@
#include "radv_event.h"
#include "radv_image.h"
#include "radv_private.h"
#include "radv_query.h"
#define RADV_FTRACE_INSTANCE_PATH "/sys/kernel/tracing/instances/amd_rmv"