Xsimd

.github/workflows/cmake.yml

@@ -21,7 +21,17 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Install APT packages
-      run: sudo apt install clang libboost-exception-dev libbenchmark-dev -y
+      run: |
+        sudo apt-get update
+        sudo apt install libboost-exception-dev libbenchmark-dev -y
+
+    - name: Install LLVM and Clang 18
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y wget gnupg lsb-release
+        wget https://apt.llvm.org/llvm.sh
+        chmod +x llvm.sh
+        sudo ./llvm.sh 18
 
     - name: Install Blaze
       run: |
@@ -36,6 +46,13 @@ jobs:
         -DCMAKE_INSTALL_PREFIX=/usr/local/ . \
         && sudo make install
 
+    - name: Install xsimd
+      run: |
+        git clone https://github.com/xtensor-stack/xsimd.git
+        cd xsimd
+        cmake -B build -DCMAKE_INSTALL_PREFIX=/usr/local/ .
+        sudo cmake --build build --target install
+
     - name: Install GTest
       run: |
         git clone https://github.com/google/googletest.git
@@ -47,7 +64,7 @@ jobs:
       run: |
         cmake -B ${{github.workspace}}/build \
         -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
-        -DCMAKE_CXX_COMPILER=clang++ \
+        -DCMAKE_CXX_COMPILER=clang++-18 \
         -DBLAST_WITH_BENCHMARK=ON \
         -DBLAST_WITH_TEST=ON
 
@@ -60,4 +77,3 @@ jobs:
       # Execute tests defined by the CMake configuration.
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
       run: ctest -C ${{env.BUILD_TYPE}}
-

CMakeLists.txt

@@ -25,6 +25,7 @@ set(CMAKE_DEBUG_POSTFIX d)
 
 find_package(Boost REQUIRED COMPONENTS exception)
 find_package(blaze REQUIRED)
+find_package(xsimd REQUIRED)
 
 add_library(blast INTERFACE)
 
@@ -35,6 +36,7 @@ target_include_directories(blast INTERFACE
 
 target_link_libraries(blast
     INTERFACE blaze::blaze
+    INTERFACE xsimd
 )
 
 target_compile_options(blast

Dockerfile

@@ -56,7 +56,7 @@ ENV PKG_CONFIG_PATH=/usr/local/lib
 RUN mkdir -p blast/build && cd blast/build \
     && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_CXX_COMPILER="clang++-15" \
-        -DCMAKE_CXX_FLAGS="-march=native -mfma -mavx -mavx2 -msse4 -fno-math-errno" \
+        -DCMAKE_CXX_FLAGS="-march=native -mfma -mavx -mavx2 -msse4 -fno-math-errno -DXSIMD_DEFAULT_ARCH='fma3<avx2>'" \
         -DCMAKE_CXX_FLAGS_RELEASE="-O3 -g -DNDEBUG -ffast-math" .. \
         -DBLAST_WITH_TEST=ON \
         -DBLAST_WITH_BENCHMARK=ON \
@@ -79,4 +79,3 @@ CMD mkdir -p blast/bench_result/data \
     && mkdir -p blast/bench_result/image \
     && cd blast \
     && make -j 1 bench_result/image/dgemm_performance.png bench_result/image/dgemm_performance_ratio.png
-

include/blast/math/RegisterMatrix.hpp

@@ -7,6 +7,3 @@
 
 #include <blast/math/register_matrix/RegisterMatrix.hpp>
 #include <blast/math/register_matrix/DynamicRegisterMatrix.hpp>
-#include <blast/math/register_matrix/double_4_4_4.hpp>
-#include <blast/math/register_matrix/double_8_4_4.hpp>
-#include <blast/math/register_matrix/double_12_4_4.hpp>

include/blast/math/RowColumnVectorPointer.hpp

@@ -15,7 +15,7 @@
 #pragma once
 
 #include <blast/math/typetraits/MatrixPointer.hpp>
-#include <blast/math/simd/Simd.hpp>
+#include <blast/math/Simd.hpp>
 #include <blast/math/TransposeFlag.hpp>
 #include <blast/util/Assert.hpp>
 
@@ -28,9 +28,9 @@ namespace blast
     {
     public:
         using ElementType = typename MP::ElementType;
-        using IntrinsicType = typename Simd<std::remove_cv_t<ElementType>>::IntrinsicType;
-        using MaskType = typename Simd<std::remove_cv_t<ElementType>>::MaskType;
         using SimdVecType = SimdVec<std::remove_cv_t<ElementType>>;
+        using IntrinsicType = SimdVecType::IntrinsicType;
+        using MaskType = SimdMask<std::remove_cv_t<ElementType>>;
 
         static TransposeFlag constexpr transposeFlag = TF;
         static bool constexpr aligned = MP::aligned;
@@ -176,7 +176,7 @@ namespace blast
 
 
     private:
-        static size_t constexpr SS = Simd<std::remove_cv_t<ElementType>>::size;
+        static size_t constexpr SS = SimdVecType::size();
 
         MP ptr_;
     };
@@ -244,4 +244,4 @@ namespace blast
     {
         return RowColumnVectorPointer<MP, rowVector> {std::move(p)};
     }
-}
+}

