Re: [Mesa-dev] [PATCH 04/50] glsl: Add "built-in" functions to do eq(fp64, fp64)

2018-03-14 Thread Dave Airlie
> Is a mix really warranted here? Could just use
> return result && !(isaNaN || isbNaN) (since the other mix part is just
> false I think mix is a bit overkill, albeit it might not really make a
> difference).
> Actually I think it should be simplified, you don't need to check both
> vars for NaN (because if just one is NaN, the comparison(s) will be
> false anyway).
> so just return result && !isaNaN

This saves 2 instructions, granted that is a minor drop in a very large
ocean, but seems fine to just do it.

Dave.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH 04/50] glsl: Add "built-in" functions to do eq(fp64, fp64)

2018-03-13 Thread Roland Scheidegger
Am 13.03.2018 um 05:24 schrieb Dave Airlie:
> From: Elie Tournier 
> 
> Signed-off-by: Elie Tournier 
> ---
>  src/compiler/glsl/builtin_float64.h | 104 
> 
>  src/compiler/glsl/builtin_functions.cpp |   4 ++
>  src/compiler/glsl/builtin_functions.h   |   3 +
>  src/compiler/glsl/float64.glsl  |  44 ++
>  src/compiler/glsl/glcpp/glcpp-parse.y   |   1 +
>  5 files changed, 156 insertions(+)
> 
> diff --git a/src/compiler/glsl/builtin_float64.h 
> b/src/compiler/glsl/builtin_float64.h
> index 8546048..2340c48 100644
> --- a/src/compiler/glsl/builtin_float64.h
> +++ b/src/compiler/glsl/builtin_float64.h
> @@ -96,3 +96,107 @@ fsign64(void *mem_ctx, builtin_available_predicate avail)
> sig->replace_parameters(_parameters);
> return sig;
>  }
> +ir_function_signature *
> +extractFloat64FracLo(void *mem_ctx, builtin_available_predicate avail)
> +{
> +   ir_function_signature *const sig =
> +  new(mem_ctx) ir_function_signature(glsl_type::uint_type, avail);
> +   ir_factory body(>body, mem_ctx);
> +   sig->is_defined = true;
> +
> +   exec_list sig_parameters;
> +
> +   ir_variable *const r0024 = new(mem_ctx) 
> ir_variable(glsl_type::uvec2_type, "a", ir_var_function_in);
> +   sig_parameters.push_tail(r0024);
> +   ir_swizzle *const r0025 = swizzle_x(r0024);
> +   body.emit(ret(r0025));
> +
> +   sig->replace_parameters(_parameters);
> +   return sig;
> +}
> +ir_function_signature *
> +extractFloat64FracHi(void *mem_ctx, builtin_available_predicate avail)
> +{
> +   ir_function_signature *const sig =
> +  new(mem_ctx) ir_function_signature(glsl_type::uint_type, avail);
> +   ir_factory body(>body, mem_ctx);
> +   sig->is_defined = true;
> +
> +   exec_list sig_parameters;
> +
> +   ir_variable *const r0026 = new(mem_ctx) 
> ir_variable(glsl_type::uvec2_type, "a", ir_var_function_in);
> +   sig_parameters.push_tail(r0026);
> +   ir_expression *const r0027 = bit_and(swizzle_y(r0026), 
> body.constant(1048575u));
> +   body.emit(ret(r0027));
> +
> +   sig->replace_parameters(_parameters);
> +   return sig;
> +}
> +ir_function_signature *
> +extractFloat64Exp(void *mem_ctx, builtin_available_predicate avail)
> +{
> +   ir_function_signature *const sig =
> +  new(mem_ctx) ir_function_signature(glsl_type::int_type, avail);
> +   ir_factory body(>body, mem_ctx);
> +   sig->is_defined = true;
> +
> +   exec_list sig_parameters;
> +
> +   ir_variable *const r0028 = new(mem_ctx) 
> ir_variable(glsl_type::uvec2_type, "a", ir_var_function_in);
> +   sig_parameters.push_tail(r0028);
> +   ir_expression *const r0029 = rshift(swizzle_y(r0028), 
> body.constant(int(20)));
> +   ir_expression *const r002A = bit_and(r0029, body.constant(2047u));
> +   ir_expression *const r002B = expr(ir_unop_u2i, r002A);
> +   body.emit(ret(r002B));
> +
> +   sig->replace_parameters(_parameters);
> +   return sig;
> +}
> +ir_function_signature *
> +feq64(void *mem_ctx, builtin_available_predicate avail)
> +{
> +   ir_function_signature *const sig =
> +  new(mem_ctx) ir_function_signature(glsl_type::bool_type, avail);
> +   ir_factory body(>body, mem_ctx);
> +   sig->is_defined = true;
> +
> +   exec_list sig_parameters;
> +
> +   ir_variable *const r002C = new(mem_ctx) 
> ir_variable(glsl_type::uvec2_type, "a", ir_var_function_in);
> +   sig_parameters.push_tail(r002C);
> +   ir_variable *const r002D = new(mem_ctx) 
> ir_variable(glsl_type::uvec2_type, "b", ir_var_function_in);
> +   sig_parameters.push_tail(r002D);
> +   ir_variable *const r002E = body.make_temp(glsl_type::bool_type, 
> "mix_retval");
> +   ir_expression *const r002F = rshift(swizzle_y(r002C), 
> body.constant(int(20)));
> +   ir_expression *const r0030 = bit_and(r002F, body.constant(2047u));
> +   ir_expression *const r0031 = expr(ir_unop_u2i, r0030);
> +   ir_expression *const r0032 = equal(r0031, body.constant(int(2047)));
> +   ir_expression *const r0033 = bit_and(swizzle_y(r002C), 
> body.constant(1048575u));
> +   ir_expression *const r0034 = bit_or(r0033, swizzle_x(r002C));
> +   ir_expression *const r0035 = nequal(r0034, body.constant(0u));
> +   ir_expression *const r0036 = logic_and(r0032, r0035);
> +   ir_expression *const r0037 = rshift(swizzle_y(r002D), 
> body.constant(int(20)));
> +   ir_expression *const r0038 = bit_and(r0037, body.constant(2047u));
> +   ir_expression *const r0039 = expr(ir_unop_u2i, r0038);
> +   ir_expression *const r003A = equal(r0039, body.constant(int(2047)));
> +   ir_expression *const r003B = bit_and(swizzle_y(r002D), 
> body.constant(1048575u));
> +   ir_expression *const r003C = bit_or(r003B, swizzle_x(r002D));
> +   ir_expression *const r003D = nequal(r003C, body.constant(0u));
> +   ir_expression *const r003E = logic_and(r003A, r003D);
> +   ir_expression *const r003F = logic_or(r0036, r003E);
> +   ir_expression *const r0040 = equal(swizzle_x(r002C), swizzle_x(r002D));
> +   ir_expression *const r0041 

[Mesa-dev] [PATCH 04/50] glsl: Add "built-in" functions to do eq(fp64, fp64)

2018-03-12 Thread Dave Airlie
From: Elie Tournier 

Signed-off-by: Elie Tournier 
---
 src/compiler/glsl/builtin_float64.h | 104 
 src/compiler/glsl/builtin_functions.cpp |   4 ++
 src/compiler/glsl/builtin_functions.h   |   3 +
 src/compiler/glsl/float64.glsl  |  44 ++
 src/compiler/glsl/glcpp/glcpp-parse.y   |   1 +
 5 files changed, 156 insertions(+)

diff --git a/src/compiler/glsl/builtin_float64.h 
b/src/compiler/glsl/builtin_float64.h
index 8546048..2340c48 100644
--- a/src/compiler/glsl/builtin_float64.h
+++ b/src/compiler/glsl/builtin_float64.h
@@ -96,3 +96,107 @@ fsign64(void *mem_ctx, builtin_available_predicate avail)
sig->replace_parameters(_parameters);
return sig;
 }
