use list_stable_types and list_unstable_types

4 files changed, 8 insertions, 8 deletions

diff --git a/eval/src/tests/instruction/dense_multi_matmul_function/dense_multi_matmul_function_test.cpp b/eval/src/tests/instruction/dense_multi_matmul_function/dense_multi_matmul_function_test.cpp
index 7816556517c..9da7f379246 100644
--- a/eval/src/tests/instruction/dense_multi_matmul_function/dense_multi_matmul_function_test.cpp
+++ b/eval/src/tests/instruction/dense_multi_matmul_function/dense_multi_matmul_function_test.cpp
@@ -39,8 +39,8 @@ struct FunInfo {
 void verify_optimized(const vespalib::string &expr, const FunInfo &details)
 {
     TEST_STATE(expr.c_str());
-    auto stable_types = CellTypeSpace({CellType::FLOAT, CellType::DOUBLE}, 2);
-    auto unstable_types = CellTypeSpace({CellType::BFLOAT16, CellType::INT8}, 2);
+    CellTypeSpace stable_types(CellTypeUtils::list_stable_types(), 2);
+    CellTypeSpace unstable_types(CellTypeUtils::list_unstable_types(), 2);
     EvalFixture::verify<FunInfo>(expr, {details}, CellTypeSpace(stable_types).same());
     EvalFixture::verify<FunInfo>(expr, {}, CellTypeSpace(stable_types).different());
     EvalFixture::verify<FunInfo>(expr, {}, unstable_types);
diff --git a/eval/src/tests/instruction/inplace_map_function/inplace_map_function_test.cpp b/eval/src/tests/instruction/inplace_map_function/inplace_map_function_test.cpp
index 414613a062d..1193060b05a 100644
--- a/eval/src/tests/instruction/inplace_map_function/inplace_map_function_test.cpp
+++ b/eval/src/tests/instruction/inplace_map_function/inplace_map_function_test.cpp
@@ -27,8 +27,8 @@ struct FunInfo {
 
 void verify_optimized(const vespalib::string &expr) {
     SCOPED_TRACE(expr.c_str());
-    auto stable_types = CellTypeSpace({CellType::FLOAT, CellType::DOUBLE}, 1);
-    auto unstable_types = CellTypeSpace({CellType::BFLOAT16, CellType::INT8}, 1);
+    CellTypeSpace stable_types(CellTypeUtils::list_stable_types(), 1);
+    CellTypeSpace unstable_types(CellTypeUtils::list_unstable_types(), 1);
     EvalFixture::verify<FunInfo>(expr, {FunInfo{false}}, stable_types);
     EvalFixture::verify<FunInfo>(expr, {}, unstable_types);
 }
diff --git a/eval/src/tests/instruction/join_with_number/join_with_number_function_test.cpp b/eval/src/tests/instruction/join_with_number/join_with_number_function_test.cpp
index d152d4531c8..a6486de6858 100644
--- a/eval/src/tests/instruction/join_with_number/join_with_number_function_test.cpp
+++ b/eval/src/tests/instruction/join_with_number/join_with_number_function_test.cpp
@@ -48,10 +48,10 @@ struct FunInfo {
 
 void verify_optimized(const vespalib::string &expr, Primary primary, bool inplace) {
     // fprintf(stderr, "%s\n", expr.c_str());
-    const auto stable_types = CellTypeSpace({CellType::FLOAT, CellType::DOUBLE}, 2);
+    const CellTypeSpace stable_types(CellTypeUtils::list_stable_types(), 2);
     FunInfo stable_details{primary, inplace};
     TEST_DO(EvalFixture::verify<FunInfo>(expr, {stable_details}, stable_types));
-    const auto unstable_types = CellTypeSpace({CellType::BFLOAT16, CellType::INT8}, 2);
+    const CellTypeSpace unstable_types(CellTypeUtils::list_unstable_types(), 2);
     TEST_DO(EvalFixture::verify<FunInfo>(expr, {}, unstable_types));
 }
 
diff --git a/eval/src/tests/instruction/pow_as_map_optimizer/pow_as_map_optimizer_test.cpp b/eval/src/tests/instruction/pow_as_map_optimizer/pow_as_map_optimizer_test.cpp
index f81ba10a8f3..d123f9c89a6 100644
--- a/eval/src/tests/instruction/pow_as_map_optimizer/pow_as_map_optimizer_test.cpp
+++ b/eval/src/tests/instruction/pow_as_map_optimizer/pow_as_map_optimizer_test.cpp
@@ -31,7 +31,7 @@ struct InplaceInfo {
 
 void verify_optimized(const vespalib::string &expr, op1_t op1, bool inplace = false) {
     SCOPED_TRACE(expr.c_str());
-    auto stable_types = CellTypeSpace({CellType::FLOAT, CellType::DOUBLE}, 1);
+    CellTypeSpace stable_types(CellTypeUtils::list_stable_types(), 1);
     if (inplace) {
         InplaceInfo details{op1};
         EvalFixture::verify<InplaceInfo>(expr, {details}, stable_types);
@@ -40,7 +40,7 @@ void verify_optimized(const vespalib::string &expr, op1_t op1, bool inplace = fa
         EvalFixture::verify<MapInfo>(expr, {details}, stable_types);
     }
     MapInfo details{op1};
-    auto unstable_types = CellTypeSpace({CellType::BFLOAT16, CellType::INT8}, 1);
+    CellTypeSpace unstable_types(CellTypeUtils::list_unstable_types(), 1);
     EvalFixture::verify<MapInfo>(expr, {details}, unstable_types);
 }