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

nir/lower_io: Add support for global scratch addressing

Browse Source 
This provides an alternate lowering for scratch in which it uses global
reads/writes and bases scratch addresses on a base pointer.

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5927>
This commit is contained in:
Jason Ekstrand
2020-07-14 13:32:19 -05:00
committed by Marge Bot
parent 4815ae51d7
commit c30824adc0
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/nir/nir_intrinsics.py
View File

@@ -608,6 +608,9 @@ system_value("global_invocation_index", 1, bit_sizes=[32, 64])
system_value("work_dim", 1) system_value("work_dim", 1)
system_value("line_width", 1) system_value("line_width", 1)
system_value("aa_line_width", 1) system_value("aa_line_width", 1)
# BASE=0 for global/shader, BASE=1 for local/function
system_value("scratch_base_ptr", 0, bit_sizes=[32,64], indices=[BASE])
# Driver-specific viewport scale/offset parameters. # Driver-specific viewport scale/offset parameters.
# #
# VC4 and V3D need to emit a scaled version of the position in the vertex # VC4 and V3D need to emit a scaled version of the position in the vertex

22
src/compiler/nir/nir_lower_io.c
View File

@@ -854,8 +854,12 @@ build_explicit_io_load(nir_builder *b, nir_intrinsic_instr *intrin,
break; break;
case nir_var_shader_temp: case nir_var_shader_temp:
case nir_var_function_temp: case nir_var_function_temp:
assert(addr_format_is_offset(addr_format)); if (addr_format_is_offset(addr_format)) {
op = nir_intrinsic_load_scratch; op = nir_intrinsic_load_scratch;
} else {
assert(addr_format_is_global(addr_format));
op = nir_intrinsic_load_global;
}
break; break;
default: default:
unreachable("Unsupported explicit IO variable mode"); unreachable("Unsupported explicit IO variable mode");
@@ -956,8 +960,12 @@ build_explicit_io_store(nir_builder *b, nir_intrinsic_instr *intrin,
break; break;
case nir_var_shader_temp: case nir_var_shader_temp:
case nir_var_function_temp: case nir_var_function_temp:
assert(addr_format_is_offset(addr_format)); if (addr_format_is_offset(addr_format)) {
op = nir_intrinsic_store_scratch; op = nir_intrinsic_store_scratch;
} else {
assert(addr_format_is_global(addr_format));
op = nir_intrinsic_store_global;
}
break; break;
default: default:
unreachable("Unsupported explicit IO variable mode"); unreachable("Unsupported explicit IO variable mode");
@@ -1100,8 +1108,18 @@ nir_explicit_io_address_from_deref(nir_builder *b, nir_deref_instr *deref,
case nir_deref_type_var: case nir_deref_type_var:
assert(deref->mode & (nir_var_shader_in | nir_var_mem_shared | assert(deref->mode & (nir_var_shader_in | nir_var_mem_shared |
nir_var_shader_temp | nir_var_function_temp)); nir_var_shader_temp | nir_var_function_temp));
if (addr_format_is_global(addr_format)) {
assert(nir_var_shader_temp | nir_var_function_temp);
base_addr =
nir_load_scratch_base_ptr(b, !(deref->mode & nir_var_shader_temp),
nir_address_format_num_components(addr_format),
nir_address_format_bit_size(addr_format));
return build_addr_iadd_imm(b, base_addr, addr_format,
deref->var->data.driver_location);
} else {
return nir_imm_intN_t(b, deref->var->data.driver_location, return nir_imm_intN_t(b, deref->var->data.driver_location,
deref->dest.ssa.bit_size); deref->dest.ssa.bit_size);
}
case nir_deref_type_array: { case nir_deref_type_array: {
nir_deref_instr *parent = nir_deref_instr_parent(deref); nir_deref_instr *parent = nir_deref_instr_parent(deref);