aboutsummaryrefslogtreecommitdiffstats
path: root/searchlib/src
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2024-06-19 12:48:01 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2024-06-19 12:48:01 +0000
commitb6768281e04fd6deac56cc1ebc8271d583dbc962 (patch)
treefaf3be9404f1a091e7d11158dec4d3307aaddd1a /searchlib/src
parent1244fac1d9dda32267d382034473dbe368fbfeb8 (diff)
Accelrated => Accelerated
Diffstat (limited to 'searchlib/src')
-rw-r--r--searchlib/src/vespa/searchlib/common/bitvector.cpp18
-rw-r--r--searchlib/src/vespa/searchlib/features/dotproductfeature.cpp4
-rw-r--r--searchlib/src/vespa/searchlib/features/dotproductfeature.h2
-rw-r--r--searchlib/src/vespa/searchlib/queryeval/multibitvectoriterator.cpp8
-rw-r--r--searchlib/src/vespa/searchlib/queryeval/multibitvectoriterator.h6
-rw-r--r--searchlib/src/vespa/searchlib/tensor/angular_distance.cpp4
-rw-r--r--searchlib/src/vespa/searchlib/tensor/euclidean_distance.cpp4
-rw-r--r--searchlib/src/vespa/searchlib/tensor/mips_distance_transform.cpp4
-rw-r--r--searchlib/src/vespa/searchlib/tensor/prenormalized_angular_distance.cpp4
-rw-r--r--searchlib/src/vespa/searchlib/tensor/temporary_vector_store.cpp4
10 files changed, 29 insertions, 29 deletions
diff --git a/searchlib/src/vespa/searchlib/common/bitvector.cpp b/searchlib/src/vespa/searchlib/common/bitvector.cpp
index c3d02cd96cb..f86f4993444 100644
--- a/searchlib/src/vespa/searchlib/common/bitvector.cpp
+++ b/searchlib/src/vespa/searchlib/common/bitvector.cpp
@@ -18,7 +18,7 @@ LOG_SETUP(".searchlib.common.bitvector");
using vespalib::make_string;
using vespalib::IllegalArgumentException;
-using vespalib::hwaccelerated::IAccelrated;
+using vespalib::hwaccelerated::IAccelerated;
using vespalib::Optimized;
using vespalib::alloc::Alloc;
@@ -44,7 +44,7 @@ struct BitVector::OrParts : vespalib::Runnable
_byte_size((size + 7)/8)
{}
void run() override {
- const auto & accelrator = IAccelrated::getAccelerator();
+ const auto & accelrator = IAccelerated::getAccelerator();
BitVector * master = _vectors[0];
Word * destination = master->getWordIndex(_offset);
for (uint32_t i(1); i < _vectors.size(); i++) {
@@ -224,7 +224,7 @@ BitVector::countInterval(Range range_in) const
++endw;
}
if (startw < endw) {
- res += IAccelrated::getAccelerator().populationCount(bitValues + startw, endw - startw);
+ res += IAccelerated::getAccelerator().populationCount(bitValues + startw, endw - startw);
}
if (partialEnd) {
res += Optimized::popCount(load(bitValues[endw]) & ~endBits(last));
@@ -242,12 +242,12 @@ BitVector::orWith(const BitVector & right)
if (right.size() < size()) {
ssize_t commonBytes = numActiveBytes(range.start(), range.end()) - sizeof(Word);
if (commonBytes > 0) {
- IAccelrated::getAccelerator().orBit(getWordIndex(range.start()), right.getWordIndex(range.start()), commonBytes);
+ IAccelerated::getAccelerator().orBit(getWordIndex(range.start()), right.getWordIndex(range.start()), commonBytes);
}
Index last(range.end() - 1);
store(getWordIndex(last)[0], getWordIndex(last)[0] | (load(right.getWordIndex(last)[0]) & ~endBits(last)));
} else {
- IAccelrated::getAccelerator().orBit(getWordIndex(range.start()), right.getWordIndex(range.start()), getActiveBytes());
+ IAccelerated::getAccelerator().orBit(getWordIndex(range.start()), right.getWordIndex(range.start()), getActiveBytes());
}
repairEnds();
invalidateCachedCount();
@@ -276,7 +276,7 @@ BitVector::andWith(const BitVector & right)
}
uint32_t commonBytes = std::min(getActiveBytes(), numActiveBytes(getStartIndex(), right.size()));
- IAccelrated::getAccelerator().andBit(getActiveStart(), right.getWordIndex(getStartIndex()), commonBytes);
+ IAccelerated::getAccelerator().andBit(getActiveStart(), right.getWordIndex(getStartIndex()), commonBytes);
if (right.size() < size()) {
clearInterval(right.size(), size());
}
@@ -295,12 +295,12 @@ BitVector::andNotWith(const BitVector& right)
if (right.size() < size()) {
ssize_t commonBytes = numActiveBytes(range.start(), range.end()) - sizeof(Word);
if (commonBytes > 0) {
- IAccelrated::getAccelerator().andNotBit(getWordIndex(range.start()), right.getWordIndex(range.start()), commonBytes);
+ IAccelerated::getAccelerator().andNotBit(getWordIndex(range.start()), right.getWordIndex(range.start()), commonBytes);
}
Index last(range.end() - 1);
store(getWordIndex(last)[0], getWordIndex(last)[0] & ~(load(right.getWordIndex(last)[0]) & ~endBits(last)));
} else {
- IAccelrated::getAccelerator().andNotBit(getWordIndex(range.start()), right.getWordIndex(range.start()), getActiveBytes());
+ IAccelerated::getAccelerator().andNotBit(getWordIndex(range.start()), right.getWordIndex(range.start()), getActiveBytes());
}
repairEnds();
@@ -309,7 +309,7 @@ BitVector::andNotWith(const BitVector& right)
void
BitVector::notSelf() {
- IAccelrated::getAccelerator().notBit(getActiveStart(), getActiveBytes());
+ IAccelerated::getAccelerator().notBit(getActiveStart(), getActiveBytes());
setGuardBit();
invalidateCachedCount();
}
diff --git a/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp b/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp
index 51c8f5d108e..a957ab61fb2 100644
--- a/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp
+++ b/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp
@@ -20,7 +20,7 @@ using namespace search::fef;
using vespalib::eval::FastValueBuilderFactory;
using vespalib::eval::TypedCells;
using vespalib::Issue;
-using vespalib::hwaccelerated::IAccelrated;
+using vespalib::hwaccelerated::IAccelerated;
namespace search::features {
namespace dotproduct::wset {
@@ -213,7 +213,7 @@ namespace dotproduct::array {
template <typename BaseType>
DotProductExecutorBase<BaseType>::DotProductExecutorBase(const V & queryVector)
: FeatureExecutor(),
- _multiplier(IAccelrated::getAccelerator()),
+ _multiplier(IAccelerated::getAccelerator()),
_queryVector(queryVector)
{
}
diff --git a/searchlib/src/vespa/searchlib/features/dotproductfeature.h b/searchlib/src/vespa/searchlib/features/dotproductfeature.h
index cc7ee31e3ca..d16e2bd9276 100644
--- a/searchlib/src/vespa/searchlib/features/dotproductfeature.h
+++ b/searchlib/src/vespa/searchlib/features/dotproductfeature.h
@@ -168,7 +168,7 @@ class DotProductExecutorBase : public fef::FeatureExecutor {
public:
using V = std::vector<BaseType>;
private:
- const vespalib::hwaccelerated::IAccelrated & _multiplier;
+ const vespalib::hwaccelerated::IAccelerated & _multiplier;
V _queryVector;
virtual vespalib::ConstArrayRef<BaseType> getAttributeValues(uint32_t docid) = 0;
public:
diff --git a/searchlib/src/vespa/searchlib/queryeval/multibitvectoriterator.cpp b/searchlib/src/vespa/searchlib/queryeval/multibitvectoriterator.cpp
index 19393af99a0..3c5d8c21aed 100644
--- a/searchlib/src/vespa/searchlib/queryeval/multibitvectoriterator.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/multibitvectoriterator.cpp
@@ -9,14 +9,14 @@
namespace search::queryeval {
using vespalib::Trinary;
-using vespalib::hwaccelerated::IAccelrated;
+using vespalib::hwaccelerated::IAccelerated;
using Meta = MultiBitVectorBase::Meta;
namespace {
struct And {
using Word = BitWord::Word;
- void operator () (const IAccelrated & accel, size_t offset, const std::vector<Meta> & src, void *dest) noexcept {
+ void operator () (const IAccelerated & accel, size_t offset, const std::vector<Meta> & src, void *dest) noexcept {
accel.and128(offset, src, dest);
}
static constexpr bool isAnd() noexcept { return true; }
@@ -24,7 +24,7 @@ struct And {
struct Or {
using Word = BitWord::Word;
- void operator () (const IAccelrated & accel, size_t offset, const std::vector<Meta> & src, void *dest) noexcept {
+ void operator () (const IAccelerated & accel, size_t offset, const std::vector<Meta> & src, void *dest) noexcept {
accel.or128(offset, src, dest);
}
static constexpr bool isAnd() noexcept { return false; }
@@ -52,7 +52,7 @@ template <typename Update>
MultiBitVector<Update>::MultiBitVector(size_t reserved)
: MultiBitVectorBase(reserved),
_update(),
- _accel(IAccelrated::getAccelerator()),
+ _accel(IAccelerated::getAccelerator()),
_lastWords()
{
static_assert(sizeof(_lastWords) == 128, "Lastwords should have 128 byte size");
diff --git a/searchlib/src/vespa/searchlib/queryeval/multibitvectoriterator.h b/searchlib/src/vespa/searchlib/queryeval/multibitvectoriterator.h
index 401095eba37..67a4e116398 100644
--- a/searchlib/src/vespa/searchlib/queryeval/multibitvectoriterator.h
+++ b/searchlib/src/vespa/searchlib/queryeval/multibitvectoriterator.h
@@ -6,7 +6,7 @@
#include "unpackinfo.h"
#include <vespa/searchlib/common/bitword.h>
-namespace vespalib::hwaccelerated { class IAccelrated; }
+namespace vespalib::hwaccelerated { class IAccelerated; }
namespace search::queryeval {
@@ -46,10 +46,10 @@ private:
VESPA_DLL_LOCAL bool updateLastValueCold(uint32_t docId) noexcept __attribute__((noinline));
VESPA_DLL_LOCAL void fetchChunk(uint32_t docId) noexcept __attribute__((noinline));
- using IAccelrated = vespalib::hwaccelerated::IAccelrated;
+ using IAccelerated = vespalib::hwaccelerated::IAccelerated;
Update _update;
- const IAccelrated & _accel;
+ const IAccelerated & _accel;
alignas(64) Word _lastWords[16];
static constexpr size_t NumWordsInBatch = sizeof(_lastWords) / sizeof(Word);
};
diff --git a/searchlib/src/vespa/searchlib/tensor/angular_distance.cpp b/searchlib/src/vespa/searchlib/tensor/angular_distance.cpp
index 56923f77385..3bdfd3c0e7b 100644
--- a/searchlib/src/vespa/searchlib/tensor/angular_distance.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/angular_distance.cpp
@@ -17,13 +17,13 @@ template <typename VectorStoreType>
class BoundAngularDistance final : public BoundDistanceFunction {
private:
using FloatType = VectorStoreType::FloatType;
- const vespalib::hwaccelerated::IAccelrated & _computer;
+ const vespalib::hwaccelerated::IAccelerated & _computer;
mutable VectorStoreType _tmpSpace;
const vespalib::ConstArrayRef<FloatType> _lhs;
double _lhs_norm_sq;
public:
explicit BoundAngularDistance(TypedCells lhs)
- : _computer(vespalib::hwaccelerated::IAccelrated::getAccelerator()),
+ : _computer(vespalib::hwaccelerated::IAccelerated::getAccelerator()),
_tmpSpace(lhs.size),
_lhs(_tmpSpace.storeLhs(lhs))
{
diff --git a/searchlib/src/vespa/searchlib/tensor/euclidean_distance.cpp b/searchlib/src/vespa/searchlib/tensor/euclidean_distance.cpp
index 2d9602ee72b..6c4be1e12aa 100644
--- a/searchlib/src/vespa/searchlib/tensor/euclidean_distance.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/euclidean_distance.cpp
@@ -17,12 +17,12 @@ template <typename VectorStoreType>
class BoundEuclideanDistance final : public BoundDistanceFunction {
private:
using FloatType = VectorStoreType::FloatType;
- const vespalib::hwaccelerated::IAccelrated & _computer;
+ const vespalib::hwaccelerated::IAccelerated & _computer;
mutable VectorStoreType _tmpSpace;
const vespalib::ConstArrayRef<FloatType> _lhs_vector;
public:
explicit BoundEuclideanDistance(TypedCells lhs)
- : _computer(vespalib::hwaccelerated::IAccelrated::getAccelerator()),
+ : _computer(vespalib::hwaccelerated::IAccelerated::getAccelerator()),
_tmpSpace(lhs.size),
_lhs_vector(_tmpSpace.storeLhs(lhs))
{}
diff --git a/searchlib/src/vespa/searchlib/tensor/mips_distance_transform.cpp b/searchlib/src/vespa/searchlib/tensor/mips_distance_transform.cpp
index 7d204307872..dcaa863c509 100644
--- a/searchlib/src/vespa/searchlib/tensor/mips_distance_transform.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/mips_distance_transform.cpp
@@ -16,7 +16,7 @@ private:
using FloatType = VectorStoreType::FloatType;
mutable VectorStoreType _tmpSpace;
const vespalib::ConstArrayRef<FloatType> _lhs_vector;
- const vespalib::hwaccelerated::IAccelrated & _computer;
+ const vespalib::hwaccelerated::IAccelerated & _computer;
double _max_sq_norm;
using ExtraDimT = std::conditional_t<extra_dim,double,std::monostate>;
[[no_unique_address]] ExtraDimT _lhs_extra_dim;
@@ -26,7 +26,7 @@ public:
: BoundDistanceFunction(),
_tmpSpace(lhs.size),
_lhs_vector(_tmpSpace.storeLhs(lhs)),
- _computer(vespalib::hwaccelerated::IAccelrated::getAccelerator())
+ _computer(vespalib::hwaccelerated::IAccelerated::getAccelerator())
{
const FloatType * a = _lhs_vector.data();
if constexpr (extra_dim) {
diff --git a/searchlib/src/vespa/searchlib/tensor/prenormalized_angular_distance.cpp b/searchlib/src/vespa/searchlib/tensor/prenormalized_angular_distance.cpp
index d32e2c24c99..fdfbdb5a4a4 100644
--- a/searchlib/src/vespa/searchlib/tensor/prenormalized_angular_distance.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/prenormalized_angular_distance.cpp
@@ -14,13 +14,13 @@ template <typename VectorStoreType>
class BoundPrenormalizedAngularDistance final : public BoundDistanceFunction {
private:
using FloatType = VectorStoreType::FloatType;
- const vespalib::hwaccelerated::IAccelrated & _computer;
+ const vespalib::hwaccelerated::IAccelerated & _computer;
mutable VectorStoreType _tmpSpace;
const vespalib::ConstArrayRef<FloatType> _lhs;
double _lhs_norm_sq;
public:
explicit BoundPrenormalizedAngularDistance(TypedCells lhs)
- : _computer(vespalib::hwaccelerated::IAccelrated::getAccelerator()),
+ : _computer(vespalib::hwaccelerated::IAccelerated::getAccelerator()),
_tmpSpace(lhs.size),
_lhs(_tmpSpace.storeLhs(lhs))
{
diff --git a/searchlib/src/vespa/searchlib/tensor/temporary_vector_store.cpp b/searchlib/src/vespa/searchlib/tensor/temporary_vector_store.cpp
index 385c2c5ca66..d57ff575b43 100644
--- a/searchlib/src/vespa/searchlib/tensor/temporary_vector_store.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/temporary_vector_store.cpp
@@ -7,7 +7,7 @@ using vespalib::ConstArrayRef;
using vespalib::ArrayRef;
using vespalib::eval::CellType;
using vespalib::eval::TypedCells;
-using vespalib::hwaccelerated::IAccelrated;
+using vespalib::hwaccelerated::IAccelerated;
namespace search::tensor {
@@ -33,7 +33,7 @@ template<>
ConstArrayRef<float>
convert_cells<vespalib::BFloat16, float>(ArrayRef<float> space, TypedCells cells) noexcept
{
- static const IAccelrated & accelerator = IAccelrated::getAccelerator();
+ static const IAccelerated & accelerator = IAccelerated::getAccelerator();
accelerator.convert_bfloat16_to_float(reinterpret_cast<const uint16_t *>(cells.data), space.data(), space.size());
return space;
}