portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-10 07:55:35 +00:00
Code Releases Activity

Merge branch 'feature/bgq-asm' of https://github.com/paboyle/Grid into feature/bgq-asm

Browse Source
This commit is contained in:
paboyle 2017-03-28 12:20:12 -04:00
commit e55a751e23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/qcd/action/fermion/StaggeredKernels.cc
View File

@ -31,7 +31,7 @@ directory
namespace Grid { namespace Grid {
namespace QCD { namespace QCD {
int StaggeredKernelsStatic::Opt; int StaggeredKernelsStatic::Opt= StaggeredKernelsStatic::OptGeneric;
template <class Impl> template <class Impl>
StaggeredKernels<Impl>::StaggeredKernels(const ImplParams &p) : Base(p){}; StaggeredKernels<Impl>::StaggeredKernels(const ImplParams &p) : Base(p){};
@ -215,6 +215,7 @@ void StaggeredKernels<Impl>::DhopSiteDag(StencilImpl &st, LebesgueOrder &lo, Dou
} }
break; break;
default: default:
std::cout<<"Oops Opt = "<<Opt<<std::endl;
assert(0); assert(0);
break; break;
} }
@ -251,6 +252,7 @@ void StaggeredKernels<Impl>::DhopSite(StencilImpl &st, LebesgueOrder &lo, Double
} }
break; break;
default: default:
std::cout<<"Oops Opt = "<<Opt<<std::endl;
assert(0); assert(0);
break; break;
} }

9
tests/core/Test_staggered5Dvec.cc
View File

@ -128,7 +128,12 @@ int main (int argc, char ** argv)
std::cout<<GridLogMessage << "Calling vectorised staggered operator"<<std::endl; std::cout<<GridLogMessage << "Calling vectorised staggered operator"<<std::endl;
#ifdef AVX512
QCD::StaggeredKernelsStatic::Opt=QCD::StaggeredKernelsStatic::OptInlineAsm; QCD::StaggeredKernelsStatic::Opt=QCD::StaggeredKernelsStatic::OptInlineAsm;
#else
QCD::StaggeredKernelsStatic::Opt=QCD::StaggeredKernelsStatic::OptGeneric;
#endif
t0=usecond(); t0=usecond();
for(int i=0;i<ncall1;i++){ for(int i=0;i<ncall1;i++){
Ds.Dhop(src,tmp,0); Ds.Dhop(src,tmp,0);
@ -159,7 +164,11 @@ int main (int argc, char ** argv)
std::cout<<GridLogMessage << "mflop/s = "<< flops/(t1-t0)<<std::endl; std::cout<<GridLogMessage << "mflop/s = "<< flops/(t1-t0)<<std::endl;
#ifdef AVX512
QCD::StaggeredKernelsStatic::Opt=QCD::StaggeredKernelsStatic::OptInlineAsm; QCD::StaggeredKernelsStatic::Opt=QCD::StaggeredKernelsStatic::OptInlineAsm;
#else
QCD::StaggeredKernelsStatic::Opt=QCD::StaggeredKernelsStatic::OptGeneric;
#endif
err = tmp-result; err = tmp-result;
std::cout<<GridLogMessage << "norm diff "<< norm2(err)<<std::endl; std::cout<<GridLogMessage << "norm diff "<< norm2(err)<<std::endl;