radv: add radv_rra.h
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28526>
This commit is contained in:
Samuel Pitoiset
committed by
Marge Bot
Marge Bot
parent
6849305a86
commit
1c590cbd28
@@ -25,6 +25,7 @@
|
||||
#include "util/u_process.h"
|
||||
#include "radv_event.h"
|
||||
#include "radv_private.h"
|
||||
#include "radv_rra.h"
|
||||
#include "vk_acceleration_structure.h"
|
||||
#include "vk_common_entrypoints.h"
|
||||
|
||||
|
||||
@@ -145,6 +145,7 @@ libradv_files = files(
|
||||
'radv_radeon_winsys.h',
|
||||
'radv_rmv.c',
|
||||
'radv_rra.c',
|
||||
'radv_rra.h',
|
||||
'radv_sampler.c',
|
||||
'radv_sampler.h',
|
||||
'radv_sdma.c',
|
||||
|
||||
@@ -83,6 +83,7 @@
|
||||
#include "radv_physical_device.h"
|
||||
#include "radv_queue.h"
|
||||
#include "radv_radeon_winsys.h"
|
||||
#include "radv_rra.h"
|
||||
#include "radv_shader.h"
|
||||
#include "radv_shader_args.h"
|
||||
#include "sid.h"
|
||||
@@ -555,148 +556,6 @@ struct radv_memory_trace_data {
|
||||
int *pipe_fds;
|
||||
};
|
||||
|
||||
struct radv_rra_accel_struct_data {
|
||||
VkEvent build_event;
|
||||
uint64_t va;
|
||||
uint64_t size;
|
||||
VkBuffer buffer;
|
||||
VkDeviceMemory memory;
|
||||
VkAccelerationStructureTypeKHR type;
|
||||
bool is_dead;
|
||||
};
|
||||
|
||||
void radv_destroy_rra_accel_struct_data(VkDevice device, struct radv_rra_accel_struct_data *data);
|
||||
|
||||
struct radv_ray_history_header {
|
||||
uint32_t offset;
|
||||
uint32_t dispatch_index;
|
||||
uint32_t submit_base_index;
|
||||
};
|
||||
|
||||
enum radv_packed_token_type {
|
||||
radv_packed_token_end_trace,
|
||||
};
|
||||
|
||||
struct radv_packed_token_header {
|
||||
uint32_t launch_index : 29;
|
||||
uint32_t hit : 1;
|
||||
uint32_t token_type : 2;
|
||||
};
|
||||
|
||||
struct radv_packed_end_trace_token {
|
||||
struct radv_packed_token_header header;
|
||||
|
||||
uint32_t accel_struct_lo;
|
||||
uint32_t accel_struct_hi;
|
||||
|
||||
uint32_t flags : 16;
|
||||
uint32_t dispatch_index : 16;
|
||||
|
||||
uint32_t sbt_offset : 4;
|
||||
uint32_t sbt_stride : 4;
|
||||
uint32_t miss_index : 16;
|
||||
uint32_t cull_mask : 8;
|
||||
|
||||
float origin[3];
|
||||
float tmin;
|
||||
float direction[3];
|
||||
float tmax;
|
||||
|
||||
uint32_t iteration_count : 16;
|
||||
uint32_t instance_count : 16;
|
||||
|
||||
uint32_t ahit_count : 16;
|
||||
uint32_t isec_count : 16;
|
||||
|
||||
uint32_t primitive_id;
|
||||
uint32_t geometry_id;
|
||||
|
||||
uint32_t instance_id : 24;
|
||||
uint32_t hit_kind : 8;
|
||||
|
||||
float t;
|
||||
};
|
||||
static_assert(sizeof(struct radv_packed_end_trace_token) == 76, "Unexpected radv_packed_end_trace_token size");
|
||||
|
||||
enum radv_rra_ray_history_metadata_type {
|
||||
RADV_RRA_COUNTER_INFO = 1,
|
||||
RADV_RRA_DISPATCH_SIZE = 2,
|
||||
RADV_RRA_TRAVERSAL_FLAGS = 3,
|
||||
};
|
||||
|
||||
struct radv_rra_ray_history_metadata_info {
|
||||
enum radv_rra_ray_history_metadata_type type : 32;
|
||||
uint32_t padding;
|
||||
uint64_t size;
|
||||
};
|
||||
|
||||
enum radv_rra_pipeline_type {
|
||||
RADV_RRA_PIPELINE_RAY_TRACING,
|
||||
};
|
||||
|
||||
struct radv_rra_ray_history_counter {
|
||||
uint32_t dispatch_size[3];
|
||||
uint32_t hit_shader_count;
|
||||
uint32_t miss_shader_count;
|
||||
uint32_t shader_count;
|
||||
uint64_t pipeline_api_hash;
|
||||
uint32_t mode;
|
||||
uint32_t mask;
|
||||
uint32_t stride;
|
||||
uint32_t data_size;
|
||||
uint32_t lost_token_size;
|
||||
uint32_t ray_id_begin;
|
||||
uint32_t ray_id_end;
|
||||
enum radv_rra_pipeline_type pipeline_type : 32;
|
||||
};
|
||||
|
||||
struct radv_rra_ray_history_dispatch_size {
|
||||
uint32_t size[3];
|
||||
uint32_t padding;
|
||||
};
|
||||
|
||||
struct radv_rra_ray_history_traversal_flags {
|
||||
uint32_t box_sort_mode : 1;
|
||||
uint32_t node_ptr_flags : 1;
|
||||
uint32_t reserved : 30;
|
||||
uint32_t padding;
|
||||
};
|
||||
|
||||
struct radv_rra_ray_history_metadata {
|
||||
struct radv_rra_ray_history_metadata_info counter_info;
|
||||
struct radv_rra_ray_history_counter counter;
|
||||
|
||||
struct radv_rra_ray_history_metadata_info dispatch_size_info;
|
||||
struct radv_rra_ray_history_dispatch_size dispatch_size;
|
||||
|
||||
struct radv_rra_ray_history_metadata_info traversal_flags_info;
|
||||
struct radv_rra_ray_history_traversal_flags traversal_flags;
|
||||
};
|
||||
static_assert(sizeof(struct radv_rra_ray_history_metadata) == 136,
|
||||
"radv_rra_ray_history_metadata does not match RRA expectations");
|
||||
|
||||
struct radv_rra_ray_history_data {
|
||||
struct radv_rra_ray_history_metadata metadata;
|
||||
};
|
||||
|
||||
struct radv_rra_trace_data {
|
||||
struct hash_table *accel_structs;
|
||||
struct hash_table_u64 *accel_struct_vas;
|
||||
simple_mtx_t data_mtx;
|
||||
bool validate_as;
|
||||
bool copy_after_build;
|
||||
bool triggered;
|
||||
uint32_t copy_memory_index;
|
||||
|
||||
struct util_dynarray ray_history;
|
||||
VkBuffer ray_history_buffer;
|
||||
VkDeviceMemory ray_history_memory;
|
||||
void *ray_history_data;
|
||||
uint64_t ray_history_addr;
|
||||
uint32_t ray_history_buffer_size;
|
||||
uint32_t ray_history_resolution_scale;
|
||||
};
|
||||
|
||||
enum radv_dispatch_table {
|
||||
RADV_DEVICE_DISPATCH_TABLE,
|
||||
RADV_ANNOTATE_DISPATCH_TABLE,
|
||||
@@ -2253,12 +2112,6 @@ VkResult radv_sqtt_get_timed_cmdbuf(struct radv_queue *queue, struct radeon_wins
|
||||
VkResult radv_sqtt_acquire_gpu_timestamp(struct radv_device *device, struct radeon_winsys_bo **gpu_timestamp_bo,
|
||||
uint32_t *gpu_timestamp_offset, void **gpu_timestamp_ptr);
|
||||
|
||||
VkResult radv_rra_trace_init(struct radv_device *device);
|
||||
|
||||
VkResult radv_rra_dump_trace(VkQueue vk_queue, char *filename);
|
||||
void radv_rra_trace_clear_ray_history(VkDevice _device, struct radv_rra_trace_data *data);
|
||||
void radv_rra_trace_finish(VkDevice vk_device, struct radv_rra_trace_data *data);
|
||||
|
||||
void radv_memory_trace_init(struct radv_device *device);
|
||||
void radv_rmv_log_bo_allocate(struct radv_device *device, struct radeon_winsys_bo *bo, bool is_internal);
|
||||
void radv_rmv_log_bo_destroy(struct radv_device *device, struct radeon_winsys_bo *bo);
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
* IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "radv_rra.h"
|
||||
#include "bvh/bvh.h"
|
||||
#include "util/half_float.h"
|
||||
#include "amd_family.h"
|
||||
|
||||
@@ -0,0 +1,191 @@
|
||||
/*
|
||||
* 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_RRA_H
|
||||
#define RADV_RRA_H
|
||||
|
||||
#include "util/simple_mtx.h"
|
||||
#include "util/u_dynarray.h"
|
||||
|
||||
#include <vulkan/vulkan.h>
|
||||
|
||||
#include <assert.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
struct radv_device;
|
||||
|
||||
struct radv_rra_accel_struct_data {
|
||||
VkEvent build_event;
|
||||
uint64_t va;
|
||||
uint64_t size;
|
||||
VkBuffer buffer;
|
||||
VkDeviceMemory memory;
|
||||
VkAccelerationStructureTypeKHR type;
|
||||
bool is_dead;
|
||||
};
|
||||
|
||||
enum radv_rra_ray_history_metadata_type {
|
||||
RADV_RRA_COUNTER_INFO = 1,
|
||||
RADV_RRA_DISPATCH_SIZE = 2,
|
||||
RADV_RRA_TRAVERSAL_FLAGS = 3,
|
||||
};
|
||||
|
||||
struct radv_rra_ray_history_metadata_info {
|
||||
enum radv_rra_ray_history_metadata_type type : 32;
|
||||
uint32_t padding;
|
||||
uint64_t size;
|
||||
};
|
||||
|
||||
enum radv_rra_pipeline_type {
|
||||
RADV_RRA_PIPELINE_RAY_TRACING,
|
||||
};
|
||||
|
||||
struct radv_rra_ray_history_counter {
|
||||
uint32_t dispatch_size[3];
|
||||
uint32_t hit_shader_count;
|
||||
uint32_t miss_shader_count;
|
||||
uint32_t shader_count;
|
||||
uint64_t pipeline_api_hash;
|
||||
uint32_t mode;
|
||||
uint32_t mask;
|
||||
uint32_t stride;
|
||||
uint32_t data_size;
|
||||
uint32_t lost_token_size;
|
||||
uint32_t ray_id_begin;
|
||||
uint32_t ray_id_end;
|
||||
enum radv_rra_pipeline_type pipeline_type : 32;
|
||||
};
|
||||
|
||||
struct radv_rra_ray_history_dispatch_size {
|
||||
uint32_t size[3];
|
||||
uint32_t padding;
|
||||
};
|
||||
|
||||
struct radv_rra_ray_history_traversal_flags {
|
||||
uint32_t box_sort_mode : 1;
|
||||
uint32_t node_ptr_flags : 1;
|
||||
uint32_t reserved : 30;
|
||||
uint32_t padding;
|
||||
};
|
||||
|
||||
struct radv_rra_ray_history_metadata {
|
||||
struct radv_rra_ray_history_metadata_info counter_info;
|
||||
struct radv_rra_ray_history_counter counter;
|
||||
|
||||
struct radv_rra_ray_history_metadata_info dispatch_size_info;
|
||||
struct radv_rra_ray_history_dispatch_size dispatch_size;
|
||||
|
||||
struct radv_rra_ray_history_metadata_info traversal_flags_info;
|
||||
struct radv_rra_ray_history_traversal_flags traversal_flags;
|
||||
};
|
||||
static_assert(sizeof(struct radv_rra_ray_history_metadata) == 136,
|
||||
"radv_rra_ray_history_metadata does not match RRA expectations");
|
||||
|
||||
struct radv_rra_ray_history_data {
|
||||
struct radv_rra_ray_history_metadata metadata;
|
||||
};
|
||||
|
||||
struct radv_rra_trace_data {
|
||||
struct hash_table *accel_structs;
|
||||
struct hash_table_u64 *accel_struct_vas;
|
||||
simple_mtx_t data_mtx;
|
||||
bool validate_as;
|
||||
bool copy_after_build;
|
||||
bool triggered;
|
||||
uint32_t copy_memory_index;
|
||||
|
||||
struct util_dynarray ray_history;
|
||||
VkBuffer ray_history_buffer;
|
||||
VkDeviceMemory ray_history_memory;
|
||||
void *ray_history_data;
|
||||
uint64_t ray_history_addr;
|
||||
uint32_t ray_history_buffer_size;
|
||||
uint32_t ray_history_resolution_scale;
|
||||
};
|
||||
|
||||
struct radv_ray_history_header {
|
||||
uint32_t offset;
|
||||
uint32_t dispatch_index;
|
||||
uint32_t submit_base_index;
|
||||
};
|
||||
|
||||
enum radv_packed_token_type {
|
||||
radv_packed_token_end_trace,
|
||||
};
|
||||
|
||||
struct radv_packed_token_header {
|
||||
uint32_t launch_index : 29;
|
||||
uint32_t hit : 1;
|
||||
uint32_t token_type : 2;
|
||||
};
|
||||
|
||||
struct radv_packed_end_trace_token {
|
||||
struct radv_packed_token_header header;
|
||||
|
||||
uint32_t accel_struct_lo;
|
||||
uint32_t accel_struct_hi;
|
||||
|
||||
uint32_t flags : 16;
|
||||
uint32_t dispatch_index : 16;
|
||||
|
||||
uint32_t sbt_offset : 4;
|
||||
uint32_t sbt_stride : 4;
|
||||
uint32_t miss_index : 16;
|
||||
uint32_t cull_mask : 8;
|
||||
|
||||
float origin[3];
|
||||
float tmin;
|
||||
float direction[3];
|
||||
float tmax;
|
||||
|
||||
uint32_t iteration_count : 16;
|
||||
uint32_t instance_count : 16;
|
||||
|
||||
uint32_t ahit_count : 16;
|
||||
uint32_t isec_count : 16;
|
||||
|
||||
uint32_t primitive_id;
|
||||
uint32_t geometry_id;
|
||||
|
||||
uint32_t instance_id : 24;
|
||||
uint32_t hit_kind : 8;
|
||||
|
||||
float t;
|
||||
};
|
||||
static_assert(sizeof(struct radv_packed_end_trace_token) == 76, "Unexpected radv_packed_end_trace_token size");
|
||||
|
||||
VkResult radv_rra_trace_init(struct radv_device *device);
|
||||
|
||||
void radv_rra_trace_clear_ray_history(VkDevice _device, struct radv_rra_trace_data *data);
|
||||
|
||||
void radv_rra_trace_finish(VkDevice vk_device, struct radv_rra_trace_data *data);
|
||||
|
||||
void radv_destroy_rra_accel_struct_data(VkDevice device, struct radv_rra_accel_struct_data *data);
|
||||
|
||||
VkResult radv_rra_dump_trace(VkQueue vk_queue, char *filename);
|
||||
|
||||
#endif /* RADV_RRA_H */
|
||||
Reference in New Issue
Block a user