intel/fs: Add support for a new load_reloc_const intrinsic

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6244>
This commit is contained in:
Jason Ekstrand
2020-08-08 13:56:16 -05:00
committed by Marge Bot
parent 8d8a3815ef
commit 91becd84ae
8 changed files with 37 additions and 0 deletions

View File

@@ -1386,6 +1386,18 @@ nir_load_param(nir_builder *build, uint32_t param_idx)
return &load->dest.ssa; return &load->dest.ssa;
} }
static inline nir_ssa_def *
nir_load_reloc_const_intel(nir_builder *b, uint32_t id)
{
nir_intrinsic_instr *load =
nir_intrinsic_instr_create(b->shader,
nir_intrinsic_load_reloc_const_intel);
nir_intrinsic_set_param_idx(load, id);
nir_ssa_dest_init(&load->instr, &load->dest, 1, 32, NULL);
nir_builder_instr_insert(b, &load->instr);
return &load->dest.ssa;
}
#include "nir_builder_opcodes.h" #include "nir_builder_opcodes.h"
static inline nir_ssa_def * static inline nir_ssa_def *

View File

@@ -942,3 +942,7 @@ image("store_raw_intel", src_comp=[1, 0])
# Number of data items being operated on for a SIMD program. # Number of data items being operated on for a SIMD program.
system_value("simd_width_intel", 1) system_value("simd_width_intel", 1)
# Load a relocatable 32-bit value
intrinsic("load_reloc_const_intel", dest_comp=1, bit_sizes=[32],
indices=[PARAM_IDX], flags=[CAN_ELIMINATE, CAN_REORDER])

View File

@@ -768,6 +768,9 @@ enum opcode {
*/ */
SHADER_OPCODE_MOV_INDIRECT, SHADER_OPCODE_MOV_INDIRECT,
/** Fills out a relocatable immediate */
SHADER_OPCODE_MOV_RELOC_IMM,
VEC4_OPCODE_URB_READ, VEC4_OPCODE_URB_READ,
TCS_OPCODE_GET_INSTANCE_ID, TCS_OPCODE_GET_INSTANCE_ID,
TCS_OPCODE_URB_WRITE, TCS_OPCODE_URB_WRITE,

View File

@@ -6350,6 +6350,7 @@ get_lowered_simd_width(const struct gen_device_info *devinfo,
case FS_OPCODE_PACK: case FS_OPCODE_PACK:
case SHADER_OPCODE_SEL_EXEC: case SHADER_OPCODE_SEL_EXEC:
case SHADER_OPCODE_CLUSTER_BROADCAST: case SHADER_OPCODE_CLUSTER_BROADCAST:
case SHADER_OPCODE_MOV_RELOC_IMM:
return get_fpu_lowered_simd_width(devinfo, inst); return get_fpu_lowered_simd_width(devinfo, inst);
case BRW_OPCODE_CMP: { case BRW_OPCODE_CMP: {

View File

@@ -2230,6 +2230,11 @@ fs_generator::generate_code(const cfg_t *cfg, int dispatch_width,
generate_mov_indirect(inst, dst, src[0], src[1]); generate_mov_indirect(inst, dst, src[0], src[1]);
break; break;
case SHADER_OPCODE_MOV_RELOC_IMM:
assert(src[0].file == BRW_IMMEDIATE_VALUE);
brw_MOV_reloc_imm(p, dst, dst.type, src[0].ud);
break;
case SHADER_OPCODE_URB_READ_SIMD8: case SHADER_OPCODE_URB_READ_SIMD8:
case SHADER_OPCODE_URB_READ_SIMD8_PER_SLOT: case SHADER_OPCODE_URB_READ_SIMD8_PER_SLOT:
generate_urb_read(inst, dst, src[0]); generate_urb_read(inst, dst, src[0]);
@@ -2608,5 +2613,7 @@ fs_generator::add_const_data(void *data, unsigned size)
const unsigned * const unsigned *
fs_generator::get_assembly() fs_generator::get_assembly()
{ {
prog_data->relocs = brw_get_shader_relocs(p, &prog_data->num_relocs);
return brw_get_program(p, &prog_data->program_size); return brw_get_program(p, &prog_data->program_size);
} }

View File

@@ -4396,6 +4396,13 @@ fs_visitor::nir_emit_intrinsic(const fs_builder &bld, nir_intrinsic_instr *instr
bld.MOV(retype(dest, BRW_REGISTER_TYPE_D), brw_imm_d(1)); bld.MOV(retype(dest, BRW_REGISTER_TYPE_D), brw_imm_d(1));
break; break;
case nir_intrinsic_load_reloc_const_intel: {
uint32_t id = nir_intrinsic_param_idx(instr);
bld.emit(SHADER_OPCODE_MOV_RELOC_IMM,
dest, brw_imm_ud(id));
break;
}
case nir_intrinsic_load_uniform: { case nir_intrinsic_load_uniform: {
/* Offsets are in bytes but they should always aligned to /* Offsets are in bytes but they should always aligned to
* the type size * the type size

View File

@@ -376,6 +376,7 @@ namespace {
case BRW_OPCODE_CMP: case BRW_OPCODE_CMP:
case BRW_OPCODE_ADD: case BRW_OPCODE_ADD:
case BRW_OPCODE_MUL: case BRW_OPCODE_MUL:
case SHADER_OPCODE_MOV_RELOC_IMM:
if (devinfo->gen >= 11) { if (devinfo->gen >= 11) {
return calculate_desc(info, unit_fpu, 0, 2, 0, 0, 2, return calculate_desc(info, unit_fpu, 0, 2, 0, 0, 2,
0, 10, 6, 14, 0, 0); 0, 10, 6, 14, 0, 0);

View File

@@ -502,6 +502,8 @@ brw_instruction_name(const struct gen_device_info *devinfo, enum opcode op)
return "usub_sat"; return "usub_sat";
case SHADER_OPCODE_MOV_INDIRECT: case SHADER_OPCODE_MOV_INDIRECT:
return "mov_indirect"; return "mov_indirect";
case SHADER_OPCODE_MOV_RELOC_IMM:
return "mov_reloc_imm";
case VEC4_OPCODE_URB_READ: case VEC4_OPCODE_URB_READ:
return "urb_read"; return "urb_read";