diff options
author | 2016-10-06 17:57:04 -0700 | |
---|---|---|
committer | 2016-10-06 17:57:04 -0700 | |
commit | 507b661106e2a880b76324ffb97b4a5665a9d4a7 (patch) | |
tree | 3351084fd9f90a7ce73d477f81105cd0c1ffafdf /Eigen/src/Core | |
parent | a498ff7df60269b29a21d4ec6ca4cd2ddd824006 (diff) |
Renamed predux_half into predux_downto4
Diffstat (limited to 'Eigen/src/Core')
-rw-r--r-- | Eigen/src/Core/GenericPacketMath.h | 2 | ||||
-rw-r--r-- | Eigen/src/Core/arch/AVX/PacketMath.h | 2 | ||||
-rw-r--r-- | Eigen/src/Core/arch/AVX512/PacketMath.h | 4 | ||||
-rw-r--r-- | Eigen/src/Core/products/GeneralBlockPanelKernel.h | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/Eigen/src/Core/GenericPacketMath.h b/Eigen/src/Core/GenericPacketMath.h index 07fe0f005..afd806928 100644 --- a/Eigen/src/Core/GenericPacketMath.h +++ b/Eigen/src/Core/GenericPacketMath.h @@ -329,7 +329,7 @@ template<typename Packet> EIGEN_DEVICE_FUNC inline typename unpacket_traits<Pack */ template<typename Packet> EIGEN_DEVICE_FUNC inline typename conditional<(unpacket_traits<Packet>::size%8)==0,typename unpacket_traits<Packet>::half,Packet>::type -predux_half(const Packet& a) +predux_downto4(const Packet& a) { return a; } /** \internal \returns the product of the elements of \a a*/ diff --git a/Eigen/src/Core/arch/AVX/PacketMath.h b/Eigen/src/Core/arch/AVX/PacketMath.h index beb3e577d..05b15b852 100644 --- a/Eigen/src/Core/arch/AVX/PacketMath.h +++ b/Eigen/src/Core/arch/AVX/PacketMath.h @@ -405,7 +405,7 @@ template<> EIGEN_STRONG_INLINE double predux<Packet4d>(const Packet4d& a) return pfirst(_mm256_hadd_pd(tmp0,tmp0)); } -template<> EIGEN_STRONG_INLINE Packet4f predux_half<Packet8f>(const Packet8f& a) +template<> EIGEN_STRONG_INLINE Packet4f predux_downto4<Packet8f>(const Packet8f& a) { return _mm_add_ps(_mm256_castps256_ps128(a),_mm256_extractf128_ps(a,1)); } diff --git a/Eigen/src/Core/arch/AVX512/PacketMath.h b/Eigen/src/Core/arch/AVX512/PacketMath.h index 1af4785e1..f6500a16e 100644 --- a/Eigen/src/Core/arch/AVX512/PacketMath.h +++ b/Eigen/src/Core/arch/AVX512/PacketMath.h @@ -905,7 +905,7 @@ EIGEN_STRONG_INLINE double predux<Packet8d>(const Packet8d& a) { } template <> -EIGEN_STRONG_INLINE Packet8f predux_half<Packet16f>(const Packet16f& a) { +EIGEN_STRONG_INLINE Packet8f predux_downto4<Packet16f>(const Packet16f& a) { #ifdef EIGEN_VECTORIZE_AVX512DQ Packet8f lane0 = _mm512_extractf32x8_ps(a, 0); Packet8f lane1 = _mm512_extractf32x8_ps(a, 1); @@ -921,7 +921,7 @@ EIGEN_STRONG_INLINE Packet8f predux_half<Packet16f>(const Packet16f& a) { #endif } template <> -EIGEN_STRONG_INLINE Packet4d predux_half<Packet8d>(const Packet8d& a) { +EIGEN_STRONG_INLINE Packet4d predux_downto4<Packet8d>(const Packet8d& a) { Packet4d lane0 = _mm512_extractf64x4_pd(a, 0); Packet4d lane1 = _mm512_extractf64x4_pd(a, 1); Packet4d res = padd(lane0, lane1); diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 10d132957..3db857390 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -580,7 +580,7 @@ DoublePacket<Packet> padd(const DoublePacket<Packet> &a, const DoublePacket<Pack } template<typename Packet> -const DoublePacket<Packet>& predux_half(const DoublePacket<Packet> &a) +const DoublePacket<Packet>& predux_downto4(const DoublePacket<Packet> &a) { return a; } @@ -1596,13 +1596,13 @@ void gebp_kernel<LhsScalar,RhsScalar,Index,DataMapper,mr,nr,ConjugateLhs,Conjuga SRhsPacketHalf b0; straits.loadLhsUnaligned(blB, a0); straits.loadRhs(blA, b0); - SAccPacketHalf c0 = predux_half(C0); + SAccPacketHalf c0 = predux_downto4(C0); straits.madd(a0,b0,c0,b0); straits.acc(c0, alphav, R); } else { - straits.acc(predux_half(C0), alphav, R); + straits.acc(predux_downto4(C0), alphav, R); } res.scatterPacket(i, j2, R); } |