bug #86 : use internal:: namespace instead of ei_ prefix

This commit is contained in:
Benoit Jacob
2010-10-25 10:15:22 -04:00
parent ca85a1f6c5
commit 4716040703
330 changed files with 7615 additions and 7032 deletions

View File

@@ -22,9 +22,9 @@ int main(int argc, char* argv[])
{
int size = SIZE * 8;
int size2 = size * size;
Scalar* a = ei_aligned_new<Scalar>(size2);
Scalar* b = ei_aligned_new<Scalar>(size2+4)+1;
Scalar* c = ei_aligned_new<Scalar>(size2);
Scalar* a = internal::aligned_new<Scalar>(size2);
Scalar* b = internal::aligned_new<Scalar>(size2+4)+1;
Scalar* c = internal::aligned_new<Scalar>(size2);
for (int i=0; i<size; ++i)
{
@@ -90,46 +90,46 @@ void benchVec(VectorXf& a, VectorXf& b, VectorXf& c)
void benchVec(Scalar* a, Scalar* b, Scalar* c, int size)
{
typedef ei_packet_traits<Scalar>::type PacketScalar;
const int PacketSize = ei_packet_traits<Scalar>::size;
typedef internal::packet_traits<Scalar>::type PacketScalar;
const int PacketSize = internal::packet_traits<Scalar>::size;
PacketScalar a0, a1, a2, a3, b0, b1, b2, b3;
for (int k=0; k<REPEAT; ++k)
for (int i=0; i<size; i+=PacketSize*8)
{
// a0 = ei_pload(&a[i]);
// b0 = ei_pload(&b[i]);
// a1 = ei_pload(&a[i+1*PacketSize]);
// b1 = ei_pload(&b[i+1*PacketSize]);
// a2 = ei_pload(&a[i+2*PacketSize]);
// b2 = ei_pload(&b[i+2*PacketSize]);
// a3 = ei_pload(&a[i+3*PacketSize]);
// b3 = ei_pload(&b[i+3*PacketSize]);
// ei_pstore(&a[i], ei_padd(a0, b0));
// a0 = ei_pload(&a[i+4*PacketSize]);
// b0 = ei_pload(&b[i+4*PacketSize]);
// a0 = internal::pload(&a[i]);
// b0 = internal::pload(&b[i]);
// a1 = internal::pload(&a[i+1*PacketSize]);
// b1 = internal::pload(&b[i+1*PacketSize]);
// a2 = internal::pload(&a[i+2*PacketSize]);
// b2 = internal::pload(&b[i+2*PacketSize]);
// a3 = internal::pload(&a[i+3*PacketSize]);
// b3 = internal::pload(&b[i+3*PacketSize]);
// internal::pstore(&a[i], internal::padd(a0, b0));
// a0 = internal::pload(&a[i+4*PacketSize]);
// b0 = internal::pload(&b[i+4*PacketSize]);
//
// ei_pstore(&a[i+1*PacketSize], ei_padd(a1, b1));
// a1 = ei_pload(&a[i+5*PacketSize]);
// b1 = ei_pload(&b[i+5*PacketSize]);
// internal::pstore(&a[i+1*PacketSize], internal::padd(a1, b1));
// a1 = internal::pload(&a[i+5*PacketSize]);
// b1 = internal::pload(&b[i+5*PacketSize]);
//
// ei_pstore(&a[i+2*PacketSize], ei_padd(a2, b2));
// a2 = ei_pload(&a[i+6*PacketSize]);
// b2 = ei_pload(&b[i+6*PacketSize]);
// internal::pstore(&a[i+2*PacketSize], internal::padd(a2, b2));
// a2 = internal::pload(&a[i+6*PacketSize]);
// b2 = internal::pload(&b[i+6*PacketSize]);
//
// ei_pstore(&a[i+3*PacketSize], ei_padd(a3, b3));
// a3 = ei_pload(&a[i+7*PacketSize]);
// b3 = ei_pload(&b[i+7*PacketSize]);
// internal::pstore(&a[i+3*PacketSize], internal::padd(a3, b3));
// a3 = internal::pload(&a[i+7*PacketSize]);
// b3 = internal::pload(&b[i+7*PacketSize]);
//
// ei_pstore(&a[i+4*PacketSize], ei_padd(a0, b0));
// ei_pstore(&a[i+5*PacketSize], ei_padd(a1, b1));
// ei_pstore(&a[i+6*PacketSize], ei_padd(a2, b2));
// ei_pstore(&a[i+7*PacketSize], ei_padd(a3, b3));
// internal::pstore(&a[i+4*PacketSize], internal::padd(a0, b0));
// internal::pstore(&a[i+5*PacketSize], internal::padd(a1, b1));
// internal::pstore(&a[i+6*PacketSize], internal::padd(a2, b2));
// internal::pstore(&a[i+7*PacketSize], internal::padd(a3, b3));
ei_pstore(&a[i+2*PacketSize], ei_padd(ei_ploadu(&a[i+2*PacketSize]), ei_ploadu(&b[i+2*PacketSize])));
ei_pstore(&a[i+3*PacketSize], ei_padd(ei_ploadu(&a[i+3*PacketSize]), ei_ploadu(&b[i+3*PacketSize])));
ei_pstore(&a[i+4*PacketSize], ei_padd(ei_ploadu(&a[i+4*PacketSize]), ei_ploadu(&b[i+4*PacketSize])));
ei_pstore(&a[i+5*PacketSize], ei_padd(ei_ploadu(&a[i+5*PacketSize]), ei_ploadu(&b[i+5*PacketSize])));
ei_pstore(&a[i+6*PacketSize], ei_padd(ei_ploadu(&a[i+6*PacketSize]), ei_ploadu(&b[i+6*PacketSize])));
ei_pstore(&a[i+7*PacketSize], ei_padd(ei_ploadu(&a[i+7*PacketSize]), ei_ploadu(&b[i+7*PacketSize])));
internal::pstore(&a[i+2*PacketSize], internal::padd(internal::ploadu(&a[i+2*PacketSize]), internal::ploadu(&b[i+2*PacketSize])));
internal::pstore(&a[i+3*PacketSize], internal::padd(internal::ploadu(&a[i+3*PacketSize]), internal::ploadu(&b[i+3*PacketSize])));
internal::pstore(&a[i+4*PacketSize], internal::padd(internal::ploadu(&a[i+4*PacketSize]), internal::ploadu(&b[i+4*PacketSize])));
internal::pstore(&a[i+5*PacketSize], internal::padd(internal::ploadu(&a[i+5*PacketSize]), internal::ploadu(&b[i+5*PacketSize])));
internal::pstore(&a[i+6*PacketSize], internal::padd(internal::ploadu(&a[i+6*PacketSize]), internal::ploadu(&b[i+6*PacketSize])));
internal::pstore(&a[i+7*PacketSize], internal::padd(internal::ploadu(&a[i+7*PacketSize]), internal::ploadu(&b[i+7*PacketSize])));
}
}