libs/vkd3d-shader: Add basic shader scan functionality.

This commit is contained in:
Józef Kucia 2017-08-21 12:41:07 +02:00
parent 49a877df86
commit a90c7c5f12
2 changed files with 130 additions and 31 deletions

View File

@ -18,71 +18,160 @@
#include "vkd3d_shader_private.h"
struct vkd3d_shader_parser
{
struct vkd3d_shader_desc shader_desc;
struct vkd3d_shader_version shader_version;
void *data;
const DWORD *ptr;
};
static HRESULT vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser,
const struct vkd3d_shader_code *dxbc)
{
struct vkd3d_shader_desc *shader_desc = &parser->shader_desc;
HRESULT hr;
if (FAILED(hr = shader_extract_from_dxbc(dxbc->code, dxbc->size, shader_desc)))
{
WARN("Failed to extract shader, hr %#x.\n", hr);
return hr;
}
if (!(parser->data = shader_sm4_init(shader_desc->byte_code,
shader_desc->byte_code_size, &shader_desc->output_signature)))
{
WARN("Failed to initialize shader parser, hr %#x.\n", hr);
free_shader_desc(shader_desc);
return hr;
}
shader_sm4_read_header(parser->data, &parser->ptr, &parser->shader_version);
return S_OK;
}
static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser)
{
shader_sm4_free(parser->data);
free_shader_desc(&parser->shader_desc);
}
HRESULT vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc,
struct vkd3d_shader_code *spirv, uint32_t compiler_options,
const struct vkd3d_shader_interface *shader_interface)
{
struct vkd3d_shader_instruction instruction;
struct vkd3d_dxbc_compiler *spirv_compiler;
struct vkd3d_shader_version shader_version;
struct vkd3d_shader_desc shader_desc;
struct vkd3d_shader_instruction ins;
void *parser_data;
const DWORD *ptr;
struct vkd3d_shader_parser parser;
HRESULT hr;
bool ret;
TRACE("dxbc {%p, %zu}, spirv %p, compiler_options %#x, shader_interface %p.\n",
dxbc->code, dxbc->size, spirv, compiler_options, shader_interface);
if (FAILED(hr = shader_extract_from_dxbc(dxbc->code, dxbc->size, &shader_desc)))
{
WARN("Failed to extract shader, hr %#x.\n", hr);
if (FAILED(hr = vkd3d_shader_parser_init(&parser, dxbc)))
return hr;
}
if (!(parser_data = shader_sm4_init(shader_desc.byte_code, shader_desc.byte_code_size,
&shader_desc.output_signature)))
{
WARN("Failed to initialize shader parser, hr %#x.\n", hr);
free_shader_desc(&shader_desc);
return hr;
}
shader_sm4_read_header(parser_data, &ptr, &shader_version);
if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&shader_version, &shader_desc,
compiler_options, shader_interface)))
if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version,
&parser.shader_desc, compiler_options, shader_interface)))
{
ERR("Failed to create DXBC compiler.\n");
shader_sm4_free(parser_data);
free_shader_desc(&shader_desc);
vkd3d_shader_parser_destroy(&parser);
return hr;
}
while (!shader_sm4_is_end(parser_data, &ptr))
while (!shader_sm4_is_end(parser.data, &parser.ptr))
{
shader_sm4_read_instruction(parser_data, &ptr, &ins);
shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction);
if (ins.handler_idx == VKD3DSIH_TABLE_SIZE)
if (instruction.handler_idx == VKD3DSIH_TABLE_SIZE)
{
WARN("Encountered unrecognized or invalid instruction.\n");
shader_sm4_free(parser_data);
free_shader_desc(&shader_desc);
vkd3d_dxbc_compiler_destroy(spirv_compiler);
vkd3d_shader_parser_destroy(&parser);
return E_FAIL;
}
vkd3d_dxbc_compiler_handle_instruction(spirv_compiler, &ins);
vkd3d_dxbc_compiler_handle_instruction(spirv_compiler, &instruction);
}
ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, spirv);
vkd3d_dxbc_compiler_destroy(spirv_compiler);
shader_sm4_free(parser_data);
free_shader_desc(&shader_desc);
vkd3d_shader_parser_destroy(&parser);
return ret ? S_OK : E_FAIL;
}
static bool vkd3d_shader_instruction_is_uav_read(const struct vkd3d_shader_instruction *instruction)
{
enum VKD3D_SHADER_INSTRUCTION_HANDLER handler_idx = instruction->handler_idx;
return (VKD3DSIH_ATOMIC_AND <= handler_idx && handler_idx <= VKD3DSIH_ATOMIC_XOR)
|| (VKD3DSIH_IMM_ATOMIC_AND <= handler_idx && handler_idx <= VKD3DSIH_IMM_ATOMIC_XOR)
|| handler_idx == VKD3DSIH_LD_UAV_TYPED
|| (handler_idx == VKD3DSIH_LD_RAW && instruction->src[1].reg.type == VKD3DSPR_UAV)
|| (handler_idx == VKD3DSIH_LD_STRUCTURED && instruction->src[2].reg.type == VKD3DSPR_UAV);
}
static void vkd3d_shader_scan_record_uav_read(struct vkd3d_shader_scan_info *scan_info,
const struct vkd3d_shader_register *reg)
{
assert(reg->idx[0].offset < MAX_UNORDERED_ACCESS_VIEWS);
scan_info->uav_read_mask |= 1u << reg->idx[0].offset;
}
static void vkd3d_shader_scan_handle_instruction(struct vkd3d_shader_scan_info *scan_info,
const struct vkd3d_shader_instruction *instruction)
{
unsigned int i;
if (vkd3d_shader_instruction_is_uav_read(instruction))
{
for (i = 0; i < instruction->dst_count; ++i)
{
if (instruction->dst[i].reg.type == VKD3DSPR_UAV)
vkd3d_shader_scan_record_uav_read(scan_info, &instruction->dst[i].reg);
}
for (i = 0; i < instruction->src_count; ++i)
{
if (instruction->src[i].reg.type == VKD3DSPR_UAV)
vkd3d_shader_scan_record_uav_read(scan_info, &instruction->src[i].reg);
}
}
}
HRESULT vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc,
struct vkd3d_shader_scan_info *scan_info)
{
struct vkd3d_shader_instruction instruction;
struct vkd3d_shader_parser parser;
HRESULT hr;
TRACE("dxbc {%p, %zu}, scan_info %p.\n", dxbc->code, dxbc->size, scan_info);
if (FAILED(hr = vkd3d_shader_parser_init(&parser, dxbc)))
return hr;
memset(scan_info, 0, sizeof(*scan_info));
while (!shader_sm4_is_end(parser.data, &parser.ptr))
{
shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction);
if (instruction.handler_idx == VKD3DSIH_TABLE_SIZE)
{
WARN("Encountered unrecognized or invalid instruction.\n");
vkd3d_shader_parser_destroy(&parser);
return E_FAIL;
}
vkd3d_shader_scan_handle_instruction(scan_info, &instruction);
}
vkd3d_shader_parser_destroy(&parser);
return S_OK;
}
void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *shader_code)
{
if (!shader_code)

View File

@ -819,6 +819,16 @@ struct vkd3d_shader_signature_element *shader_find_signature_element(const struc
const char *semantic_name, unsigned int semantic_idx, unsigned int stream_idx) DECLSPEC_HIDDEN;
void free_shader_desc(struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN;
#define MAX_UNORDERED_ACCESS_VIEWS 8
struct vkd3d_shader_scan_info
{
unsigned int uav_read_mask : MAX_UNORDERED_ACCESS_VIEWS;
};
HRESULT vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc,
struct vkd3d_shader_scan_info *scan_info) DECLSPEC_HIDDEN;
struct vkd3d_dxbc_compiler;
struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version,