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

nir: Add nir_address_format_logical

Browse Source 
An address format representing a purely logical addressing model.  In
this model, all deref chains must be complete from the dereference
operation to the variable.  Cast derefs are not allowed.  These
addresses will be 32-bit scalars but the format is immaterial because
you can always chase the chain.  E.g. push constants in anv.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Caio Marcelo de Oliveira Filho
2019-05-01 13:24:45 -07:00
parent 9f61aa3f75
commit bdaf41107a
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/compiler/nir/nir.h
View File

@@ -3112,6 +3112,15 @@ typedef enum {
* component is a buffer index and the second is an offset. * component is a buffer index and the second is an offset.
*/ */
nir_address_format_32bit_index_offset, nir_address_format_32bit_index_offset,
/**
* An address format representing a purely logical addressing model. In
* this model, all deref chains must be complete from the dereference
* operation to the variable. Cast derefs are not allowed. These
* addresses will be 32-bit scalars but the format is immaterial because
* you can always chase the chain.
*/
nir_address_format_logical,
} nir_address_format; } nir_address_format;
static inline unsigned static inline unsigned
@@ -3122,6 +3131,7 @@ nir_address_format_bit_size(nir_address_format addr_format)
case nir_address_format_64bit_global: return 64; case nir_address_format_64bit_global: return 64;
case nir_address_format_64bit_bounded_global: return 32; case nir_address_format_64bit_bounded_global: return 32;
case nir_address_format_32bit_index_offset: return 32; case nir_address_format_32bit_index_offset: return 32;
case nir_address_format_logical: return 32;
} }
unreachable("Invalid address format"); unreachable("Invalid address format");
} }
@@ -3134,6 +3144,7 @@ nir_address_format_num_components(nir_address_format addr_format)
case nir_address_format_64bit_global: return 1; case nir_address_format_64bit_global: return 1;
case nir_address_format_64bit_bounded_global: return 4; case nir_address_format_64bit_bounded_global: return 4;
case nir_address_format_32bit_index_offset: return 2; case nir_address_format_32bit_index_offset: return 2;
case nir_address_format_logical: return 1;
} }
unreachable("Invalid address format"); unreachable("Invalid address format");
} }

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

@@ -618,6 +618,8 @@ build_addr_iadd(nir_builder *b, nir_ssa_def *addr,
assert(addr->num_components == 2); assert(addr->num_components == 2);
return nir_vec2(b, nir_channel(b, addr, 0), return nir_vec2(b, nir_channel(b, addr, 0),
nir_iadd(b, nir_channel(b, addr, 1), offset)); nir_iadd(b, nir_channel(b, addr, 1), offset));
case nir_address_format_logical:
unreachable("Unsupported address format");
} }
unreachable("Invalid address format"); unreachable("Invalid address format");
} }
@@ -673,6 +675,7 @@ addr_to_global(nir_builder *b, nir_ssa_def *addr,
nir_u2u64(b, nir_channel(b, addr, 3))); nir_u2u64(b, nir_channel(b, addr, 3)));
case nir_address_format_32bit_index_offset: case nir_address_format_32bit_index_offset:
case nir_address_format_logical:
unreachable("Cannot get a 64-bit address with this address format"); unreachable("Cannot get a 64-bit address with this address format");
} }