- Inline frequently called simple methods.

- Deinline calc_with_limits for HammingDistance and make it final to also improve inlining.

4 files changed, 18 insertions, 28 deletions

diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp
index d3c2998333a..86090f2ac92 100644
--- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp
@@ -79,12 +79,6 @@ DenseTensorStore::~DenseTensorStore()
     _store.dropBuffers();
 }
 
-const void *
-DenseTensorStore::getRawBuffer(RefType ref) const
-{
-    return _store.getEntryArray<char>(ref, _bufferType.getArraySize());
-}
-
 namespace {
 
 void clearPadAreaAfterBuffer(char *buffer, size_t bufSize, size_t alignedBufSize) {
@@ -136,15 +130,6 @@ DenseTensorStore::getTensor(EntryRef ref) const
     return std::make_unique<vespalib::eval::DenseValueView>(_type, cells_ref);
 }
 
-vespalib::eval::TypedCells
-DenseTensorStore::get_typed_cells(EntryRef ref) const
-{
-    if (!ref.valid()) {
-        return vespalib::eval::TypedCells(&_emptySpace[0], _type.cell_type(), getNumCells());
-    }
-    return vespalib::eval::TypedCells(getRawBuffer(ref), _type.cell_type(), getNumCells());
-}
-
 template <class TensorType>
 TensorStore::EntryRef
 DenseTensorStore::setDenseTensor(const TensorType &tensor)
diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h
index 3b7cb71863e..06492596f70 100644
--- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h
+++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h
@@ -50,12 +50,9 @@ private:
     ValueType _type; // type of dense tensor
     std::vector<char> _emptySpace;
 
-    size_t unboundCells(const void *buffer) const;
-
     template <class TensorType>
     TensorStore::EntryRef
     setDenseTensor(const TensorType &tensor);
-
 public:
     DenseTensorStore(const ValueType &type, std::unique_ptr<vespalib::alloc::MemoryAllocator> allocator);
     ~DenseTensorStore() override;
@@ -63,12 +60,17 @@ public:
     const ValueType &type() const { return _type; }
     size_t getNumCells() const { return _tensorSizeCalc._numCells; }
     size_t getBufSize() const { return _tensorSizeCalc.bufSize(); }
-    const void *getRawBuffer(RefType ref) const;
+    const void *getRawBuffer(RefType ref) const {
+        return _store.getEntryArray<char>(ref, _bufferType.getArraySize());
+    }
     vespalib::datastore::Handle<char> allocRawBuffer();
     void holdTensor(EntryRef ref) override;
     EntryRef move(EntryRef ref) override;
     std::unique_ptr<vespalib::eval::Value> getTensor(EntryRef ref) const;
-    vespalib::eval::TypedCells get_typed_cells(EntryRef ref) const;
+    vespalib::eval::TypedCells get_typed_cells(EntryRef ref) const {
+        return vespalib::eval::TypedCells(ref.valid() ? getRawBuffer(ref) : &_emptySpace[0],
+                                          _type.cell_type(), getNumCells());
+    }
     EntryRef setTensor(const vespalib::eval::Value &tensor);
     // The following method is meant to be used only for unit tests.
     uint32_t getArraySize() const { return _bufferType.getArraySize(); }
diff --git a/searchlib/src/vespa/searchlib/tensor/hamming_distance.cpp b/searchlib/src/vespa/searchlib/tensor/hamming_distance.cpp
index 7f9f20e07c4..43596478a6f 100644
--- a/searchlib/src/vespa/searchlib/tensor/hamming_distance.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/hamming_distance.cpp
@@ -43,4 +43,13 @@ HammingDistance::calc(const vespalib::eval::TypedCells& lhs,
     }
 }
 
+double
+HammingDistance::calc_with_limit(const vespalib::eval::TypedCells& lhs,
+                                 const vespalib::eval::TypedCells& rhs,
+                                 double) const
+{
+    // consider optimizing:
+    return calc(lhs, rhs);
+}
+
 }
diff --git a/searchlib/src/vespa/searchlib/tensor/hamming_distance.h b/searchlib/src/vespa/searchlib/tensor/hamming_distance.h
index f0b7b159b90..c64fc5b532d 100644
--- a/searchlib/src/vespa/searchlib/tensor/hamming_distance.h
+++ b/searchlib/src/vespa/searchlib/tensor/hamming_distance.h
@@ -15,7 +15,7 @@ namespace search::tensor {
  * or (for int8 cells, aka binary data only)
  * "number of bits that are different"
  */
-class HammingDistance : public DistanceFunction {
+class HammingDistance final : public DistanceFunction {
 public:
     HammingDistance(vespalib::eval::CellType expected) : DistanceFunction(expected) {}
     double calc(const vespalib::eval::TypedCells& lhs, const vespalib::eval::TypedCells& rhs) const override;
@@ -26,13 +26,7 @@ public:
         double score = 1.0 / (1.0 + distance);
         return score;
     }
-    double calc_with_limit(const vespalib::eval::TypedCells& lhs,
-                           const vespalib::eval::TypedCells& rhs,
-                           double) const override
-    {
-        // consider optimizing:
-        return calc(lhs, rhs);
-    }
+    double calc_with_limit(const vespalib::eval::TypedCells& lhs, const vespalib::eval::TypedCells& rhs, double) const override;
 };
 
 }