nir: Add tests for nir_extract_bits

diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build
index 56bab469b782fe9a94eed602e0a5e408f448b103..b114623d3b3eea47b2646d1f0ef80a21299cd7df 100644 (file)
--- a/src/compiler/nir/meson.build
+++ b/src/compiler/nir/meson.build
@@ -268,6 +268,18 @@ idep_nir = declare_dependency(
 nir_algebraic_py = files('nir_algebraic.py')
 
 if with_tests
+  test(
+    'nir_builder',
+    executable(
+      'nir_builder_test',
+      files('tests/builder_tests.cpp'),
+      cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
+      include_directories : [inc_common],
+      dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
+    ),
+    suite : ['compiler', 'nir'],
+  )
+
   test(
     'nir_control_flow',
     executable(

diff --git a/src/compiler/nir/tests/builder_tests.cpp b/src/compiler/nir/tests/builder_tests.cpp
new file mode 100644 (file)
index 0000000..40f8bee
--- /dev/null
+++ b/src/compiler/nir/tests/builder_tests.cpp
@@ -0,0 +1,155 @@
+/*
+ * Copyright © 2018 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include <gtest/gtest.h>
+
+#include "nir.h"
+#include "nir_builder.h"
+
+namespace {
+
+class nir_builder_test : public ::testing::Test {
+private:
+   const glsl_type *type_for_def(nir_ssa_def *def)
+   {
+      switch (def->bit_size) {
+      case 8:  return glsl_type::u8vec(def->num_components);
+      case 16: return glsl_type::u16vec(def->num_components);
+      case 32: return glsl_type::uvec(def->num_components);
+      case 64: return glsl_type::u64vec(def->num_components);
+      default: unreachable("Invalid bit size");
+      }
+   }
+
+protected:
+   nir_builder_test();
+   ~nir_builder_test();
+
+   void store_test_val(nir_ssa_def *val)
+   {
+      nir_variable *var = nir_variable_create(b->shader, nir_var_mem_ssbo,
+                                              type_for_def(val), NULL);
+      nir_intrinsic_instr *store =
+         nir_intrinsic_instr_create(b->shader, nir_intrinsic_store_deref);
+      store->num_components = val->num_components;
+      store->src[0] = nir_src_for_ssa(&nir_build_deref_var(b, var)->dest.ssa);
+      store->src[1] = nir_src_for_ssa(val);
+      nir_intrinsic_set_write_mask(store, ((1 << val->num_components) - 1));
+      nir_builder_instr_insert(b, &store->instr);
+
+      stores.push_back(store);
+   }
+
+   nir_ssa_def *test_val(unsigned idx)
+   {
+      return stores[idx]->src[1].ssa;
+   }
+
+   std::vector<nir_intrinsic_instr *> stores;
+
+   void *mem_ctx;
+   void *lin_ctx;
+
+   nir_builder *b;
+};
+
+nir_builder_test::nir_builder_test()
+{
+   glsl_type_singleton_init_or_ref();
+
+   mem_ctx = ralloc_context(NULL);
+   lin_ctx = linear_alloc_parent(mem_ctx, 0);
+   static const nir_shader_compiler_options options = { };
+   b = rzalloc(mem_ctx, nir_builder);
+   nir_builder_init_simple_shader(b, mem_ctx, MESA_SHADER_COMPUTE, &options);
+}
+
+nir_builder_test::~nir_builder_test()
+{
+   if (HasFailure()) {
+      printf("\nShader from the failed test:\n\n");
+      nir_print_shader(b->shader, stdout);
+   }
+
+   ralloc_free(mem_ctx);
+
+   glsl_type_singleton_decref();
+}
+
+/* Allow grouping the tests while still sharing the helpers. */
+class nir_extract_bits_test : public nir_builder_test {};
+
+} // namespace
+
+// TODO: Re-enable this once we get vec8 support in NIR
+TEST_F(nir_extract_bits_test, DISABLED_unaligned8)
+{
+   nir_ssa_def *srcs[] = {
+      nir_imm_int(b, 0x03020100),
+      nir_imm_ivec2(b, 0x07060504, 0x0b0a0908),
+   };
+
+   store_test_val(nir_extract_bits(b, srcs, 2, 24, 1, 64));
+
+   NIR_PASS_V(b->shader, nir_opt_constant_folding);
+
+   nir_src val = nir_src_for_ssa(test_val(0));
+
+   ASSERT_EQ(nir_src_as_uint(val), 0x0a09080706050403);
+}
+
+TEST_F(nir_extract_bits_test, unaligned16_disabled)
+{
+   nir_ssa_def *srcs[] = {
+      nir_imm_int(b, 0x03020100),
+      nir_imm_ivec2(b, 0x07060504, 0x0b0a0908),
+   };
+
+   store_test_val(nir_extract_bits(b, srcs, 2, 16, 1, 64));
+
+   NIR_PASS_V(b->shader, nir_opt_constant_folding);
+
+   nir_src val = nir_src_for_ssa(test_val(0));
+
+   ASSERT_EQ(nir_src_as_uint(val), 0x0908070605040302);
+}
+
+TEST_F(nir_extract_bits_test, mixed_bit_sizes)
+{
+   nir_ssa_def *srcs[] = {
+      nir_imm_int(b, 0x03020100),
+      nir_imm_intN_t(b, 0x04, 8),
+      nir_imm_intN_t(b, 0x08070605, 32),
+      nir_vec2(b, nir_imm_intN_t(b, 0x0a09, 16),
+                  nir_imm_intN_t(b, 0x0c0b, 16)),
+   };
+
+   store_test_val(nir_extract_bits(b, srcs, 4, 24, 2, 32));
+
+   NIR_PASS_V(b->shader, nir_opt_constant_folding);
+
+   nir_src val = nir_src_for_ssa(test_val(0));
+
+   ASSERT_EQ(nir_src_comp_as_uint(val, 0), 0x06050403);
+   ASSERT_EQ(nir_src_comp_as_uint(val, 1), 0x0a090807);
+}