GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-12 03:39:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed predux_half into predux_downto4

Browse Source
This commit is contained in:
Benoit Steiner 2016-10-06 17:57:04 -07:00
parent a498ff7df6
commit 507b661106
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Eigen/src/Core/GenericPacketMath.h
View File

@ -329,7 +329,7 @@ template<typename Packet> EIGEN_DEVICE_FUNC inline typename unpacket_traits<Pack
*/ */
template<typename Packet> EIGEN_DEVICE_FUNC inline template<typename Packet> EIGEN_DEVICE_FUNC inline
typename conditional<(unpacket_traits<Packet>::size%8)==0,typename unpacket_traits<Packet>::half,Packet>::type 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; } { return a; }
/** \internal \returns the product of the elements of \a a*/ /** \internal \returns the product of the elements of \a a*/

2
Eigen/src/Core/arch/AVX/PacketMath.h
View File

@ -405,7 +405,7 @@ template<> EIGEN_STRONG_INLINE double predux<Packet4d>(const Packet4d& a)
return pfirst(_mm256_hadd_pd(tmp0,tmp0)); 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)); return _mm_add_ps(_mm256_castps256_ps128(a),_mm256_extractf128_ps(a,1));
} }

4
Eigen/src/Core/arch/AVX512/PacketMath.h
View File

@ -905,7 +905,7 @@ EIGEN_STRONG_INLINE double predux<Packet8d>(const Packet8d& a) {
} }
template <> 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 #ifdef EIGEN_VECTORIZE_AVX512DQ
Packet8f lane0 = _mm512_extractf32x8_ps(a, 0); Packet8f lane0 = _mm512_extractf32x8_ps(a, 0);
Packet8f lane1 = _mm512_extractf32x8_ps(a, 1); Packet8f lane1 = _mm512_extractf32x8_ps(a, 1);
@ -921,7 +921,7 @@ EIGEN_STRONG_INLINE Packet8f predux_half<Packet16f>(const Packet16f& a) {
#endif #endif
} }
template <> 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 lane0 = _mm512_extractf64x4_pd(a, 0);
Packet4d lane1 = _mm512_extractf64x4_pd(a, 1); Packet4d lane1 = _mm512_extractf64x4_pd(a, 1);
Packet4d res = padd(lane0, lane1); Packet4d res = padd(lane0, lane1);

6
Eigen/src/Core/products/GeneralBlockPanelKernel.h
View File

@ -580,7 +580,7 @@ DoublePacket<Packet> padd(const DoublePacket<Packet> &a, const DoublePacket<Pack
} }
template<typename Packet> template<typename Packet>
const DoublePacket<Packet>& predux_half(const DoublePacket<Packet> &a) const DoublePacket<Packet>& predux_downto4(const DoublePacket<Packet> &a)
{ {
return a; return a;
} }
@ -1596,13 +1596,13 @@ void gebp_kernel<LhsScalar,RhsScalar,Index,DataMapper,mr,nr,ConjugateLhs,Conjuga
SRhsPacketHalf b0; SRhsPacketHalf b0;
straits.loadLhsUnaligned(blB, a0); straits.loadLhsUnaligned(blB, a0);
straits.loadRhs(blA, b0); straits.loadRhs(blA, b0);
SAccPacketHalf c0 = predux_half(C0); SAccPacketHalf c0 = predux_downto4(C0);
straits.madd(a0,b0,c0,b0); straits.madd(a0,b0,c0,b0);
straits.acc(c0, alphav, R); straits.acc(c0, alphav, R);
} }
else else
{ {
straits.acc(predux_half(C0), alphav, R); straits.acc(predux_downto4(C0), alphav, R);
} }
res.scatterPacket(i, j2, R); res.scatterPacket(i, j2, R);
} }

4
test/packetmath.cpp
View File

@ -246,8 +246,8 @@ template<typename Scalar> void packetmath()
ref[i] = 0; ref[i] = 0;
for (int i=0; i<PacketSize; ++i) for (int i=0; i<PacketSize; ++i)
ref[i%4] += data1[i]; ref[i%4] += data1[i];
internal::pstore(data2, internal::predux_half(internal::pload<Packet>(data1))); internal::pstore(data2, internal::predux_downto4(internal::pload<Packet>(data1)));
VERIFY(areApprox(ref, data2, PacketSize>4?PacketSize/2:PacketSize) && "internal::predux_half"); VERIFY(areApprox(ref, data2, PacketSize>4?PacketSize/2:PacketSize) && "internal::predux_downto4");
} }
ref[0] = 1; ref[0] = 1;