include/blast/math/Simd.hpp

@@ -0,0 +1,12 @@
+// Copyright (c) 2019-2020 Mikhail Katliar All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#pragma once
+
+#include <blast/math/simd/SimdVec.hpp>
+#include <blast/math/simd/SimdMask.hpp>
+#include <blast/math/simd/SimdIndex.hpp>
+#include <blast/math/simd/SimdSize.hpp>
+#include <blast/math/simd/IsSimdAligned.hpp>
+#include <blast/math/simd/RegisterCapacity.hpp>

include/blast/math/dense/DynamicMatrixPointer.hpp

@@ -8,24 +8,21 @@
 #include <blast/math/TransposeFlag.hpp>
 #include <blast/math/StorageOrder.hpp>
 #include <blast/math/TypeTraits.hpp>
-#include <blast/math/simd/Simd.hpp>
-#include <blast/math/simd/IsSimdAligned.hpp>
+#include <blast/math/Simd.hpp>
 #include <blast/util/Assert.hpp>
-
 #include <blaze/util/Exception.h>
 
 
-
 namespace blast
 {
     template <typename T, bool SO, bool AF, bool PF>
     class DynamicMatrixPointer
     {
     public:
         using ElementType = T;
-        using IntrinsicType = typename Simd<std::remove_cv_t<T>>::IntrinsicType;
-        using MaskType = typename Simd<std::remove_cv_t<T>>::MaskType;
         using SimdVecType = SimdVec<std::remove_cv_t<T>>;
+        using IntrinsicType = SimdVecType::IntrinsicType;
+        using MaskType = SimdMask<std::remove_cv_t<T>>;
 
         static bool constexpr storageOrder = SO;
         static bool constexpr aligned = AF;
@@ -83,9 +80,9 @@ namespace blast
         }
 
 
-        IntrinsicType broadcast() const noexcept
+        SimdVecType broadcast() const noexcept
         {
-            return blast::broadcast<SS>(ptr_);
+            return *ptr_;
         }
 
 
@@ -187,7 +184,7 @@ namespace blast
 
 
     private:
-        static size_t constexpr SS = Simd<std::remove_cv_t<T>>::size;
+        static size_t constexpr SS = SimdVecType::size();
         static TransposeFlag constexpr majorOrientation = SO == columnMajor ? columnVector : rowVector;
 
 
@@ -253,4 +250,4 @@ namespace blast
     {
         return {p, spacing};
     }
-}
+}

include/blast/math/dense/DynamicVectorPointer.hpp

@@ -4,8 +4,7 @@
 
 #pragma once
 
-
-#include <blast/math/simd/Simd.hpp>
+#include <blast/math/Simd.hpp>
 #include <blast/util/Assert.hpp>
 
 #include <type_traits>
