mirror of
				https://github.com/paboyle/Grid.git
				synced 2025-11-03 21:44:33 +00:00 
			
		
		
		
	Merge develop
This commit is contained in:
		@@ -1,127 +0,0 @@
 | 
				
			|||||||
/*************************************************************************************
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    Grid physics library, www.github.com/paboyle/Grid 
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    Source file: ./lib/qcd/action/fermion/WilsonKernelsAsm.cc
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    Copyright (C) 2015
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 | 
					 | 
				
			||||||
Author: paboyle <paboyle@ph.ed.ac.uk>
 | 
					 | 
				
			||||||
Author: Guido Cossu <guido.cossu@ed.ac.uk>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    This program is free software; you can redistribute it and/or modify
 | 
					 | 
				
			||||||
    it under the terms of the GNU General Public License as published by
 | 
					 | 
				
			||||||
    the Free Software Foundation; either version 2 of the License, or
 | 
					 | 
				
			||||||
    (at your option) any later version.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    This program is distributed in the hope that it will be useful,
 | 
					 | 
				
			||||||
    but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
					 | 
				
			||||||
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
					 | 
				
			||||||
    GNU General Public License for more details.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    You should have received a copy of the GNU General Public License along
 | 
					 | 
				
			||||||
    with this program; if not, write to the Free Software Foundation, Inc.,
 | 
					 | 
				
			||||||
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    See the full license in the file "LICENSE" in the top level distribution directory
 | 
					 | 
				
			||||||
*************************************************************************************/
 | 
					 | 
				
			||||||
/*  END LEGAL */
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#include <Grid/qcd/action/fermion/FermionCore.h>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
namespace Grid {
 | 
					 | 
				
			||||||
namespace QCD {
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
///////////////////////////////////////////////////////////
 | 
					 | 
				
			||||||
// Default to no assembler implementation
 | 
					 | 
				
			||||||
///////////////////////////////////////////////////////////
 | 
					 | 
				
			||||||
template<class Impl> void 
 | 
					 | 
				
			||||||
WilsonKernels<Impl >::AsmDhopSite(StencilImpl &st,LebesgueOrder & lo,DoubledGaugeField &U,SiteHalfSpinor *buf,
 | 
					 | 
				
			||||||
					  int ss,int ssU,int Ls,int Ns,const FermionField &in, FermionField &out)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
  assert(0);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
template<class Impl> void 
 | 
					 | 
				
			||||||
WilsonKernels<Impl >::AsmDhopSiteDag(StencilImpl &st,LebesgueOrder & lo,DoubledGaugeField &U,SiteHalfSpinor *buf,
 | 
					 | 
				
			||||||
					     int ss,int ssU,int Ls,int Ns,const FermionField &in, FermionField &out)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
  assert(0);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
template<class Impl> void 
 | 
					 | 
				
			||||||
WilsonKernels<Impl >::AsmDhopSiteInt(StencilImpl &st,LebesgueOrder & lo,DoubledGaugeField &U,SiteHalfSpinor *buf,
 | 
					 | 
				
			||||||
					  int ss,int ssU,int Ls,int Ns,const FermionField &in, FermionField &out)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
  assert(0);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
template<class Impl> void 
 | 
					 | 
				
			||||||
WilsonKernels<Impl >::AsmDhopSiteDagInt(StencilImpl &st,LebesgueOrder & lo,DoubledGaugeField &U,SiteHalfSpinor *buf,
 | 
					 | 
				
			||||||
					     int ss,int ssU,int Ls,int Ns,const FermionField &in, FermionField &out)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
  assert(0);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
template<class Impl> void 
 | 
					 | 
				
			||||||
WilsonKernels<Impl >::AsmDhopSiteExt(StencilImpl &st,LebesgueOrder & lo,DoubledGaugeField &U,SiteHalfSpinor *buf,
 | 
					 | 
				
			||||||
					  int ss,int ssU,int Ls,int Ns,const FermionField &in, FermionField &out)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
  assert(0);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
template<class Impl> void 
 | 
					 | 
				
