1 files changed, 58 insertions, 0 deletions
diff --git a/eval/src/tests/instruction/vector_from_doubles_function/vector_from_doubles_function_test.cpp b/eval/src/tests/instruction/vector_from_doubles_function/vector_from_doubles_function_test.cpp
new file mode 100644
index 00000000000..4f4829c3ae1
--- /dev/null
+++ b/eval/src/tests/instruction/vector_from_doubles_function/vector_from_doubles_function_test.cpp
@@ -0,0 +1,58 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include <vespa/vespalib/testkit/test_kit.h>
+#include <vespa/eval/eval/tensor_function.h>
+#include <vespa/eval/instruction/vector_from_doubles_function.h>
+#include <vespa/eval/eval/test/tensor_model.hpp>
+#include <vespa/eval/eval/test/eval_fixture.h>
+
+#include <vespa/vespalib/util/stringfmt.h>
+#include <vespa/vespalib/util/stash.h>
+
+using namespace vespalib;
+using namespace vespalib::eval;
+using namespace vespalib::eval::test;
+using namespace vespalib::eval::tensor_function;
+
+const ValueBuilderFactory &prod_factory = FastValueBuilderFactory::get();
+
+EvalFixture::ParamRepo make_params() {
+    return EvalFixture::ParamRepo()
+        .add("a", spec(1.0))
+        .add("b", spec(2.0))
+        .add("c", spec(3.0))
+        .add("d", spec(4.0))
+        .add("x5", spec({x(5)}, N()));
+}
+EvalFixture::ParamRepo param_repo = make_params();
+
+void verify(const vespalib::string &expr, size_t expect_optimized_cnt, size_t expect_not_optimized_cnt) {
+    EvalFixture fixture(prod_factory, expr, param_repo, true);
+    EXPECT_EQUAL(fixture.result(), EvalFixture::ref(expr, param_repo));
+    auto info = fixture.find_all<VectorFromDoublesFunction>();
+    EXPECT_EQUAL(info.size(), expect_optimized_cnt);
+    for (size_t i = 0; i < info.size(); ++i) {
+        EXPECT_TRUE(info[i]->result_is_mutable());
+    }
+    EXPECT_EQUAL(fixture.find_all<Concat>().size(), expect_not_optimized_cnt);
+}
+
+//-----------------------------------------------------------------------------
+
+TEST("require that multiple concats are optimized") {
+    TEST_DO(verify("concat(a,b,x)", 1, 0));
+    TEST_DO(verify("concat(a,concat(b,concat(c,d,x),x),x)", 1, 0));
+    TEST_DO(verify("concat(concat(concat(a,b,x),c,x),d,x)", 1, 0));
+    TEST_DO(verify("concat(concat(a,b,x),concat(c,d,x),x)", 1, 0));
+}
+
+TEST("require that concat along different dimension is not optimized") {
+    TEST_DO(verify("concat(concat(a,b,x),concat(c,d,x),y)", 2, 1));
+}
+
+TEST("require that concat of vector and double is not optimized") {
+    TEST_DO(verify("concat(a,x5,x)", 0, 1));
+    TEST_DO(verify("concat(x5,b,x)", 0, 1));
+}
+
+TEST_MAIN() { TEST_RUN_ALL(); }