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

nir: Refactor nir_src_as_* constant functions

Browse Source 
Now that we have the nir_const_value_as_* helpers, every one of these
functions is effectively the same except for the suffix they use so we
can easily define them with a repeated macro.  This also means that
they're inline and the fact that the nir_src is being passed by-value
should no longer really hurt anything.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Jason Ekstrand
2019-06-25 20:33:46 -05:00
parent ce5581e23e
commit 3acddc733f
2 changed files with 28 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/compiler/nir/nir.c
View File

@@ -1239,98 +1239,6 @@ nir_const_value_as_float(nir_const_value value, unsigned bit_size)
}
}
int64_t
nir_src_comp_as_int(nir_src src, unsigned comp)
{
assert(nir_src_is_const(src));
nir_load_const_instr *load = nir_instr_as_load_const(src.ssa->parent_instr);
assert(comp < load->def.num_components);
switch (load->def.bit_size) {
/* int1_t uses 0/-1 convention */
case 1: return -(int)load->value[comp].b;
case 8: return load->value[comp].i8;
case 16: return load->value[comp].i16;
case 32: return load->value[comp].i32;
case 64: return load->value[comp].i64;
default:
unreachable("Invalid bit size");
}
}
uint64_t
nir_src_comp_as_uint(nir_src src, unsigned comp)
{
assert(nir_src_is_const(src));
nir_load_const_instr *load = nir_instr_as_load_const(src.ssa->parent_instr);
assert(comp < load->def.num_components);
switch (load->def.bit_size) {
case 1: return load->value[comp].b;
case 8: return load->value[comp].u8;
case 16: return load->value[comp].u16;
case 32: return load->value[comp].u32;
case 64: return load->value[comp].u64;
default:
unreachable("Invalid bit size");
}
}
bool
nir_src_comp_as_bool(nir_src src, unsigned comp)
{
int64_t i = nir_src_comp_as_int(src, comp);
/* Booleans of any size use 0/-1 convention */
assert(i == 0 || i == -1);
return i;
}
double
nir_src_comp_as_float(nir_src src, unsigned comp)
{
assert(nir_src_is_const(src));
nir_load_const_instr *load = nir_instr_as_load_const(src.ssa->parent_instr);
assert(comp < load->def.num_components);
switch (load->def.bit_size) {
case 16: return _mesa_half_to_float(load->value[comp].u16);
case 32: return load->value[comp].f32;
case 64: return load->value[comp].f64;
default:
unreachable("Invalid bit size");
}
}
int64_t
nir_src_as_int(nir_src src)
{
assert(nir_src_num_components(src) == 1);
return nir_src_comp_as_int(src, 0);
}
uint64_t
nir_src_as_uint(nir_src src)
{
assert(nir_src_num_components(src) == 1);
return nir_src_comp_as_uint(src, 0);
}
bool
nir_src_as_bool(nir_src src)
{
assert(nir_src_num_components(src) == 1);
return nir_src_comp_as_bool(src, 0);
}
double
nir_src_as_float(nir_src src)
{
assert(nir_src_num_components(src) == 1);
return nir_src_comp_as_float(src, 0);
}
nir_const_value *
nir_src_as_const_value(nir_src src)
{

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

@@ -807,15 +807,6 @@ nir_src_is_const(nir_src src)
src.ssa->parent_instr->type == nir_instr_type_load_const;
}
int64_t nir_src_as_int(nir_src src);
uint64_t nir_src_as_uint(nir_src src);
bool nir_src_as_bool(nir_src src);
double nir_src_as_float(nir_src src);
int64_t nir_src_comp_as_int(nir_src src, unsigned component);
uint64_t nir_src_comp_as_uint(nir_src src, unsigned component);
bool nir_src_comp_as_bool(nir_src src, unsigned component);
double nir_src_comp_as_float(nir_src src, unsigned component);
static inline unsigned
nir_dest_bit_size(nir_dest dest)
{
@@ -1983,6 +1974,34 @@ NIR_DEFINE_CAST(nir_instr_as_parallel_copy, nir_instr,
nir_parallel_copy_instr, instr,
type, nir_instr_type_parallel_copy)
#define NIR_DEFINE_SRC_AS_CONST(type, suffix) \
static inline type \
nir_src_comp_as_##suffix(nir_src src, unsigned comp) \
{ \
assert(nir_src_is_const(src)); \
nir_load_const_instr *load = \
nir_instr_as_load_const(src.ssa->parent_instr); \
assert(comp < load->def.num_components); \
return nir_const_value_as_##suffix(load->value[comp], \
load->def.bit_size); \
} \
\
static inline type \
nir_src_as_##suffix(nir_src src) \
{ \
assert(nir_src_num_components(src) == 1); \
return nir_src_comp_as_##suffix(src, 0); \
}
NIR_DEFINE_SRC_AS_CONST(int64_t, int)
NIR_DEFINE_SRC_AS_CONST(uint64_t, uint)
NIR_DEFINE_SRC_AS_CONST(bool, bool)
NIR_DEFINE_SRC_AS_CONST(double, float)
#undef NIR_DEFINE_SRC_AS_CONST
/*
* Control flow
*