			||||||
WilsonKernels<Impl >::AsmDhopSiteDagExt(StencilImpl &st,LebesgueOrder & lo,DoubledGaugeField &U,SiteHalfSpinor *buf,
 | 
					 | 
				
			||||||
					     int ss,int ssU,int Ls,int Ns,const FermionField &in, FermionField &out)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
  assert(0);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#include <Grid/qcd/action/fermion/WilsonKernelsAsmAvx512.h>
 | 
					 | 
				
			||||||
#include <Grid/qcd/action/fermion/WilsonKernelsAsmQPX.h>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#define INSTANTIATE_ASM(A)\
 | 
					 | 
				
			||||||
template void WilsonKernels<A>::AsmDhopSite(StencilImpl &st,LebesgueOrder & lo,DoubledGaugeField &U, SiteHalfSpinor *buf,\
 | 
					 | 
				
			||||||
                                  int ss,int ssU,int Ls,int Ns,const FermionField &in, FermionField &out);\
 | 
					 | 
				
			||||||
 \
 | 
					 | 
				
			||||||
template void WilsonKernels<A>::AsmDhopSiteDag(StencilImpl &st,LebesgueOrder & lo,DoubledGaugeField &U, SiteHalfSpinor *buf,\
 | 
					 | 
				
			||||||
                                  int ss,int ssU,int Ls,int Ns,const FermionField &in, FermionField &out);\
 | 
					 | 
				
			||||||
template void WilsonKernels<A>::AsmDhopSiteInt(StencilImpl &st,LebesgueOrder & lo,DoubledGaugeField &U, SiteHalfSpinor *buf,\
 | 
					 | 
				
			||||||
                                  int ss,int ssU,int Ls,int Ns,const FermionField &in, FermionField &out);\
 | 
					 | 
				
			||||||
 \
 | 
					 | 
				
			||||||
template void WilsonKernels<A>::AsmDhopSiteDagInt(StencilImpl &st,LebesgueOrder & lo,DoubledGaugeField &U, SiteHalfSpinor *buf,\
 | 
					 | 
				
			||||||
                                  int ss,int ssU,int Ls,int Ns,const FermionField &in, FermionField &out);\
 | 
					 | 
				
			||||||
template void WilsonKernels<A>::AsmDhopSiteExt(StencilImpl &st,LebesgueOrder & lo,DoubledGaugeField &U, SiteHalfSpinor *buf,\
 | 
					 | 
				
			||||||
                                  int ss,int ssU,int Ls,int Ns,const FermionField &in, FermionField &out);\
 | 
					 | 
				
			||||||
 \
 | 
					 | 
				
			||||||
template void WilsonKernels<A>::AsmDhopSiteDagExt(StencilImpl &st,LebesgueOrder & lo,DoubledGaugeField &U, SiteHalfSpinor *buf,\
 | 
					 | 
				
			||||||
                                  int ss,int ssU,int Ls,int Ns,const FermionField &in, FermionField &out);\
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(WilsonImplF);
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(WilsonImplD);
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(ZWilsonImplF);
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(ZWilsonImplD);
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(GparityWilsonImplF);
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(GparityWilsonImplD);
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(DomainWallVec5dImplF);
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(DomainWallVec5dImplD);
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(ZDomainWallVec5dImplF);
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(ZDomainWallVec5dImplD);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(WilsonImplFH);
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(WilsonImplDF);
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(ZWilsonImplFH);
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(ZWilsonImplDF);
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(GparityWilsonImplFH);
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(GparityWilsonImplDF);
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(DomainWallVec5dImplFH);
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(DomainWallVec5dImplDF);
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(ZDomainWallVec5dImplFH);
 | 
					 | 
				
