diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-31 17:36:20 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-01 13:00:11 +0300 |
commit | 01c75c3765eb305b1a99b794c1d40ad224b071c6 (patch) | |
tree | a4ee258072c82a9c3b8b581e8a346a8c108f2647 /intern/eigen | |
parent | 719e782f2c790aab7a822ad9e01a4fa8c93b5620 (diff) |
Math: optimizations for 4x4x matrix inverse, multiplications.
In some heavy rigs matrix inverse can be 10% of computation time. This
reduces it to 2% by using Eigen's optimized 4x4 matrix inverse and SSE
matrix multiplication.
Diffstat (limited to 'intern/eigen')
-rw-r--r-- | intern/eigen/CMakeLists.txt | 2 | ||||
-rw-r--r-- | intern/eigen/eigen_capi.h | 1 | ||||
-rw-r--r-- | intern/eigen/intern/matrix.cc | 56 | ||||
-rw-r--r-- | intern/eigen/intern/matrix.h | 40 | ||||
-rw-r--r-- | intern/eigen/intern/svd.cc | 3 |
5 files changed, 102 insertions, 0 deletions
diff --git a/intern/eigen/CMakeLists.txt b/intern/eigen/CMakeLists.txt index 5811b71de94..b2639359318 100644 --- a/intern/eigen/CMakeLists.txt +++ b/intern/eigen/CMakeLists.txt @@ -36,10 +36,12 @@ set(SRC intern/eigenvalues.cc intern/linear_solver.cc + intern/matrix.cc intern/svd.cc intern/eigenvalues.h intern/linear_solver.h + intern/matrix.h intern/svd.h ) diff --git a/intern/eigen/eigen_capi.h b/intern/eigen/eigen_capi.h index be42e340274..7f3267ff508 100644 --- a/intern/eigen/eigen_capi.h +++ b/intern/eigen/eigen_capi.h @@ -29,6 +29,7 @@ #include "intern/eigenvalues.h" #include "intern/linear_solver.h" +#include "intern/matrix.h" #include "intern/svd.h" #endif /* __EIGEN_C_API_H__ */ diff --git a/intern/eigen/intern/matrix.cc b/intern/eigen/intern/matrix.cc new file mode 100644 index 00000000000..cc9e24d2b3c --- /dev/null +++ b/intern/eigen/intern/matrix.cc @@ -0,0 +1,56 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2015 Blender Foundation. + * All rights reserved. + * + * Contributor(s): Blender Foundation, + * Bastien Montagne + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef __EIGEN3_MATRIX_C_API_CC__ +#define __EIGEN3_MATRIX_C_API_CC__ + +/* Eigen gives annoying huge amount of warnings here, silence them! */ +#if defined(__GNUC__) && !defined(__clang__) +# pragma GCC diagnostic ignored "-Wlogical-op" +#endif + +#ifdef __EIGEN3_MATRIX_C_API_CC__ /* quiet warning */ +#endif + +#include <Eigen/Core> +#include <Eigen/Dense> + +#include "matrix.h" + +using Eigen::Map; +using Eigen::Matrix4f; + +bool EIG_invert_m4_m4(float inverse[4][4], const float matrix[4][4]) +{ + Map<Matrix4f> M = Map<Matrix4f>((float*)matrix); + Matrix4f R; + bool invertible = true; + M.computeInverseWithCheck(R, invertible, 0.0f); + memcpy(inverse, R.data(), sizeof(float)*4*4); + return invertible; +} + +#endif /* __EIGEN3_MATRIX_C_API_CC__ */ diff --git a/intern/eigen/intern/matrix.h b/intern/eigen/intern/matrix.h new file mode 100644 index 00000000000..fd0f60fd81c --- /dev/null +++ b/intern/eigen/intern/matrix.h @@ -0,0 +1,40 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2015 Blender Foundation. + * All rights reserved. + * + * Contributor(s): Blender Foundation, + * Bastien Montagne + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef __EIGEN3_MATRIX_C_API_H__ +#define __EIGEN3_MATRIX_C_API_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +bool EIG_invert_m4_m4(float inverse[4][4], const float matrix[4][4]); + +#ifdef __cplusplus +} +#endif + +#endif /* __EIGEN3_MATRIX_C_API_H__ */ diff --git a/intern/eigen/intern/svd.cc b/intern/eigen/intern/svd.cc index 7c331d25aa7..e035f29f5ac 100644 --- a/intern/eigen/intern/svd.cc +++ b/intern/eigen/intern/svd.cc @@ -37,6 +37,7 @@ #include <Eigen/Core> #include <Eigen/SVD> +#include <Eigen/Dense> #include "svd.h" @@ -51,6 +52,8 @@ using Eigen::MatrixXf; using Eigen::VectorXf; using Eigen::Map; +using Eigen::Matrix4f; + void EIG_svd_square_matrix(const int size, const float *matrix, float *r_U, float *r_S, float *r_V) { /* Since our matrix is squared, we can use thinU/V. */ |