portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-11-04 05:54:32 +00:00
Code Releases Activity

Accelerator loop changes

Browse Source
This commit is contained in:
Peter Boyle
2019-06-15 07:56:14 +01:00
parent 18e5de426d
commit 0ea7f5279d
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Grid/lattice/Lattice_local.h
View File

@@ -45,8 +45,8 @@ inline auto localNorm2 (const Lattice<vobj> &rhs)-> Lattice<typename vobj::tenso
Lattice<typename vobj::tensor_reduced> ret(rhs.Grid()); Lattice<typename vobj::tensor_reduced> ret(rhs.Grid());
auto rhs_v = rhs.View(); auto rhs_v = rhs.View();
auto ret_v = ret.View(); auto ret_v = ret.View();
accelerator_loop(ss,rhs_v,{ accelerator_for(ss,rhs_v.size(),vobj::Nsimd(),{
ret_v[ss]=innerProduct(rhs_v[ss],rhs_v[ss]); coalescedWrite(ret_v[ss],innerProduct(rhs_v(ss),rhs_v(ss)));
}); });
return ret; return ret;
} }
@@ -59,8 +59,8 @@ inline auto localInnerProduct (const Lattice<vobj> &lhs,const Lattice<vobj> &rhs
auto lhs_v = lhs.View(); auto lhs_v = lhs.View();
auto rhs_v = rhs.View(); auto rhs_v = rhs.View();
auto ret_v = ret.View(); auto ret_v = ret.View();
accelerator_loop(ss,rhs_v,{ accelerator_for(ss,rhs_v.size(),vobj::Nsimd(),{
ret_v[ss]=innerProduct(lhs_v[ss],rhs_v[ss]); coalescedWrite(ret_v[ss],innerProduct(lhs_v(ss),rhs_v(ss)));
}); });
return ret; return ret;
} }
@@ -70,11 +70,15 @@ inline auto localInnerProduct (const Lattice<vobj> &lhs,const Lattice<vobj> &rhs
template<class ll,class rr> template<class ll,class rr>
inline auto outerProduct (const Lattice<ll> &lhs,const Lattice<rr> &rhs) -> Lattice<decltype(outerProduct(ll(),rr()))> inline auto outerProduct (const Lattice<ll> &lhs,const Lattice<rr> &rhs) -> Lattice<decltype(outerProduct(ll(),rr()))>
{ {
typedef decltype(coalescedRead(ll())) sll;
typedef decltype(coalescedRead(rr())) srr;
Lattice<decltype(outerProduct(ll(),rr()))> ret(rhs.Grid()); Lattice<decltype(outerProduct(ll(),rr()))> ret(rhs.Grid());
auto lhs_v = lhs.View(); auto lhs_v = lhs.View();
auto rhs_v = rhs.View(); auto rhs_v = rhs.View();
auto ret_v = ret.View(); auto ret_v = ret.View();
accelerator_loop(ss,rhs_v,{ accelerator_for(ss,rhs_v.size(),1,{
// FIXME had issues with scalar version of outer
// Use vector [] operator and don't read coalesce this loop
ret_v[ss]=outerProduct(lhs_v[ss],rhs_v[ss]); ret_v[ss]=outerProduct(lhs_v[ss],rhs_v[ss]);
}); });
return ret; return ret;