@@ -18,9 +17,9 @@ namespace blast
     {
     public:
         using ElementType = T;
-        using IntrinsicType = typename Simd<std::remove_cv_t<T>>::IntrinsicType;
-        using MaskType = typename Simd<std::remove_cv_t<T>>::MaskType;
         using SimdVecType = SimdVec<std::remove_cv_t<T>>;
+        using IntrinsicType = SimdVecType::IntrinsicType;
+        using MaskType = SimdMask<std::remove_cv_t<T>>;
 
         static bool constexpr transposeFlag = TF;
         static bool constexpr aligned = AF;
@@ -40,7 +39,7 @@ namespace blast
         ,   spacing_ {spacing}
         {
             BLAST_USER_ASSERT(spacing > 0, "Vector element spacing must be positive.");
-            BLAST_USER_ASSERT(!AF || reinterpret_cast<ptrdiff_t>(ptr) % (SS * sizeof(T)) == 0, "Pointer is not aligned");
+            BLAST_USER_ASSERT(!AF || isSimdAligned(ptr), "Pointer is not aligned");
         }
 
 
@@ -51,6 +50,7 @@ namespace blast
         SimdVecType load() const noexcept
         {
             // Non-optimized
+            // TODO: use gather()
             IntrinsicType v;
             for (size_t i = 0; i < SS; ++i)
                 v[i] = ptr_[spacing_ * i];
@@ -62,18 +62,18 @@ namespace blast
         SimdVecType load(MaskType mask) const noexcept
         {
             // Non-optimized
-            IntrinsicType v = blast::setzero<std::remove_cv_t<ElementType>, SS>();
+            // TODO: use gather()
+            T v[SS];
             for (size_t i = 0; i < SS; ++i)
-                if (mask[i])
-                    v[i] = ptr_[spacing_ * i];
+                v[i] = mask[i] ? ptr_[spacing_ * i] : T {};
 
-            return SimdVecType {v};
+            return SimdVecType {v, false};
         }
 
 
-        IntrinsicType broadcast() const noexcept
+        SimdVecType broadcast() const noexcept
         {
-            return blast::broadcast<SS>(ptr_);
+            return *ptr_;
         }
 
 
@@ -172,7 +172,7 @@ namespace blast
 
 
     private:
-        static size_t constexpr SS = Simd<std::remove_cv_t<T>>::size;
+        static size_t constexpr SS = SimdVecType::size();
 
 
         T * ptrOffset(ptrdiff_t i) const noexcept
@@ -191,4 +191,4 @@ namespace blast
     {
         return p.trans();
     }
-}
+}

include/blast/math/dense/Iamax.hpp

@@ -17,7 +17,6 @@
 
 #include <blast/util/Exception.hpp>
 #include <blast/math/dense/VectorPointer.hpp>
-#include <blast/math/simd/Avx256.hpp>
 
 #include <cmath>
 #include <tuple>
@@ -177,4 +176,4 @@ namespace blast
 
         return iamax(N, ptr(*x));
     }
-}
+}

include/blast/math/dense/StaticMatrixPointer.hpp

@@ -6,8 +6,8 @@
 
 #include <blast/math/StorageOrder.hpp>
 #include <blast/math/TransposeFlag.hpp>
-#include <blast/math/simd/Simd.hpp>
 #include <blast/math/simd/SimdVec.hpp>
+#include <blast/math/simd/SimdMask.hpp>
 #include <blast/math/simd/IsSimdAligned.hpp>
 #include <blast/math/TypeTraits.hpp>
 #include <blast/util/Assert.hpp>
@@ -24,9 +24,9 @@ namespace blast
     {
     public:
         using ElementType = T;
-        using IntrinsicType = typename Simd<std::remove_cv_t<T>>::IntrinsicType;
-        using MaskType = typename Simd<std::remove_cv_t<T>>::MaskType;
         using SimdVecType = SimdVec<std::remove_cv_t<T>>;
+        using IntrinsicType = SimdVecType::IntrinsicType;
+        using MaskType = SimdMask<std::remove_cv_t<T>>;
 
         static bool constexpr storageOrder = SO;
         static bool constexpr aligned = AF;
@@ -188,7 +188,7 @@ namespace blast
 
 
     private:
-        static size_t constexpr SS = Simd<std::remove_cv_t<T>>::size;
+        static size_t constexpr SS = SimdVecType::size();
         static TransposeFlag constexpr majorOrientation = SO == columnMajor ? columnVector : rowVector;
 
 
@@ -225,4 +225,4 @@ namespace blast
     {
         return trans(ptr<AF>(m.operand(), j, i));
     }
-}
+}