'fast rename' is now an optimizer using the 'replace type' function

3 files changed, 17 insertions, 35 deletions

diff --git a/eval/src/tests/tensor/dense_fast_rename_function/CMakeLists.txt b/eval/src/tests/tensor/dense_fast_rename_function/CMakeLists.txt
deleted file mode 100644
index a5c3b223ce5..00000000000
--- a/eval/src/tests/tensor/dense_fast_rename_function/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(eval_dense_fast_rename_function_test_app TEST
-    SOURCES
-    dense_fast_rename_function_test.cpp
-    DEPENDS
-    vespaeval
-)
-vespa_add_test(NAME eval_dense_fast_rename_function_test_app COMMAND eval_dense_fast_rename_function_test_app)
diff --git a/eval/src/tests/tensor/dense_fast_rename_optimizer/CMakeLists.txt b/eval/src/tests/tensor/dense_fast_rename_optimizer/CMakeLists.txt
new file mode 100644
index 00000000000..32cf6c45d1e
--- /dev/null
+++ b/eval/src/tests/tensor/dense_fast_rename_optimizer/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(eval_dense_fast_rename_optimizer_test_app TEST
+    SOURCES
+    dense_fast_rename_optimizer_test.cpp
+    DEPENDS
+    vespaeval
+)
+vespa_add_test(NAME eval_dense_fast_rename_optimizer_test_app COMMAND eval_dense_fast_rename_optimizer_test_app)
diff --git a/eval/src/tests/tensor/dense_fast_rename_function/dense_fast_rename_function_test.cpp b/eval/src/tests/tensor/dense_fast_rename_optimizer/dense_fast_rename_optimizer_test.cpp
index 45b38b48481..c892ed02808 100644
--- a/eval/src/tests/tensor/dense_fast_rename_function/dense_fast_rename_function_test.cpp
+++ b/eval/src/tests/tensor/dense_fast_rename_optimizer/dense_fast_rename_optimizer_test.cpp
@@ -5,7 +5,8 @@
 #include <vespa/eval/eval/simple_tensor.h>
 #include <vespa/eval/eval/simple_tensor_engine.h>
 #include <vespa/eval/tensor/default_tensor_engine.h>
-#include <vespa/eval/tensor/dense/dense_fast_rename_function.h>
+#include <vespa/eval/tensor/dense/dense_replace_type_function.h>
+#include <vespa/eval/tensor/dense/dense_fast_rename_optimizer.h>
 #include <vespa/eval/tensor/dense/dense_tensor.h>
 #include <vespa/eval/eval/test/tensor_model.hpp>
 #include <vespa/eval/eval/test/eval_fixture.h>
@@ -24,25 +25,23 @@ const TensorEngine &prod_engine = DefaultTensorEngine::ref();
 EvalFixture::ParamRepo make_params() {
     return EvalFixture::ParamRepo()
         .add("x5", spec({x(5)}, N()))
-        .add_mutable("mut_x5", spec({x(5)}, N()))
         .add("x5_u", spec({x(5)}, N()), "tensor(x[])")
         .add("x_m", spec({x({"a", "b", "c"})}, N()))
         .add("x5y3", spec({x(5),y(3)}, N()));
 }
 EvalFixture::ParamRepo param_repo = make_params();
 
-void verify_optimized(const vespalib::string &expr, bool expect_mutable = false) {
-    EvalFixture fixture(prod_engine, expr, param_repo, true, true);
+void verify_optimized(const vespalib::string &expr) {
+    EvalFixture fixture(prod_engine, expr, param_repo, true);
     EXPECT_EQUAL(fixture.result(), EvalFixture::ref(expr, param_repo));
-    auto info = fixture.find_all<DenseFastRenameFunction>();
-    ASSERT_EQUAL(info.size(), 1u);
-    EXPECT_EQUAL(info[0]->result_is_mutable(), expect_mutable);
+    auto info = fixture.find_all<DenseReplaceTypeFunction>();
+    EXPECT_EQUAL(info.size(), 1u);
 }
 
 void verify_not_optimized(const vespalib::string &expr) {
     EvalFixture fixture(prod_engine, expr, param_repo, true);
     EXPECT_EQUAL(fixture.result(), EvalFixture::ref(expr, param_repo));
-    auto info = fixture.find_all<DenseFastRenameFunction>();
+    auto info = fixture.find_all<DenseReplaceTypeFunction>();
     EXPECT_TRUE(info.empty());
 }
 
@@ -73,25 +72,8 @@ TEST("require that non-dense renames are not optimized") {
     TEST_DO(verify_not_optimized("rename(x_m,x,y)"));
 }
 
-TEST("require that renaming a mutable result retains mutability") {
-    TEST_DO(verify_optimized("rename(mut_x5,x,y)", true));
-}
-
-TEST("require that child mutability changed under-the-hood is still reflected") {
-    Stash stash;
-    const Node &a = inject(ValueType::from_spec("tensor(x[2])"), 0, stash);
-    const Node &tmp = map(a, operation::Neg::f, stash); // will be mutable
-    DenseFastRenameFunction my_rename(ValueType::from_spec("tensor(y[2])"), a);
-    EXPECT_TRUE(!my_rename.result_is_mutable());
-    {
-        std::vector<TensorFunction::Child::CREF> list;
-        my_rename.push_children(list);
-        ASSERT_EQUAL(list.size(), 1u);
-        EXPECT_EQUAL(&(list[0].get().get()), &a);
-        const TensorFunction::Child &child = list[0];
-        child.set(tmp);
-    }
-    EXPECT_TRUE(my_rename.result_is_mutable());
+TEST("require that chained optimized renames are compacted into a single operation") {
+    TEST_DO(verify_optimized("rename(rename(x5,x,y),y,z)"));
 }
 
 TEST_MAIN() { TEST_RUN_ALL(); }