From patchwork Tue Mar 2 09:33:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 11431 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 783E2BD808 for ; Tue, 2 Mar 2021 09:33:37 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4357768A97; Tue, 2 Mar 2021 10:33:37 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="MKzKcrRh"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3B62860106 for ; Tue, 2 Mar 2021 10:33:35 +0100 (CET) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 7A4398F3; Tue, 2 Mar 2021 10:33:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1614677614; bh=SHTTcwqtT5hWucqeGCz52gCAq7U5+I7JBrqJrb2Qytk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MKzKcrRhOciqnfC7ZZjYtZcNRuc/yGJ1d5eoBPkanivFopfA5c4Ie95S2rdY06t1U 69QjwOn56gyHLXyfwRT+x0JjnAQphVGfX1UQdq1hClml8rCgEEk4/VIUPymNK7e/Ka snQnXgzWsEj1sinr/x0WtMLwAqih4bXgs6Zx6B9s= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Tue, 2 Mar 2021 18:33:18 +0900 Message-Id: <20210302093318.437308-4-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210302093318.437308-1-paul.elder@ideasonboard.com> References: <20210302093318.437308-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v10 3/3] tests: Test IPA serializer generation X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add a test to confirm that serializer and header generation works properly for mojom definition files, and that the serializer works properly. Signed-off-by: Paul Elder Reviewed-by: Laurent Pinchart --- Changes in v10: - move test.mojom to a subdirectory in the test directory for clean including - rename everything vimc to test (for real) Changes in v9: - rename everything vimc to test - add std:: to vectors and ties No change in v8 Changes in v7: - add test to test serdes of a vector of *generated* structs Changes in v6: - use namespacing in the mojom file, and in the test - add the enum to the test mojom file, as vimc.h no longer exists Changes in v5: - add dummy event to event interface New in v4 --- .../generated_serializer_test.cpp | 156 ++++++++++++++++++ .../include/libcamera/ipa/meson.build | 40 +++++ .../include/libcamera/ipa/test.mojom | 33 ++++ .../generated_serializer/meson.build | 19 +++ test/serialization/meson.build | 2 + 5 files changed, 250 insertions(+) create mode 100644 test/serialization/generated_serializer/generated_serializer_test.cpp create mode 100644 test/serialization/generated_serializer/include/libcamera/ipa/meson.build create mode 100644 test/serialization/generated_serializer/include/libcamera/ipa/test.mojom create mode 100644 test/serialization/generated_serializer/meson.build diff --git a/test/serialization/generated_serializer/generated_serializer_test.cpp b/test/serialization/generated_serializer/generated_serializer_test.cpp new file mode 100644 index 00000000..698c81d6 --- /dev/null +++ b/test/serialization/generated_serializer/generated_serializer_test.cpp @@ -0,0 +1,156 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2020, Google Inc. + * + * generated_serializer_test.cpp - Test generated serializer + */ + +#include +#include +#include + +#include "test.h" + +#include "test_ipa_interface.h" +#include "test_ipa_serializer.h" + +using namespace std; +using namespace libcamera; + +class IPAGeneratedSerializerTest : public Test +{ +protected: + int init() override + { + return TestPass; + } + + int run() override + { + +#define TEST_FIELD_EQUALITY(struct1, struct2, field) \ +if (struct1.field != struct2.field) { \ + cerr << #field << " field incorrect: expected \"" \ + << t.field << "\", got \"" << u.field << "\"" << endl;\ + return TestFail; \ +} + + ipa::test::TestStruct t, u; + + t.m = { + { "a", "z" }, + { "b", "z" }, + { "c", "z" }, + { "d", "z" }, + { "e", "z" }, + }; + + t.a = { "a", "b", "c", "d", "e" }; + + t.s1 = "hello world"; + t.s2 = "goodbye"; + t.s3 = "lorem ipsum"; + t.i = 58527; + + std::vector serialized; + + std::tie(serialized, ignore) = + IPADataSerializer::serialize(t); + + u = IPADataSerializer::deserialize(serialized); + + if (!equals(t.m, u.m)) + return TestFail; + + if (!equals(t.a, u.a)) + return TestFail; + + TEST_FIELD_EQUALITY(t, u, s1); + TEST_FIELD_EQUALITY(t, u, s2); + TEST_FIELD_EQUALITY(t, u, s3); + TEST_FIELD_EQUALITY(t, u, i); + + + /* Test vector of generated structs */ + std::vector v = { t, u }; + std::vector w; + + std::tie(serialized, ignore) = + IPADataSerializer>::serialize(v); + + w = IPADataSerializer>::deserialize(serialized); + + if (!equals(v[0].m, w[0].m) || + !equals(v[1].m, w[1].m)) + return TestFail; + + if (!equals(v[0].a, w[0].a) || + !equals(v[1].a, w[1].a)) + return TestFail; + + TEST_FIELD_EQUALITY(v[0], w[0], s1); + TEST_FIELD_EQUALITY(v[0], w[0], s2); + TEST_FIELD_EQUALITY(v[0], w[0], s3); + TEST_FIELD_EQUALITY(v[0], w[0], i); + + TEST_FIELD_EQUALITY(v[1], w[1], s1); + TEST_FIELD_EQUALITY(v[1], w[1], s2); + TEST_FIELD_EQUALITY(v[1], w[1], s3); + TEST_FIELD_EQUALITY(v[1], w[1], i); + + return TestPass; + } + +private: + bool equals(const map &lhs, const map &rhs) + { + bool eq = lhs.size() == rhs.size() && + equal(lhs.begin(), lhs.end(), rhs.begin(), + [](auto &a, auto &b) { return a.first == b.first && + a.second == b.second; }); + + if (eq) + return true; + + cerr << "lhs:" << endl; + for (const auto &pair : lhs) + cerr << "- " << pair.first << ": " + << pair.second << endl; + + cerr << "rhs:" << endl; + for (const auto &pair : rhs) + cerr << "- " << pair.first << ": " + << pair.second << endl; + + return false; + } + + bool equals(const vector &lhs, const vector &rhs) + { + bool eq = lhs.size() == rhs.size(); + + if (!eq) { + cerr << "sizes not equal" << endl; + return false; + } + + for (unsigned int i = 0; i < lhs.size(); i++) + if (lhs[i] != rhs[i]) + eq = false; + + if (eq) + return true; + + cerr << "lhs:" << endl; + for (const auto &str : lhs) + cerr << "- " << str << endl; + + cerr << "rhs:" << endl; + for (const auto &str : rhs) + cerr << "- " << str << endl; + + return false; + } +}; + +TEST_REGISTER(IPAGeneratedSerializerTest) diff --git a/test/serialization/generated_serializer/include/libcamera/ipa/meson.build b/test/serialization/generated_serializer/include/libcamera/ipa/meson.build new file mode 100644 index 00000000..ba198f7a --- /dev/null +++ b/test/serialization/generated_serializer/include/libcamera/ipa/meson.build @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: CC0-1.0 + +# test.mojom-module +mojom = custom_target('test_mojom_module', + input : 'test.mojom', + output : 'test.mojom-module', + command : [ + mojom_parser, + '--output-root', meson.build_root(), + '--input-root', meson.source_root(), + '--mojoms', '@INPUT@' + ]) + +# test_ipa_interface.h +generated_test_header = custom_target('test_ipa_interface_h', + input : mojom, + output : 'test_ipa_interface.h', + depends : mojom_templates, + command : [ + mojom_generator, 'generate', + '-g', 'libcamera', + '--bytecode_path', mojom_templates_dir, + '--libcamera_generate_header', + '--libcamera_output_path=@OUTPUT@', + './' +'@INPUT@' + ]) + +# test_ipa_serializer.h +generated_test_serializer = custom_target('test_ipa_serializer_h', + input : mojom, + output : 'test_ipa_serializer.h', + depends : mojom_templates, + command : [ + mojom_generator, 'generate', + '-g', 'libcamera', + '--bytecode_path', mojom_templates_dir, + '--libcamera_generate_serializer', + '--libcamera_output_path=@OUTPUT@', + './' +'@INPUT@' + ]) diff --git a/test/serialization/generated_serializer/include/libcamera/ipa/test.mojom b/test/serialization/generated_serializer/include/libcamera/ipa/test.mojom new file mode 100644 index 00000000..5f200885 --- /dev/null +++ b/test/serialization/generated_serializer/include/libcamera/ipa/test.mojom @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ + +module ipa.test; + +enum IPAOperationCode { + IPAOperationNone, + IPAOperationInit, + IPAOperationStart, + IPAOperationStop, +}; + +struct IPASettings {}; + +struct TestStruct { + map m; + array a; + string s1; + string s2; + int32 i; + string s3; +}; + +interface IPATestInterface { + init(IPASettings settings) => (int32 ret); + start() => (int32 ret); + stop(); + + test(TestStruct s); +}; + +interface IPATestEventInterface { + dummyEvent(uint32 val); +}; diff --git a/test/serialization/generated_serializer/meson.build b/test/serialization/generated_serializer/meson.build new file mode 100644 index 00000000..2460e0b1 --- /dev/null +++ b/test/serialization/generated_serializer/meson.build @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: CC0-1.0 + +subdir('include/libcamera/ipa') + +exe = executable('generated_serializer_test', + [ + 'generated_serializer_test.cpp', + generated_test_header, + generated_test_serializer, + ], + dependencies : libcamera_dep, + link_with : test_libraries, + include_directories : [ + test_includes_internal, + './include', + ]) + +test('generated_serializer_test', exe, + suite : 'generated_serializer', is_parallel : false) diff --git a/test/serialization/meson.build b/test/serialization/meson.build index a4636337..60ebf325 100644 --- a/test/serialization/meson.build +++ b/test/serialization/meson.build @@ -1,5 +1,7 @@ # SPDX-License-Identifier: CC0-1.0 +subdir('generated_serializer') + serialization_tests = [ ['control_serialization', 'control_serialization.cpp'], ['ipa_data_serializer_test', 'ipa_data_serializer_test.cpp'],