diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2015-08-06 14:00:26 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2015-08-06 14:00:26 +0200 |
| commit | becd89df294a91ee3e6fefe7f5fc4e0c83dd7895 (patch) | |
| tree | 5be9876fbcb5ffd9ef5d0ca83080bb458faa6b13 /Eigen/src/Core/products/GeneralMatrixMatrix.h | |
| parent | d4f5efc51aaa0d02b6a914968f8d5c6be25c2015 (diff) | |
Enable runtime stack alignment in gemm_blocking_space.
Diffstat (limited to 'Eigen/src/Core/products/GeneralMatrixMatrix.h')
| -rw-r--r-- | Eigen/src/Core/products/GeneralMatrixMatrix.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Eigen/src/Core/products/GeneralMatrixMatrix.h b/Eigen/src/Core/products/GeneralMatrixMatrix.h index be89181ee..3fba82ff8 100644 --- a/Eigen/src/Core/products/GeneralMatrixMatrix.h +++ b/Eigen/src/Core/products/GeneralMatrixMatrix.h @@ -293,8 +293,13 @@ class gemm_blocking_space<StorageOrder,_LhsScalar,_RhsScalar,MaxRows, MaxCols, M SizeB = ActualCols * MaxDepth }; +#if EIGEN_MAX_STATIC_ALIGN_BYTES >= EIGEN_DEFAULT_ALIGN_BYTES EIGEN_ALIGN_MAX LhsScalar m_staticA[SizeA]; EIGEN_ALIGN_MAX RhsScalar m_staticB[SizeB]; +#else + EIGEN_ALIGN_MAX char m_staticA[SizeA * sizeof(LhsScalar) + EIGEN_DEFAULT_ALIGN_BYTES-1]; + EIGEN_ALIGN_MAX char m_staticB[SizeB * sizeof(RhsScalar) + EIGEN_DEFAULT_ALIGN_BYTES-1]; +#endif public: @@ -303,8 +308,13 @@ class gemm_blocking_space<StorageOrder,_LhsScalar,_RhsScalar,MaxRows, MaxCols, M this->m_mc = ActualRows; this->m_nc = ActualCols; this->m_kc = MaxDepth; +#if EIGEN_MAX_STATIC_ALIGN_BYTES >= EIGEN_DEFAULT_ALIGN_BYTES this->m_blockA = m_staticA; this->m_blockB = m_staticB; +#else + this->m_blockA = reinterpret_cast<LhsScalar*>((std::size_t(m_staticA) + (EIGEN_DEFAULT_ALIGN_BYTES-1)) & ~std::size_t(EIGEN_DEFAULT_ALIGN_BYTES-1)); + this->m_blockB = reinterpret_cast<RhsScalar*>((std::size_t(m_staticB) + (EIGEN_DEFAULT_ALIGN_BYTES-1)) & ~std::size_t(EIGEN_DEFAULT_ALIGN_BYTES-1)); +#endif } void initParallel(Index, Index, Index, Index) |