diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-06-19 09:43:05 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-06-19 09:43:05 +0000 |
commit | b079f8a9440eeaccb22bc0867cd883cf4e03332a (patch) | |
tree | 46ebd65a5b2d40ecfc1cadc23ef1c52204588add /vespalib/src | |
parent | 1f0e68e758e3779aab26b8389b142acf20239406 (diff) |
hwaccelrated => hwaccelerated
Diffstat (limited to 'vespalib/src')
-rw-r--r-- | vespalib/src/tests/dotproduct/dotproductbenchmark.cpp | 4 | ||||
-rw-r--r-- | vespalib/src/tests/hwaccelerated/.gitignore | 1 | ||||
-rw-r--r-- | vespalib/src/tests/hwaccelerated/CMakeLists.txt | 17 | ||||
-rw-r--r-- | vespalib/src/tests/hwaccelerated/hwaccelerated_bench.cpp (renamed from vespalib/src/tests/hwaccelrated/hwaccelrated_bench.cpp) | 12 | ||||
-rw-r--r-- | vespalib/src/tests/hwaccelerated/hwaccelerated_test.cpp (renamed from vespalib/src/tests/hwaccelrated/hwaccelrated_test.cpp) | 16 | ||||
-rw-r--r-- | vespalib/src/tests/hwaccelrated/.gitignore | 1 | ||||
-rw-r--r-- | vespalib/src/tests/hwaccelrated/CMakeLists.txt | 17 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/hwaccelerated/CMakeLists.txt (renamed from vespalib/src/vespa/vespalib/hwaccelrated/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/hwaccelerated/avx2.cpp (renamed from vespalib/src/vespa/vespalib/hwaccelrated/avx2.cpp) | 2 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/hwaccelerated/avx2.h (renamed from vespalib/src/vespa/vespalib/hwaccelrated/avx2.h) | 2 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/hwaccelerated/avx512.cpp (renamed from vespalib/src/vespa/vespalib/hwaccelrated/avx512.cpp) | 2 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/hwaccelerated/avx512.h (renamed from vespalib/src/vespa/vespalib/hwaccelrated/avx512.h) | 2 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/hwaccelerated/avxprivate.hpp (renamed from vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp) | 2 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/hwaccelerated/generic.cpp (renamed from vespalib/src/vespa/vespalib/hwaccelrated/generic.cpp) | 2 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/hwaccelerated/generic.h (renamed from vespalib/src/vespa/vespalib/hwaccelrated/generic.h) | 2 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/hwaccelerated/iaccelrated.cpp (renamed from vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.cpp) | 4 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/hwaccelerated/iaccelrated.h (renamed from vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.h) | 2 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/hwaccelerated/private_helpers.hpp (renamed from vespalib/src/vespa/vespalib/hwaccelrated/private_helpers.hpp) | 2 |
18 files changed, 45 insertions, 45 deletions
diff --git a/vespalib/src/tests/dotproduct/dotproductbenchmark.cpp b/vespalib/src/tests/dotproduct/dotproductbenchmark.cpp index ce97683d1fc..17a13eecb5d 100644 --- a/vespalib/src/tests/dotproduct/dotproductbenchmark.cpp +++ b/vespalib/src/tests/dotproduct/dotproductbenchmark.cpp @@ -1,5 +1,5 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/hwaccelrated/iaccelrated.h> +#include <vespa/vespalib/hwaccelerated/iaccelrated.h> #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/stllike/hash_map.h> #include <iostream> @@ -8,7 +8,7 @@ #include <functional> using namespace vespalib; -using vespalib::hwaccelrated::IAccelrated; +using vespalib::hwaccelerated::IAccelrated; class Benchmark { public: diff --git a/vespalib/src/tests/hwaccelerated/.gitignore b/vespalib/src/tests/hwaccelerated/.gitignore new file mode 100644 index 00000000000..659184bbac3 --- /dev/null +++ b/vespalib/src/tests/hwaccelerated/.gitignore @@ -0,0 +1 @@ +vespalib_hwaccelerated_bench_app diff --git a/vespalib/src/tests/hwaccelerated/CMakeLists.txt b/vespalib/src/tests/hwaccelerated/CMakeLists.txt new file mode 100644 index 00000000000..044cfa2e9a3 --- /dev/null +++ b/vespalib/src/tests/hwaccelerated/CMakeLists.txt @@ -0,0 +1,17 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_hwaccelerated_test_app TEST + SOURCES + hwaccelerated_test.cpp + DEPENDS + vespalib + vespa_hwaccelerated +) +vespa_add_test(NAME vespalib_hwaccelerated_test_app COMMAND vespalib_hwaccelerated_test_app) + +vespa_add_executable(vespalib_hwaccelerated_bench_app + SOURCES + hwaccelerated_bench.cpp + DEPENDS + vespalib + vespa_hwaccelerated +) diff --git a/vespalib/src/tests/hwaccelrated/hwaccelrated_bench.cpp b/vespalib/src/tests/hwaccelerated/hwaccelerated_bench.cpp index 61c53a20cf5..8c97c630ebc 100644 --- a/vespalib/src/tests/hwaccelrated/hwaccelrated_bench.cpp +++ b/vespalib/src/tests/hwaccelerated/hwaccelerated_bench.cpp @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/hwaccelrated/iaccelrated.h> -#include <vespa/vespalib/hwaccelrated/generic.h> +#include <vespa/vespalib/hwaccelerated/iaccelrated.h> +#include <vespa/vespalib/hwaccelerated/generic.h> #include <vespa/vespalib/util/time.h> #include <cinttypes> @@ -18,7 +18,7 @@ std::vector<T> createAndFill(size_t sz) { template<typename T> void -benchmarkEuclideanDistance(const hwaccelrated::IAccelrated & accel, size_t sz, size_t count) { +benchmarkEuclideanDistance(const hwaccelerated::IAccelrated & 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 hwaccelrated::IAccelrated & accel, size_t sz, s } void -benchMarkEuclidianDistance(const hwaccelrated::IAccelrated & accelrator, size_t sz, size_t count) { +benchMarkEuclidianDistance(const hwaccelerated::IAccelrated & accelrator, size_t sz, size_t count) { printf("double : "); benchmarkEuclideanDistance<double>(accelrator, sz, count); printf("float : "); @@ -53,8 +53,8 @@ int main(int argc, char *argv[]) { } printf("%s %d %d\n", argv[0], length, count); printf("Squared Euclidian Distance - Generic\n"); - benchMarkEuclidianDistance(hwaccelrated::GenericAccelrator(), length, count); + benchMarkEuclidianDistance(hwaccelerated::GenericAccelrator(), length, count); printf("Squared Euclidian Distance - Optimized for this cpu\n"); - benchMarkEuclidianDistance(hwaccelrated::IAccelrated::getAccelerator(), length, count); + benchMarkEuclidianDistance(hwaccelerated::IAccelrated::getAccelerator(), length, count); return 0; } diff --git a/vespalib/src/tests/hwaccelrated/hwaccelrated_test.cpp b/vespalib/src/tests/hwaccelerated/hwaccelerated_test.cpp index e35efb20c1a..0e0025371e2 100644 --- a/vespalib/src/tests/hwaccelrated/hwaccelrated_test.cpp +++ b/vespalib/src/tests/hwaccelerated/hwaccelerated_test.cpp @@ -1,10 +1,10 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/hwaccelrated/iaccelrated.h> -#include <vespa/vespalib/hwaccelrated/generic.h> +#include <vespa/vespalib/hwaccelerated/iaccelrated.h> +#include <vespa/vespalib/hwaccelerated/generic.h> #include <vespa/log/log.h> -LOG_SETUP("hwaccelrated_test"); +LOG_SETUP("hwaccelerated_test"); using namespace vespalib; @@ -18,7 +18,7 @@ std::vector<T> createAndFill(size_t sz) { } template<typename T, typename P> -void verifyEuclideanDistance(const hwaccelrated::IAccelrated & accel, size_t testLength, double approxFactor) { +void verifyEuclideanDistance(const hwaccelerated::IAccelrated & accel, size_t testLength, double approxFactor) { srand(1); std::vector<T> a = createAndFill<T>(testLength); std::vector<T> b = createAndFill<T>(testLength); @@ -34,17 +34,17 @@ void verifyEuclideanDistance(const hwaccelrated::IAccelrated & accel, size_t tes } void -verifyEuclideanDistance(const hwaccelrated::IAccelrated & accelrator, size_t testLength) { +verifyEuclideanDistance(const hwaccelerated::IAccelrated & 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); } TEST("test euclidean distance") { - hwaccelrated::GenericAccelrator genericAccelrator; + hwaccelerated::GenericAccelrator genericAccelrator; constexpr size_t TEST_LENGTH = 140000; // must be longer than 64k - TEST_DO(verifyEuclideanDistance(hwaccelrated::GenericAccelrator(), TEST_LENGTH)); - TEST_DO(verifyEuclideanDistance(hwaccelrated::IAccelrated::getAccelerator(), TEST_LENGTH)); + TEST_DO(verifyEuclideanDistance(hwaccelerated::GenericAccelrator(), TEST_LENGTH)); + TEST_DO(verifyEuclideanDistance(hwaccelerated::IAccelrated::getAccelerator(), TEST_LENGTH)); } TEST_MAIN() { TEST_RUN_ALL(); } diff --git a/vespalib/src/tests/hwaccelrated/.gitignore b/vespalib/src/tests/hwaccelrated/.gitignore deleted file mode 100644 index 42f73a39d78..00000000000 --- a/vespalib/src/tests/hwaccelrated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -vespalib_hwaccelrated_bench_app diff --git a/vespalib/src/tests/hwaccelrated/CMakeLists.txt b/vespalib/src/tests/hwaccelrated/CMakeLists.txt deleted file mode 100644 index 2064dc8e7ef..00000000000 --- a/vespalib/src/tests/hwaccelrated/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(vespalib_hwaccelrated_test_app TEST - SOURCES - hwaccelrated_test.cpp - DEPENDS - vespalib - vespa_hwaccelerated -) -vespa_add_test(NAME vespalib_hwaccelrated_test_app COMMAND vespalib_hwaccelrated_test_app) - -vespa_add_executable(vespalib_hwaccelrated_bench_app - SOURCES - hwaccelrated_bench.cpp - DEPENDS - vespalib - vespa_hwaccelerated -) diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/CMakeLists.txt b/vespalib/src/vespa/vespalib/hwaccelerated/CMakeLists.txt index e2485543b33..e2485543b33 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/CMakeLists.txt +++ b/vespalib/src/vespa/vespalib/hwaccelerated/CMakeLists.txt diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/avx2.cpp b/vespalib/src/vespa/vespalib/hwaccelerated/avx2.cpp index 3b63a904b2f..9dbc8d92034 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/avx2.cpp +++ b/vespalib/src/vespa/vespalib/hwaccelerated/avx2.cpp @@ -3,7 +3,7 @@ #include "avx2.h" #include "avxprivate.hpp" -namespace vespalib::hwaccelrated { +namespace vespalib::hwaccelerated { size_t Avx2Accelrator::populationCount(const uint64_t *a, size_t sz) const noexcept { diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/avx2.h b/vespalib/src/vespa/vespalib/hwaccelerated/avx2.h index 279483fcec3..b970e1529e8 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/avx2.h +++ b/vespalib/src/vespa/vespalib/hwaccelerated/avx2.h @@ -4,7 +4,7 @@ #include "generic.h" -namespace vespalib::hwaccelrated { +namespace vespalib::hwaccelerated { /** * Avx-512 implementation. diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/avx512.cpp b/vespalib/src/vespa/vespalib/hwaccelerated/avx512.cpp index aec81c718c7..dd2924856c0 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/avx512.cpp +++ b/vespalib/src/vespa/vespalib/hwaccelerated/avx512.cpp @@ -3,7 +3,7 @@ #include "avx512.h" #include "avxprivate.hpp" -namespace vespalib:: hwaccelrated { +namespace vespalib:: hwaccelerated { float Avx512Accelrator::dotProduct(const float * af, const float * bf, size_t sz) const noexcept { diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/avx512.h b/vespalib/src/vespa/vespalib/hwaccelerated/avx512.h index 49d2dc63f77..f226b7f2225 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/avx512.h +++ b/vespalib/src/vespa/vespalib/hwaccelerated/avx512.h @@ -4,7 +4,7 @@ #include "avx2.h" -namespace vespalib::hwaccelrated { +namespace vespalib::hwaccelerated { /** * Avx-512 implementation. diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp b/vespalib/src/vespa/vespalib/hwaccelerated/avxprivate.hpp index 602faeb4dc0..7e5bb012099 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp +++ b/vespalib/src/vespa/vespalib/hwaccelerated/avxprivate.hpp @@ -4,7 +4,7 @@ #include "private_helpers.hpp" -namespace vespalib::hwaccelrated::avx { +namespace vespalib::hwaccelerated::avx { namespace { diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/generic.cpp b/vespalib/src/vespa/vespalib/hwaccelerated/generic.cpp index 4ac99d90a7e..bef2cb947a6 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/generic.cpp +++ b/vespalib/src/vespa/vespalib/hwaccelerated/generic.cpp @@ -4,7 +4,7 @@ #include "private_helpers.hpp" #include <cblas.h> -namespace vespalib::hwaccelrated { +namespace vespalib::hwaccelerated { namespace { diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/generic.h b/vespalib/src/vespa/vespalib/hwaccelerated/generic.h index fee1fec6165..30cffd79f20 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/generic.h +++ b/vespalib/src/vespa/vespalib/hwaccelerated/generic.h @@ -4,7 +4,7 @@ #include "iaccelrated.h" -namespace vespalib::hwaccelrated { +namespace vespalib::hwaccelerated { /** * Generic cpu agnostic implementation. diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.cpp b/vespalib/src/vespa/vespalib/hwaccelerated/iaccelrated.cpp index 01f4223c5b0..f81a2abd653 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.cpp +++ b/vespalib/src/vespa/vespalib/hwaccelerated/iaccelrated.cpp @@ -11,9 +11,9 @@ #include <vector> #include <vespa/log/log.h> -LOG_SETUP(".vespalib.hwaccelrated"); +LOG_SETUP(".vespalib.hwaccelerated"); -namespace vespalib::hwaccelrated { +namespace vespalib::hwaccelerated { namespace { diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.h b/vespalib/src/vespa/vespalib/hwaccelerated/iaccelrated.h index 337dc3b4ab1..bf9daf3f073 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.h +++ b/vespalib/src/vespa/vespalib/hwaccelerated/iaccelrated.h @@ -6,7 +6,7 @@ #include <cstdint> #include <vector> -namespace vespalib::hwaccelrated { +namespace vespalib::hwaccelerated { /** * This contains an interface to all primitives that has different cpu supported accelrations. diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/private_helpers.hpp b/vespalib/src/vespa/vespalib/hwaccelerated/private_helpers.hpp index 236d2a135a5..245916e08d3 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/private_helpers.hpp +++ b/vespalib/src/vespa/vespalib/hwaccelerated/private_helpers.hpp @@ -6,7 +6,7 @@ #include <vespa/vespalib/util/optimized.h> #include <cstring> -namespace vespalib::hwaccelrated::helper { +namespace vespalib::hwaccelerated::helper { namespace { inline size_t |