nir/tests: add serializer tests

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>

diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build
index a5a3e90c8a4af6345d151bf9e1230a3ca66b5aeb..43a91769253b653f36aa2336ba786dca045ba74a 100644 (file)
--- a/src/compiler/nir/meson.build
+++ b/src/compiler/nir/meson.build
@@ -349,4 +349,16 @@ if with_tests
     ),
     suite : ['compiler', 'nir'],
   )
+
+  test(
+    'nir_serialize_test',
+    executable(
+      'nir_serialize_test',
+      files('tests/serialize_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'],
+  )
 endif

diff --git a/src/compiler/nir/tests/serialize_tests.cpp b/src/compiler/nir/tests/serialize_tests.cpp
new file mode 100644 (file)
index 0000000..1a5218a
--- /dev/null
+++ b/src/compiler/nir/tests/serialize_tests.cpp
@@ -0,0 +1,287 @@
+/*
+ * Copyright © 2019 Red Hat, Inc
+ *
+ * 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"
+#include "nir_serialize.h"
+
+namespace {
+
+class nir_serialize_test : public ::testing::TestWithParam<int> {
+protected:
+   nir_serialize_test();
+   ~nir_serialize_test();
+
+   void serialize();
+   nir_alu_instr *get_last_alu(nir_shader *);
+   void ASSERT_SWIZZLE_EQ(nir_alu_instr *, nir_alu_instr *, unsigned count, unsigned src);
+
+   void *mem_ctx;
+   nir_builder *b;
+   nir_shader *dup;
+   const nir_shader_compiler_options options;
+};
+
+nir_serialize_test::nir_serialize_test()
+:  options()
+{
+   glsl_type_singleton_init_or_ref();
+
+   mem_ctx = ralloc_context(NULL);
+
+   b = rzalloc(mem_ctx, nir_builder);
+   nir_builder_init_simple_shader(b, mem_ctx, MESA_SHADER_COMPUTE, &options);
+}
+
+nir_serialize_test::~nir_serialize_test()
+{
+   if (HasFailure()) {
+      printf("\nShader from the failed test\n\n");
+      printf("original Shader:\n");
+      nir_print_shader(b->shader, stdout);
+      printf("serialized Shader:\n");
+      nir_print_shader(dup, stdout);
+   }
+
+   ralloc_free(mem_ctx);
+
+   glsl_type_singleton_decref();
+}
+
+void
+nir_serialize_test::serialize() {
+   struct blob blob;
+   struct blob_reader reader;
+
+   blob_init(&blob);
+
+   nir_serialize(&blob, b->shader, false);
+   blob_reader_init(&reader, blob.data, blob.size);
+   nir_shader *cloned = nir_deserialize(mem_ctx, &options, &reader);
+   blob_finish(&blob);
+
+   dup = cloned;
+
+   nir_validate_shader(b->shader, "original");
+   nir_validate_shader(b->shader, "cloned");
+}
+
+nir_alu_instr *
+nir_serialize_test::get_last_alu(nir_shader *nir)
+{
+   nir_function_impl *impl = nir_shader_get_entrypoint(nir);
+   return nir_instr_as_alu(nir_block_last_instr(nir_impl_last_block(impl)));
+}
+
+void
+nir_serialize_test::ASSERT_SWIZZLE_EQ(nir_alu_instr *a, nir_alu_instr *b, unsigned c, unsigned s)
+{
+   ASSERT_EQ(memcmp(a->src[s].swizzle, b->src[s].swizzle, c), 0);
+}
+
+class nir_serialize_all_test : public nir_serialize_test {};
+class nir_serialize_all_but_one_test : public nir_serialize_test {};
+
+} // namespace
+
+INSTANTIATE_TEST_CASE_P(
+   nir_serialize_all_test,
+   nir_serialize_all_test,
+   ::testing::Values(
+#if NIR_MAX_VEC_COMPONENTS == 16
+      1, 2, 3, 4, 8, 16
+#else
+      1, 2, 3, 4
+#endif
+));
+
+INSTANTIATE_TEST_CASE_P(
+   nir_serialize_all_but_one_test,
+   nir_serialize_all_but_one_test,
+   ::testing::Values(
+#if NIR_MAX_VEC_COMPONENTS == 16
+      2, 3, 4, 8, 16
+#else
+      2, 3, 4
+#endif
+));
+
+TEST_P(nir_serialize_all_test, alu_single_value_src_swizzle)
+{
+   nir_ssa_def *zero = nir_imm_zero(b, GetParam(), 32);
+   nir_ssa_def *fmax = nir_fmax(b, zero, zero);
+
+   nir_alu_instr *fmax_alu = nir_instr_as_alu(fmax->parent_instr);
+
+   memset(fmax_alu->src[0].swizzle, GetParam() - 1, NIR_MAX_VEC_COMPONENTS);
+   memset(fmax_alu->src[1].swizzle, GetParam() - 1, NIR_MAX_VEC_COMPONENTS);
+
+   serialize();
+
+   nir_alu_instr *fmax_alu_dup = get_last_alu(dup);
+
+   ASSERT_SWIZZLE_EQ(fmax_alu, fmax_alu_dup, GetParam(), 0);
+   ASSERT_SWIZZLE_EQ(fmax_alu, fmax_alu_dup, GetParam(), 1);
+}
+
+TEST_P(nir_serialize_all_test, alu_vec)
+{
+   nir_ssa_def *undef = nir_ssa_undef(b, GetParam(), 32);
+   nir_ssa_def *undefs[] = {
+      undef, undef, undef, undef,
+      undef, undef, undef, undef,
+      undef, undef, undef, undef,
+      undef, undef, undef, undef,
+   };
+
+   nir_ssa_def *vec = nir_vec(b, undefs, GetParam());
+   nir_alu_instr *vec_alu = nir_instr_as_alu(vec->parent_instr);
+   for (int i = 0; i < GetParam(); i++)
+      vec_alu->src[i].swizzle[0] = (GetParam() - 1) - i;
+
+   serialize();
+
+   nir_alu_instr *vec_alu_dup = get_last_alu(dup);
+
+   ASSERT_SWIZZLE_EQ(vec_alu, vec_alu_dup, 1, 0);
+}
+
+TEST_P(nir_serialize_all_test, alu_two_components_full_swizzle)
+{
+   nir_ssa_def *undef = nir_ssa_undef(b, 2, 32);
+   nir_ssa_def *fma = nir_ffma(b, undef, undef, undef);
+   nir_alu_instr *fma_alu = nir_instr_as_alu(fma->parent_instr);
+
+   fma->num_components = GetParam();
+   fma_alu->dest.write_mask = (1 << GetParam()) - 1;
+
+   memset(fma_alu->src[0].swizzle, 1, GetParam());
+   memset(fma_alu->src[1].swizzle, 1, GetParam());
+   memset(fma_alu->src[2].swizzle, 1, GetParam());
+
+   serialize();
+
+   nir_alu_instr *fma_alu_dup = get_last_alu(dup);
+
+   ASSERT_SWIZZLE_EQ(fma_alu, fma_alu_dup, GetParam(), 0);
+   ASSERT_SWIZZLE_EQ(fma_alu, fma_alu_dup, GetParam(), 1);
+   ASSERT_SWIZZLE_EQ(fma_alu, fma_alu_dup, GetParam(), 2);
+}
+
+TEST_P(nir_serialize_all_but_one_test, alu_two_components_reg_two_swizzle)
+{
+   nir_ssa_def *undef = nir_ssa_undef(b, 2, 32);
+   nir_ssa_def *fma = nir_ffma(b, undef, undef, undef);
+   nir_alu_instr *fma_alu = nir_instr_as_alu(fma->parent_instr);
+
+   memset(fma_alu->src[0].swizzle, 1, GetParam());
+   memset(fma_alu->src[1].swizzle, 1, GetParam());
+   memset(fma_alu->src[2].swizzle, 1, GetParam());
+
+   ASSERT_TRUE(nir_convert_from_ssa(b->shader, false));
+
+   fma_alu = get_last_alu(b->shader);
+   ASSERT_FALSE(fma_alu->dest.dest.is_ssa);
+   fma_alu->dest.dest.reg.reg->num_components = GetParam();
+   fma_alu->dest.write_mask = 1 | (1 << (GetParam() - 1));
+
+   serialize();
+
+   nir_alu_instr *fma_alu_dup = get_last_alu(dup);
+
+   ASSERT_EQ(fma_alu->src[0].swizzle[0], fma_alu_dup->src[0].swizzle[0]);
+   ASSERT_EQ(fma_alu->src[0].swizzle[GetParam() - 1], fma_alu_dup->src[0].swizzle[GetParam() - 1]);
+   ASSERT_EQ(fma_alu->src[1].swizzle[0], fma_alu_dup->src[1].swizzle[0]);
+   ASSERT_EQ(fma_alu->src[1].swizzle[GetParam() - 1], fma_alu_dup->src[1].swizzle[GetParam() - 1]);
+   ASSERT_EQ(fma_alu->src[2].swizzle[0], fma_alu_dup->src[2].swizzle[0]);
+   ASSERT_EQ(fma_alu->src[2].swizzle[GetParam() - 1], fma_alu_dup->src[2].swizzle[GetParam() - 1]);
+}
+
+TEST_P(nir_serialize_all_but_one_test, alu_full_width_reg_two_swizzle)
+{
+   nir_ssa_def *undef = nir_ssa_undef(b, GetParam(), 32);
+   nir_ssa_def *fma = nir_ffma(b, undef, undef, undef);
+   nir_alu_instr *fma_alu = nir_instr_as_alu(fma->parent_instr);
+
+   memset(fma_alu->src[0].swizzle, GetParam() - 1, GetParam());
+   memset(fma_alu->src[1].swizzle, GetParam() - 1, GetParam());
+   memset(fma_alu->src[2].swizzle, GetParam() - 1, GetParam());
+
+   ASSERT_TRUE(nir_convert_from_ssa(b->shader, false));
+
+   fma_alu = get_last_alu(b->shader);
+   ASSERT_FALSE(fma_alu->dest.dest.is_ssa);
+   fma_alu->dest.write_mask = 1 | (1 << (GetParam() - 1));
+
+   serialize();
+
+   nir_alu_instr *fma_alu_dup = get_last_alu(dup);
+
+   ASSERT_EQ(fma_alu->src[0].swizzle[0], fma_alu_dup->src[0].swizzle[0]);
+   ASSERT_EQ(fma_alu->src[0].swizzle[GetParam() - 1], fma_alu_dup->src[0].swizzle[GetParam() - 1]);
+   ASSERT_EQ(fma_alu->src[1].swizzle[0], fma_alu_dup->src[1].swizzle[0]);
+   ASSERT_EQ(fma_alu->src[1].swizzle[GetParam() - 1], fma_alu_dup->src[1].swizzle[GetParam() - 1]);
+   ASSERT_EQ(fma_alu->src[2].swizzle[0], fma_alu_dup->src[2].swizzle[0]);
+   ASSERT_EQ(fma_alu->src[2].swizzle[GetParam() - 1], fma_alu_dup->src[2].swizzle[GetParam() - 1]);
+}
+
+TEST_P(nir_serialize_all_but_one_test, alu_two_component_reg_full_src)
+{
+   nir_ssa_def *undef = nir_ssa_undef(b, GetParam(), 32);
+   nir_ssa_def *fma = nir_ffma(b, undef, undef, undef);
+   nir_alu_instr *fma_alu = nir_instr_as_alu(fma->parent_instr);
+
+   memset(fma_alu->src[0].swizzle, 1, GetParam());
+   memset(fma_alu->src[1].swizzle, 1, GetParam());
+   memset(fma_alu->src[2].swizzle, 1, GetParam());
+
+   ASSERT_TRUE(nir_convert_from_ssa(b->shader, false));
+
+   fma_alu = get_last_alu(b->shader);
+   ASSERT_FALSE(fma_alu->dest.dest.is_ssa);
+   fma_alu->dest.dest.reg.reg->num_components = 2;
+   fma_alu->dest.write_mask = 0x3;
+
+   serialize();
+
+   nir_alu_instr *fma_alu_dup = get_last_alu(dup);
+
+   ASSERT_SWIZZLE_EQ(fma_alu, fma_alu_dup, 2, 0);
+   ASSERT_SWIZZLE_EQ(fma_alu, fma_alu_dup, 2, 1);
+   ASSERT_SWIZZLE_EQ(fma_alu, fma_alu_dup, 2, 2);
+}
+
+TEST_P(nir_serialize_all_but_one_test, single_channel)
+{
+   nir_ssa_def *zero = nir_ssa_undef(b, GetParam(), 32);
+   nir_ssa_def *vec = nir_channel(b, zero, GetParam() - 1);
+   nir_alu_instr *vec_alu = nir_instr_as_alu(vec->parent_instr);
+
+   serialize();
+
+   nir_alu_instr *vec_alu_dup = get_last_alu(dup);
+
+   ASSERT_SWIZZLE_EQ(vec_alu, vec_alu_dup, 1, 0);
+}