Accelrated => Accelerated

6 files changed, 26 insertions, 26 deletions

diff --git a/vespalib/src/tests/dotproduct/dotproductbenchmark.cpp b/vespalib/src/tests/dotproduct/dotproductbenchmark.cpp
index 7d6c7fe8836..ef88c8e94c3 100644
--- a/vespalib/src/tests/dotproduct/dotproductbenchmark.cpp
+++ b/vespalib/src/tests/dotproduct/dotproductbenchmark.cpp
@@ -8,7 +8,7 @@
 #include <functional>
 
 using namespace vespalib;
-using vespalib::hwaccelerated::IAccelrated;
+using vespalib::hwaccelerated::IAccelerated;
 
 class Benchmark {
 public:
@@ -54,14 +54,14 @@ public:
 private:
     std::vector<T> _values;
     std::vector<T> _query;
-    const IAccelrated & _dp;
+    const IAccelerated & _dp;
 };
 
 template <typename T>
 FullBenchmark<T>::FullBenchmark(size_t numDocs, size_t numValues)
     : _values(numDocs*numValues),
       _query(numValues),
-      _dp(IAccelrated::getAccelerator())
+      _dp(IAccelerated::getAccelerator())
 {
     for (size_t i(0); i < numDocs; i++) {
         for (size_t j(0); j < numValues; j++) {
diff --git a/vespalib/src/tests/hwaccelerated/hwaccelerated_bench.cpp b/vespalib/src/tests/hwaccelerated/hwaccelerated_bench.cpp
index 2891c3ee340..cebdeeab28b 100644
--- a/vespalib/src/tests/hwaccelerated/hwaccelerated_bench.cpp
+++ b/vespalib/src/tests/hwaccelerated/hwaccelerated_bench.cpp
@@ -18,7 +18,7 @@ std::vector<T> createAndFill(size_t sz) {
 
 template<typename T>
 void
-benchmarkEuclideanDistance(const hwaccelerated::IAccelrated & accel, size_t sz, size_t count) {
+benchmarkEuclideanDistance(const hwaccelerated::IAccelerated & accel, size_t sz, size_t count) {
     srand(1);
     std::vector<T> a = createAndFill<T>(sz);
     std::vector<T> b = createAndFill<T>(sz);
@@ -33,7 +33,7 @@ benchmarkEuclideanDistance(const hwaccelerated::IAccelrated & accel, size_t sz,
 }
 
 void
-benchMarkEuclidianDistance(const hwaccelerated::IAccelrated & accelrator, size_t sz, size_t count) {
+benchMarkEuclidianDistance(const hwaccelerated::IAccelerated & accelrator, size_t sz, size_t count) {
     printf("double : ");
     benchmarkEuclideanDistance<double>(accelrator, sz, count);
     printf("float  : ");
@@ -55,6 +55,6 @@ int main(int argc, char *argv[]) {
     printf("Squared Euclidian Distance - Generic\n");
     benchMarkEuclidianDistance(hwaccelerated::GenericAccelrator(), length, count);
     printf("Squared Euclidian Distance - Optimized for this cpu\n");
-    benchMarkEuclidianDistance(hwaccelerated::IAccelrated::getAccelerator(), length, count);
+    benchMarkEuclidianDistance(hwaccelerated::IAccelerated::getAccelerator(), length, count);
     return 0;
 }
diff --git a/vespalib/src/tests/hwaccelerated/hwaccelerated_test.cpp b/vespalib/src/tests/hwaccelerated/hwaccelerated_test.cpp
index ebb9010a417..3305b911de3 100644
--- a/vespalib/src/tests/hwaccelerated/hwaccelerated_test.cpp
+++ b/vespalib/src/tests/hwaccelerated/hwaccelerated_test.cpp
@@ -18,7 +18,7 @@ std::vector<T> createAndFill(size_t sz) {
 }
 
 template<typename T, typename P>
-void verifyEuclideanDistance(const hwaccelerated::IAccelrated & accel, size_t testLength, double approxFactor) {
+void verifyEuclideanDistance(const hwaccelerated::IAccelerated & accel, size_t testLength, double approxFactor) {
     srand(1);
     std::vector<T> a = createAndFill<T>(testLength);
     std::vector<T> b = createAndFill<T>(testLength);
@@ -34,7 +34,7 @@ void verifyEuclideanDistance(const hwaccelerated::IAccelrated & accel, size_t te
 }
 
 void
-verifyEuclideanDistance(const hwaccelerated::IAccelrated & accelrator, size_t testLength) {
+verifyEuclideanDistance(const hwaccelerated::IAccelerated & accelrator, size_t testLength) {
     verifyEuclideanDistance<int8_t, double>(accelrator, testLength, 0.0);
     verifyEuclideanDistance<float, double>(accelrator, testLength, 0.0001); // Small deviation requiring EXPECT_APPROX
     verifyEuclideanDistance<double, double>(accelrator, testLength, 0.0);
@@ -44,7 +44,7 @@ TEST("test euclidean distance") {
     hwaccelerated::GenericAccelrator genericAccelrator;
     constexpr size_t TEST_LENGTH = 140000; // must be longer than 64k
     TEST_DO(verifyEuclideanDistance(hwaccelerated::GenericAccelrator(), TEST_LENGTH));
-    TEST_DO(verifyEuclideanDistance(hwaccelerated::IAccelrated::getAccelerator(), TEST_LENGTH));
+    TEST_DO(verifyEuclideanDistance(hwaccelerated::IAccelerated::getAccelerator(), TEST_LENGTH));
 }
 
 TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/vespalib/src/vespa/vespalib/hwaccelerated/generic.h b/vespalib/src/vespa/vespalib/hwaccelerated/generic.h
index 313d36a6f43..5a7a543aff7 100644
--- a/vespalib/src/vespa/vespalib/hwaccelerated/generic.h
+++ b/vespalib/src/vespa/vespalib/hwaccelerated/generic.h
@@ -9,7 +9,7 @@ namespace vespalib::hwaccelerated {
 /**
  * Generic cpu agnostic implementation.
  */
-class GenericAccelrator : public IAccelrated
+class GenericAccelrator : public IAccelerated
 {
 public:
     float dotProduct(const float * a, const float * b, size_t sz) const noexcept override;
diff --git a/vespalib/src/vespa/vespalib/hwaccelerated/iaccelerated.cpp b/vespalib/src/vespa/vespalib/hwaccelerated/iaccelerated.cpp
index ad746a072de..10b4661894e 100644
--- a/vespalib/src/vespa/vespalib/hwaccelerated/iaccelerated.cpp
+++ b/vespalib/src/vespa/vespalib/hwaccelerated/iaccelerated.cpp
@@ -17,7 +17,7 @@ namespace vespalib::hwaccelerated {
 
 namespace {
 
-IAccelrated::UP create_accelerator() {
+IAccelerated::UP create_accelerator() {
 #ifdef __x86_64__
     __builtin_cpu_init();
     if (__builtin_cpu_supports("avx512f")) {
@@ -41,7 +41,7 @@ std::vector<T> createAndFill(size_t sz) {
 
 template<typename T>
 void
-verifyDotproduct(const IAccelrated & accel)
+verifyDotproduct(const IAccelerated & accel)
 {
     const size_t testLength(255);
     srand(1);
@@ -62,7 +62,7 @@ verifyDotproduct(const IAccelrated & accel)
 
 template<typename T>
 void
-verifyEuclideanDistance(const IAccelrated & accel) {
+verifyEuclideanDistance(const IAccelerated & accel) {
     const size_t testLength(255);
     srand(1);
     std::vector<T> a = createAndFill<T>(testLength);
@@ -81,7 +81,7 @@ verifyEuclideanDistance(const IAccelrated & accel) {
 }
 
 void
-verifyPopulationCount(const IAccelrated & accel)
+verifyPopulationCount(const IAccelerated & accel)
 {
     const uint64_t words[7] = {0x123456789abcdef0L,  // 32
                                0x0000000000000000L,  // 0
@@ -140,7 +140,7 @@ bool shouldInvert(bool invertSome) {
 }
 
 void
-verifyOr64(const IAccelrated & accel, const std::vector<std::vector<uint64_t>> & vectors,
+verifyOr64(const IAccelerated & accel, const std::vector<std::vector<uint64_t>> & vectors,
            size_t offset, size_t num_vectors, bool invertSome)
 {
     std::vector<std::pair<const void *, bool>> vRefs;
@@ -162,7 +162,7 @@ verifyOr64(const IAccelrated & accel, const std::vector<std::vector<uint64_t>> &
 }
 
 void
-verifyAnd64(const IAccelrated & accel, const std::vector<std::vector<uint64_t>> & vectors,
+verifyAnd64(const IAccelerated & accel, const std::vector<std::vector<uint64_t>> & vectors,
            size_t offset, size_t num_vectors, bool invertSome)
 {
     std::vector<std::pair<const void *, bool>> vRefs;
@@ -183,7 +183,7 @@ verifyAnd64(const IAccelrated & accel, const std::vector<std::vector<uint64_t>>
 }
 
 void
-verifyOr64(const IAccelrated & accel) {
+verifyOr64(const IAccelerated & accel) {
     std::vector<std::vector<uint64_t>> vectors(3) ;
     for (auto & v : vectors) {
         fill(v, 32);
@@ -197,7 +197,7 @@ verifyOr64(const IAccelrated & accel) {
 }
 
 void
-verifyAnd64(const IAccelrated & accel) {
+verifyAnd64(const IAccelerated & accel) {
     std::vector<std::vector<uint64_t>> vectors(3);
     for (auto & v : vectors) {
         fill(v, 32);
@@ -215,7 +215,7 @@ class RuntimeVerificator
 public:
     RuntimeVerificator();
 private:
-    static void verify(const IAccelrated & accelerated) {
+    static void verify(const IAccelerated & accelerated) {
         verifyDotproduct<float>(accelerated);
         verifyDotproduct<double>(accelerated);
         verifyDotproduct<int32_t>(accelerated);
@@ -236,11 +236,11 @@ RuntimeVerificator::RuntimeVerificator()
 
 }
 
-const IAccelrated &
-IAccelrated::getAccelerator()
+const IAccelerated &
+IAccelerated::getAccelerator()
 {
     static RuntimeVerificator verifyAccelrator_once;
-    static IAccelrated::UP accelrator = create_accelerator();
+    static IAccelerated::UP accelrator = create_accelerator();
     return *accelrator;
 }
 
diff --git a/vespalib/src/vespa/vespalib/hwaccelerated/iaccelerated.h b/vespalib/src/vespa/vespalib/hwaccelerated/iaccelerated.h
index bf9daf3f073..400c73772b2 100644
--- a/vespalib/src/vespa/vespalib/hwaccelerated/iaccelerated.h
+++ b/vespalib/src/vespa/vespalib/hwaccelerated/iaccelerated.h
@@ -12,11 +12,11 @@ namespace vespalib::hwaccelerated {
  * This contains an interface to all primitives that has different cpu supported accelrations.
  * The actual implementation you get by calling the the static getAccelrator method.
  */
-class IAccelrated
+class IAccelerated
 {
 public:
-    virtual ~IAccelrated() = default;
-    using UP = std::unique_ptr<IAccelrated>;
+    virtual ~IAccelerated() = default;
+    using UP = std::unique_ptr<IAccelerated>;
     virtual float dotProduct(const float * a, const float * b, size_t sz) const noexcept = 0;
     virtual double dotProduct(const double * a, const double * b, size_t sz) const noexcept = 0;
     virtual int64_t dotProduct(const int8_t * a, const int8_t * b, size_t sz) const noexcept = 0;
@@ -37,7 +37,7 @@ public:
     // OR 128 bytes from multiple, optionally inverted sources
     virtual void or128(size_t offset, const std::vector<std::pair<const void *, bool>> &src, void *dest) const noexcept = 0;
 
-    static const IAccelrated & getAccelerator() __attribute__((noinline));
+    static const IAccelerated & getAccelerator() __attribute__((noinline));
 };
 
 }