			||||||
INSTANTIATE_ASM(ZDomainWallVec5dImplDF);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
}}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
@@ -277,17 +277,8 @@ int main (int argc, char ** argv)
 | 
				
			|||||||
      Grid.ShmBufferFreeAll();
 | 
					      Grid.ShmBufferFreeAll();
 | 
				
			||||||
      uint64_t bytes = lat*lat*lat*Ls*sizeof(HalfSpinColourVectorD);
 | 
					      uint64_t bytes = lat*lat*lat*Ls*sizeof(HalfSpinColourVectorD);
 | 
				
			||||||
      for(int d=0;d<8;d++){
 | 
					      for(int d=0;d<8;d++){
 | 
				
			||||||
<<<<<<< HEAD
 | 
					 | 
				
			||||||
	xbuf[d] = (HalfSpinColourVectorD *)Grid.ShmBufferMalloc(lat*lat*lat*Ls*sizeof(HalfSpinColourVectorD));
 | 
					 | 
				
			||||||
	rbuf[d] = (HalfSpinColourVectorD *)Grid.ShmBufferMalloc(lat*lat*lat*Ls*sizeof(HalfSpinColourVectorD));
 | 
					 | 
				
			||||||
	//	bzero((void *)xbuf[d],lat*lat*lat*Ls*sizeof(HalfSpinColourVectorD));
 | 
					 | 
				
			||||||
	//	bzero((void *)rbuf[d],lat*lat*lat*Ls*sizeof(HalfSpinColourVectorD));
 | 
					 | 
				
			||||||
=======
 | 
					 | 
				
			||||||
	xbuf[d] = (HalfSpinColourVectorD *)Grid.ShmBufferMalloc(bytes);
 | 
						xbuf[d] = (HalfSpinColourVectorD *)Grid.ShmBufferMalloc(bytes);
 | 
				
			||||||
	rbuf[d] = (HalfSpinColourVectorD *)Grid.ShmBufferMalloc(bytes);
 | 
						rbuf[d] = (HalfSpinColourVectorD *)Grid.ShmBufferMalloc(bytes);
 | 
				
			||||||
	bzero((void *)xbuf[d],bytes);
 | 
					 | 
				
			||||||
	bzero((void *)rbuf[d],bytes);
 | 
					 | 
				
			||||||
>>>>>>> develop
 | 
					 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      int ncomm;
 | 
					      int ncomm;
 | 
				
			||||||
@@ -381,17 +372,8 @@ int main (int argc, char ** argv)
 | 
				
			|||||||
      Grid.ShmBufferFreeAll();
 | 
					      Grid.ShmBufferFreeAll();
 | 
				
			||||||
      uint64_t bytes=lat*lat*lat*Ls*sizeof(HalfSpinColourVectorD);
 | 
					      uint64_t bytes=lat*lat*lat*Ls*sizeof(HalfSpinColourVectorD);
 | 
				
			||||||
      for(int d=0;d<8;d++){
 | 
					      for(int d=0;d<8;d++){
 | 
				
			||||||
<<<<<<< HEAD
 | 
					 | 
				
			||||||
	xbuf[d] = (HalfSpinColourVectorD *)Grid.ShmBufferMalloc(lat*lat*lat*Ls*sizeof(HalfSpinColourVectorD));
 | 
					 | 
				
			||||||
	rbuf[d] = (HalfSpinColourVectorD *)Grid.ShmBufferMalloc(lat*lat*lat*Ls*sizeof(HalfSpinColourVectorD));
 | 
					 | 
				
			||||||
	//	bzero((void *)xbuf[d],lat*lat*lat*Ls*sizeof(HalfSpinColourVectorD));
 | 
					 | 
				
			||||||
	//	bzero((void *)rbuf[d],lat*lat*lat*Ls*sizeof(HalfSpinColourVectorD));
 | 
					 | 
				
			||||||
=======
 | 
					 | 
				
			||||||
	xbuf[d] = (HalfSpinColourVectorD *)Grid.ShmBufferMalloc(bytes);
 | 
						xbuf[d] = (HalfSpinColourVectorD *)Grid.ShmBufferMalloc(bytes);
 | 
				
			||||||
	rbuf[d] = (HalfSpinColourVectorD *)Grid.ShmBufferMalloc(bytes);
 | 
						rbuf[d] = (HalfSpinColourVectorD *)Grid.ShmBufferMalloc(bytes);
 | 
				
			||||||
	bzero((void *)xbuf[d],bytes);
 | 
					 | 
				
			||||||
	bzero((void *)rbuf[d],bytes);
 | 
					 | 
				
			||||||
>>>>>>> develop
 | 
					 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      int ncomm;
 | 
					      int ncomm;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user