1
0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00

-Complete and working implementation of Grid_empty

This commit is contained in:
Christopher Kelly 2016-04-15 13:17:42 -04:00
parent a646260e82
commit ab56ccdd25
3 changed files with 200 additions and 99 deletions

View File

@ -410,22 +410,22 @@ namespace Optimization {
struct Permute{ struct Permute{
static inline __m256 Permute0(__m256 in){ static inline __m256 Permute0(__m256 in){
return _mm256_permute2f128_ps(in,in,0x01); return _mm256_permute2f128_ps(in,in,0x01); //ABCD EFGH -> EFGH ABCD
}; };
static inline __m256 Permute1(__m256 in){ static inline __m256 Permute1(__m256 in){
return _mm256_shuffle_ps(in,in,_MM_SELECT_FOUR_FOUR(1,0,3,2)); return _mm256_shuffle_ps(in,in,_MM_SELECT_FOUR_FOUR(1,0,3,2)); //ABCD EFGH -> CDAB GHEF
}; };
static inline __m256 Permute2(__m256 in){ static inline __m256 Permute2(__m256 in){
return _mm256_shuffle_ps(in,in,_MM_SELECT_FOUR_FOUR(2,3,0,1)); return _mm256_shuffle_ps(in,in,_MM_SELECT_FOUR_FOUR(2,3,0,1)); //ABCD EFGH -> BADC FEHG
}; };
static inline __m256 Permute3(__m256 in){ static inline __m256 Permute3(__m256 in){
return in; return in;
}; };
static inline __m256d Permute0(__m256d in){ static inline __m256d Permute0(__m256d in){
return _mm256_permute2f128_pd(in,in,0x01); return _mm256_permute2f128_pd(in,in,0x01); //AB CD -> CD AB
}; };
static inline __m256d Permute1(__m256d in){ static inline __m256d Permute1(__m256d in){ //AB CD -> BA DC
return _mm256_shuffle_pd(in,in,0x5); return _mm256_shuffle_pd(in,in,0x5);
}; };
static inline __m256d Permute2(__m256d in){ static inline __m256d Permute2(__m256d in){

View File

@ -55,51 +55,67 @@ namespace Optimization {
struct Vsplat{ struct Vsplat{
//Complex float //Complex float
inline float operator()(float a, float b){ inline u128f operator()(float a, float b){
return 0; u128f out;
out.f[0] = a;
out.f[1] = b;
out.f[2] = a;
out.f[3] = b;
return out;
} }
// Real float // Real float
inline float operator()(float a){ inline u128f operator()(float a){
return 0; u128f out;
out.f[0] = a;
out.f[1] = a;
out.f[2] = a;
out.f[3] = a;
return out;
} }
//Complex double //Complex double
inline double operator()(double a, double b){ inline u128d operator()(double a, double b){
return 0; u128d out;
out.f[0] = a;
out.f[1] = b;
return out;
} }
//Real double //Real double
inline double operator()(double a){ inline u128d operator()(double a){
return 0; u128d out;
out.f[0] = a;
out.f[1] = a;
return out;
} }
//Integer //Integer
inline int operator()(Integer a){ inline int operator()(Integer a){
return 0; return a;
} }
}; };
struct Vstore{ struct Vstore{
//Float //Float
inline void operator()(float a, float* F){ inline void operator()(u128f a, float* F){
memcpy(F,a.f,4*sizeof(float));
} }
//Double //Double
inline void operator()(double a, double* D){ inline void operator()(u128d a, double* D){
memcpy(D,a.f,2*sizeof(double));
} }
//Integer //Integer
inline void operator()(int a, Integer* I){ inline void operator()(int a, Integer* I){
I[0] = a;
} }
}; };
struct Vstream{ struct Vstream{
//Float //Float
inline void operator()(float * a, float b){ inline void operator()(float * a, u128f b){
memcpy(a,b.f,4*sizeof(float));
} }
//Double //Double
inline void operator()(double * a, double b){ inline void operator()(double * a, u128d b){
memcpy(a,b.f,2*sizeof(double));
} }
@ -107,24 +123,40 @@ namespace Optimization {
struct Vset{ struct Vset{
// Complex float // Complex float
inline float operator()(Grid::ComplexF *a){ inline u128f operator()(Grid::ComplexF *a){
return 0; u128f out;
out.f[0] = a[0].real();
out.f[1] = a[0].imag();
out.f[2] = a[1].real();
out.f[3] = a[1].imag();
return out;
} }
// Complex double // Complex double
inline double operator()(Grid::ComplexD *a){ inline u128d operator()(Grid::ComplexD *a){
return 0; u128d out;
out.f[0] = a[0].real();
out.f[1] = a[0].imag();
return out;
} }
// Real float // Real float
inline float operator()(float *a){ inline u128f operator()(float *a){
return 0; u128f out;
out.f[0] = a[0];
out.f[1] = a[1];
out.f[2] = a[2];
out.f[3] = a[3];
return out;
} }
// Real double // Real double
inline double operator()(double *a){ inline u128d operator()(double *a){
return 0; u128d out;
out.f[0] = a[0];
out.f[1] = a[1];
return out;
} }
// Integer // Integer
inline int operator()(Integer *a){ inline int operator()(Integer *a){
return 0; return a[0];
} }
@ -146,129 +178,198 @@ namespace Optimization {
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
struct Sum{ struct Sum{
//Complex/Real float //Complex/Real float
inline float operator()(float a, float b){ inline u128f operator()(u128f a, u128f b){
return 0; u128f out;
out.f[0] = a.f[0] + b.f[0];
out.f[1] = a.f[1] + b.f[1];
out.f[2] = a.f[2] + b.f[2];
out.f[3] = a.f[3] + b.f[3];
return out;
} }
//Complex/Real double //Complex/Real double
inline double operator()(double a, double b){ inline u128d operator()(u128d a, u128d b){
return 0; u128d out;
out.f[0] = a.f[0] + b.f[0];
out.f[1] = a.f[1] + b.f[1];
return out;
} }
//Integer //Integer
inline int operator()(int a, int b){ inline int operator()(int a, int b){
return 0; return a + b;
} }
}; };
struct Sub{ struct Sub{
//Complex/Real float //Complex/Real float
inline float operator()(float a, float b){ inline u128f operator()(u128f a, u128f b){
return 0; u128f out;
out.f[0] = a.f[0] - b.f[0];
out.f[1] = a.f[1] - b.f[1];
out.f[2] = a.f[2] - b.f[2];
out.f[3] = a.f[3] - b.f[3];
return out;
} }
//Complex/Real double //Complex/Real double
inline double operator()(double a, double b){ inline u128d operator()(u128d a, u128d b){
return 0; u128d out;
out.f[0] = a.f[0] - b.f[0];
out.f[1] = a.f[1] - b.f[1];
return out;
} }
//Integer //Integer
inline int operator()(int a, int b){ inline int operator()(int a, int b){
return 0; return a-b;
} }
}; };
struct MultComplex{ struct MultComplex{
// Complex float // Complex float
inline float operator()(float a, float b){ inline u128f operator()(u128f a, u128f b){
return 0; u128f out;
out.f[0] = a.f[0]*b.f[0] - a.f[1]*b.f[1];
out.f[1] = a.f[0]*b.f[1] + a.f[1]*b.f[0];
out.f[2] = a.f[2]*b.f[2] - a.f[3]*b.f[3];
out.f[3] = a.f[2]*b.f[3] + a.f[3]*b.f[2];
return out;
} }
// Complex double // Complex double
inline double operator()(double a, double b){ inline u128d operator()(u128d a, u128d b){
return 0; u128d out;
out.f[0] = a.f[0]*b.f[0] - a.f[1]*b.f[1];
out.f[1] = a.f[0]*b.f[1] + a.f[1]*b.f[0];
return out;
} }
}; };
struct Mult{ struct Mult{
inline float mac(float a, float b,double c){ //CK: Appear unneeded
return 0; // inline float mac(float a, float b,double c){
} // return 0;
inline double mac(double a, double b,double c){ // }
return 0; // inline double mac(double a, double b,double c){
} // return 0;
// }
// Real float // Real float
inline float operator()(float a, float b){ inline u128f operator()(u128f a, u128f b){
return 0; u128f out;
out.f[0] = a.f[0]*b.f[0];
out.f[1] = a.f[1]*b.f[1];
out.f[2] = a.f[2]*b.f[2];
out.f[3] = a.f[3]*b.f[3];
return out;
} }
// Real double // Real double
inline double operator()(double a, double b){ inline u128d operator()(u128d a, u128d b){
return 0; u128d out;
out.f[0] = a.f[0]*b.f[0];
out.f[1] = a.f[1]*b.f[1];
return out;
} }
// Integer // Integer
inline int operator()(int a, int b){ inline int operator()(int a, int b){
return 0; return a*b;
} }
}; };
struct Conj{ struct Conj{
// Complex single // Complex single
inline float operator()(float in){ inline u128f operator()(u128f in){
return 0; u128f out;
out.f[0] = in.f[0];
out.f[1] = -in.f[1];
out.f[2] = in.f[2];
out.f[3] = -in.f[3];
return out;
} }
// Complex double // Complex double
inline double operator()(double in){ inline u128d operator()(u128d in){
return 0; u128d out;
out.f[0] = in.f[0];
out.f[1] = -in.f[1];
return out;
} }
// do not define for integer input // do not define for integer input
}; };
struct TimesMinusI{ struct TimesMinusI{
//Complex single //Complex single
inline float operator()(float in, float ret){ inline u128f operator()(u128f in, u128f ret){ //note ret is ignored
return 0; u128f out;
out.f[0] = in.f[1];
out.f[1] = -in.f[0];
out.f[2] = in.f[3];
out.f[3] = -in.f[2];
return out;
} }
//Complex double //Complex double
inline double operator()(double in, double ret){ inline u128d operator()(u128d in, u128d ret){
return 0; u128d out;
out.f[0] = in.f[1];
out.f[1] = -in.f[0];
return out;
} }
}; };
struct TimesI{ struct TimesI{
//Complex single //Complex single
inline float operator()(float in, float ret){ inline u128f operator()(u128f in, u128f ret){ //note ret is ignored
return 0; u128f out;
out.f[0] = -in.f[1];
out.f[1] = in.f[0];
out.f[2] = -in.f[3];
out.f[3] = in.f[2];
return out;
} }
//Complex double //Complex double
inline double operator()(double in, double ret){ inline u128d operator()(u128d in, u128d ret){
return 0; u128d out;
out.f[0] = -in.f[1];
out.f[1] = in.f[0];
return out;
} }
}; };
////////////////////////////////////////////// //////////////////////////////////////////////
// Some Template specialization // Some Template specialization
struct Permute{ struct Permute{
//We just have to mirror the permutes of Grid_sse4.h
static inline float Permute0(float in){ static inline u128f Permute0(u128f in){ //AB CD -> CD AB
u128f out;
out.f[0] = in.f[2];
out.f[1] = in.f[3];
out.f[2] = in.f[0];
out.f[3] = in.f[1];
return out;
};
static inline u128f Permute1(u128f in){ //AB CD -> BA DC
u128f out;
out.f[0] = in.f[1];
out.f[1] = in.f[0];
out.f[2] = in.f[3];
out.f[3] = in.f[2];
return out;
};
static inline u128f Permute2(u128f in){
return in; return in;
}; };
static inline float Permute1(float in){ static inline u128f Permute3(u128f in){
return in;
};
static inline float Permute2(float in){
return in;
};
static inline float Permute3(float in){
return in; return in;
}; };
static inline double Permute0(double in){ static inline u128d Permute0(u128d in){ //AB -> BA
u128d out;
out.f[0] = in.f[1];
out.f[1] = in.f[0];
return out;
};
static inline u128d Permute1(u128d in){
return in; return in;
}; };
static inline double Permute1(double in){ static inline u128d Permute2(u128d in){
return in; return in;
}; };
static inline double Permute2(double in){ static inline u128d Permute3(u128d in){
return in;
};
static inline double Permute3(double in){
return in; return in;
}; };
@ -280,26 +381,26 @@ namespace Optimization {
//Complex float Reduce //Complex float Reduce
template<> template<>
inline Grid::ComplexF Reduce<Grid::ComplexF, float>::operator()(float in){ inline Grid::ComplexF Reduce<Grid::ComplexF, u128f>::operator()(u128f in){ //2 complex
return 0; return Grid::ComplexF(in.f[0] + in.f[2], in.f[1] + in.f[3]);
} }
//Real float Reduce //Real float Reduce
template<> template<>
inline Grid::RealF Reduce<Grid::RealF, float>::operator()(float in){ inline Grid::RealF Reduce<Grid::RealF, u128f>::operator()(u128f in){ //4 floats
return 0; return in.f[0] + in.f[1] + in.f[2] + in.f[3];
} }
//Complex double Reduce //Complex double Reduce
template<> template<>
inline Grid::ComplexD Reduce<Grid::ComplexD, double>::operator()(double in){ inline Grid::ComplexD Reduce<Grid::ComplexD, u128d>::operator()(u128d in){ //1 complex
return 0; return Grid::ComplexD(in.f[0],in.f[1]);
} }
//Real double Reduce //Real double Reduce
template<> template<>
inline Grid::RealD Reduce<Grid::RealD, double>::operator()(double in){ inline Grid::RealD Reduce<Grid::RealD, u128d>::operator()(u128d in){ //2 doubles
return 0; return in.f[0] + in.f[1];
} }
//Integer Reduce //Integer Reduce
@ -314,8 +415,8 @@ namespace Optimization {
////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////
// Here assign types // Here assign types
typedef float SIMD_Ftype; // Single precision type typedef Optimization::u128f SIMD_Ftype; // Single precision type
typedef double SIMD_Dtype; // Double precision type typedef Optimization::u128d SIMD_Dtype; // Double precision type
typedef int SIMD_Itype; // Integer type typedef int SIMD_Itype; // Integer type
// prefetch utilities // prefetch utilities

View File

@ -267,10 +267,10 @@ namespace Optimization {
struct Permute{ struct Permute{
static inline __m128 Permute0(__m128 in){ static inline __m128 Permute0(__m128 in){
return _mm_shuffle_ps(in,in,_MM_SELECT_FOUR_FOUR(1,0,3,2)); return _mm_shuffle_ps(in,in,_MM_SELECT_FOUR_FOUR(1,0,3,2)); //AB CD -> CD AB
}; };
static inline __m128 Permute1(__m128 in){ static inline __m128 Permute1(__m128 in){
return _mm_shuffle_ps(in,in,_MM_SELECT_FOUR_FOUR(2,3,0,1)); return _mm_shuffle_ps(in,in,_MM_SELECT_FOUR_FOUR(2,3,0,1)); //AB CD -> BA DC
}; };
static inline __m128 Permute2(__m128 in){ static inline __m128 Permute2(__m128 in){
return in; return in;
@ -279,7 +279,7 @@ namespace Optimization {
return in; return in;
}; };
static inline __m128d Permute0(__m128d in){ static inline __m128d Permute0(__m128d in){ //AB -> BA
return _mm_shuffle_pd(in,in,0x1); return _mm_shuffle_pd(in,in,0x1);
}; };
static inline __m128d Permute1(__m128d in){ static inline __m128d Permute1(__m128d in){