Mesa (master): nir/search: Support 8 and 16-bit constants in match_value

[Jason Ekstrand]

Module: Mesa
Branch: master
Commit: 99ee40fb544ce17489fc2511d44ce1026a5ec70c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=99ee40fb544ce17489fc2511d44ce1026a5ec70c

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Wed Feb 28 13:15:04 2018 -0800

nir/search: Support 8 and 16-bit constants in match_value

Reviewed-by: Jose Maria Casanova Crespo <jmcasanova at igalia.com>

---

 src/compiler/nir/nir_search.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/compiler/nir/nir_search.c b/src/compiler/nir/nir_search.c
index dec56fee74..c7c52ae320 100644
--- a/src/compiler/nir/nir_search.c
+++ b/src/compiler/nir/nir_search.c
@@ -27,6 +27,7 @@
 
 #include <inttypes.h>
 #include "nir_search.h"
+#include "util/half_float.h"
 
 struct match_state {
    bool inexact_match;
@@ -194,6 +195,9 @@ match_value(const nir_search_value *value, nir_alu_instr *instr, unsigned src,
          for (unsigned i = 0; i < num_components; ++i) {
             double val;
             switch (load->def.bit_size) {
+            case 16:
+               val = _mesa_half_to_float(load->value.u16[new_swizzle[i]]);
+               break;
             case 32:
                val = load->value.f32[new_swizzle[i]];
                break;
@@ -213,6 +217,22 @@ match_value(const nir_search_value *value, nir_alu_instr *instr, unsigned src,
       case nir_type_uint:
       case nir_type_bool32:
          switch (load->def.bit_size) {
+         case 8:
+            for (unsigned i = 0; i < num_components; ++i) {
+               if (load->value.u8[new_swizzle[i]] !=
+                   (uint8_t)const_val->data.u)
+                  return false;
+            }
+            return true;
+
+         case 16:
+            for (unsigned i = 0; i < num_components; ++i) {
+               if (load->value.u16[new_swizzle[i]] !=
+                   (uint16_t)const_val->data.u)
+                  return false;
+            }
+            return true;
+
          case 32:
             for (unsigned i = 0; i < num_components; ++i) {
                if (load->value.u32[new_swizzle[i]] !=