+ir_function_signature *
+extractFloat64FracLo(void *mem_ctx, builtin_available_predicate avail)
+{
+   ir_function_signature *const sig =
+  new(mem_ctx) ir_function_signature(glsl_type::uint_type, avail);
+   ir_factory body(>body, mem_ctx);
+   sig->is_defined = true;
+
+   exec_list sig_parameters;
+
+   ir_variable *const r0024 = new(mem_ctx) ir_variable(glsl_type::uvec2_type, 
"a", ir_var_function_in);
+   sig_parameters.push_tail(r0024);
+   ir_swizzle *const r0025 = swizzle_x(r0024);
+   body.emit(ret(r0025));
+
+   sig->replace_parameters(_parameters);
+   return sig;
+}
+ir_function_signature *
+extractFloat64FracHi(void *mem_ctx, builtin_available_predicate avail)
+{
+   ir_function_signature *const sig =
+  new(mem_ctx) ir_function_signature(glsl_type::uint_type, avail);
+   ir_factory body(>body, mem_ctx);
+   sig->is_defined = true;
+
+   exec_list sig_parameters;
+
+   ir_variable *const r0026 = new(mem_ctx) ir_variable(glsl_type::uvec2_type, 
"a", ir_var_function_in);
+   sig_parameters.push_tail(r0026);
+   ir_expression *const r0027 = bit_and(swizzle_y(r0026), 
body.constant(1048575u));
+   body.emit(ret(r0027));
+
+   sig->replace_parameters(_parameters);
+   return sig;
+}
+ir_function_signature *
+extractFloat64Exp(void *mem_ctx, builtin_available_predicate avail)
+{
+   ir_function_signature *const sig =
+  new(mem_ctx) ir_function_signature(glsl_type::int_type, avail);
+   ir_factory body(>body, mem_ctx);
+   sig->is_defined = true;
+
+   exec_list sig_parameters;
+
+   ir_variable *const r0028 = new(mem_ctx) ir_variable(glsl_type::uvec2_type, 
"a", ir_var_function_in);
+   sig_parameters.push_tail(r0028);
+   ir_expression *const r0029 = rshift(swizzle_y(r0028), 
body.constant(int(20)));
+   ir_expression *const r002A = bit_and(r0029, body.constant(2047u));
+   ir_expression *const r002B = expr(ir_unop_u2i, r002A);
+   body.emit(ret(r002B));
+
+   sig->replace_parameters(_parameters);
+   return sig;
+}
+ir_function_signature *
+feq64(void *mem_ctx, builtin_available_predicate avail)
+{
+   ir_function_signature *const sig =
+  new(mem_ctx) ir_function_signature(glsl_type::bool_type, avail);
+   ir_factory body(>body, mem_ctx);
+   sig->is_defined = true;
+
+   exec_list sig_parameters;
+
+   ir_variable *const r002C = new(mem_ctx) ir_variable(glsl_type::uvec2_type, 
"a", ir_var_function_in);
+   sig_parameters.push_tail(r002C);
+   ir_variable *const r002D = new(mem_ctx) ir_variable(glsl_type::uvec2_type, 
"b", ir_var_function_in);
+   sig_parameters.push_tail(r002D);
+   ir_variable *const r002E = body.make_temp(glsl_type::bool_type, 
"mix_retval");
+   ir_expression *const r002F = rshift(swizzle_y(r002C), 
body.constant(int(20)));
+   ir_expression *const r0030 = bit_and(r002F, body.constant(2047u));
+   ir_expression *const r0031 = expr(ir_unop_u2i, r0030);
+   ir_expression *const r0032 = equal(r0031, body.constant(int(2047)));
+   ir_expression *const r0033 = bit_and(swizzle_y(r002C), 
body.constant(1048575u));
+   ir_expression *const r0034 = bit_or(r0033, swizzle_x(r002C));
+   ir_expression *const r0035 = nequal(r0034, body.constant(0u));
+   ir_expression *const r0036 = logic_and(r0032, r0035);
+   ir_expression *const r0037 = rshift(swizzle_y(r002D), 
body.constant(int(20)));
+   ir_expression *const r0038 = bit_and(r0037, body.constant(2047u));
+   ir_expression *const r0039 = expr(ir_unop_u2i, r0038);
+   ir_expression *const r003A = equal(r0039, body.constant(int(2047)));
+   ir_expression *const r003B = bit_and(swizzle_y(r002D), 
body.constant(1048575u));
+   ir_expression *const r003C = bit_or(r003B, swizzle_x(r002D));
+   ir_expression *const r003D = nequal(r003C, body.constant(0u));
+   ir_expression *const r003E = logic_and(r003A, r003D);
+   ir_expression *const r003F = logic_or(r0036, r003E);
+   ir_expression *const r0040 = equal(swizzle_x(r002C), swizzle_x(r002D));
+   ir_expression *const r0041 = equal(swizzle_y(r002C), swizzle_y(r002D));
+   ir_expression *const r0042 = equal(swizzle_x(r002C), body.constant(0u));
+   ir_expression *const r0043 = bit_or(swizzle_y(r002C), swizzle_y(r002D));
+   ir_expression *const r0044 = lshift(r0043, body.constant(int(1)));
+   ir_expression