mirror of
https://github.com/paboyle/Grid.git
synced 2025-06-14 13:57:07 +01:00
Lots of changes required to compile for MIC under ICPC
This commit is contained in:
@ -107,12 +107,7 @@ void WilsonMatrix::Dhop(const LatticeFermion &in, LatticeFermion &out)
|
||||
|
||||
int ss = sss;
|
||||
int ssu= sss;
|
||||
<<<<<<< HEAD
|
||||
//int ss = Stencil._LebesgueReorder[sss];
|
||||
=======
|
||||
//int ss = 0;
|
||||
//int ss = Stencil._LebesgueReorder[sss];
|
||||
>>>>>>> 55ccb8ccf4aa6b9d6e36e71aa19f89db0463254f
|
||||
|
||||
// Xp
|
||||
offset = Stencil._offsets [Xp][ss];
|
||||
@ -130,10 +125,7 @@ void WilsonMatrix::Dhop(const LatticeFermion &in, LatticeFermion &out)
|
||||
chi=comm_buf[offset];
|
||||
}
|
||||
mult(&Uchi(),&Umu._odata[ssu](Xp),&chi());
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
prefetch(Umu._odata[ssu](Yp));
|
||||
>>>>>>> 55ccb8ccf4aa6b9d6e36e71aa19f89db0463254f
|
||||
//prefetch(Umu._odata[ssu](Yp));
|
||||
spReconXp(result,Uchi);
|
||||
|
||||
// Yp
|
||||
@ -152,10 +144,7 @@ void WilsonMatrix::Dhop(const LatticeFermion &in, LatticeFermion &out)
|
||||
chi=comm_buf[offset];
|
||||
}
|
||||
mult(&Uchi(),&Umu._odata[ssu](Yp),&chi());
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
prefetch(Umu._odata[ssu](Zp));
|
||||
>>>>>>> 55ccb8ccf4aa6b9d6e36e71aa19f89db0463254f
|
||||
// prefetch(Umu._odata[ssu](Zp));
|
||||
accumReconYp(result,Uchi);
|
||||
|
||||
// Zp
|
||||
@ -174,10 +163,7 @@ void WilsonMatrix::Dhop(const LatticeFermion &in, LatticeFermion &out)
|
||||
chi=comm_buf[offset];
|
||||
}
|
||||
mult(&Uchi(),&Umu._odata[ssu](Zp),&chi());
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
prefetch(Umu._odata[ssu](Tp));
|
||||
>>>>>>> 55ccb8ccf4aa6b9d6e36e71aa19f89db0463254f
|
||||
// prefetch(Umu._odata[ssu](Tp));
|
||||
accumReconZp(result,Uchi);
|
||||
|
||||
// Tp
|
||||
@ -196,10 +182,7 @@ void WilsonMatrix::Dhop(const LatticeFermion &in, LatticeFermion &out)
|
||||
chi=comm_buf[offset];
|
||||
}
|
||||
mult(&Uchi(),&Umu._odata[ssu](Tp),&chi());
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
prefetch(Umu._odata[ssu](Xm));
|
||||
>>>>>>> 55ccb8ccf4aa6b9d6e36e71aa19f89db0463254f
|
||||
// prefetch(Umu._odata[ssu](Xm));
|
||||
accumReconTp(result,Uchi);
|
||||
|
||||
// Xm
|
||||
@ -218,10 +201,6 @@ void WilsonMatrix::Dhop(const LatticeFermion &in, LatticeFermion &out)
|
||||
chi=comm_buf[offset];
|
||||
}
|
||||
mult(&Uchi(),&Umu._odata[ssu](Xm),&chi());
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
prefetch(Umu._odata[ssu](Ym));
|
||||
>>>>>>> 55ccb8ccf4aa6b9d6e36e71aa19f89db0463254f
|
||||
accumReconXm(result,Uchi);
|
||||
|
||||
|
||||
@ -241,10 +220,6 @@ void WilsonMatrix::Dhop(const LatticeFermion &in, LatticeFermion &out)
|
||||
chi=comm_buf[offset];
|
||||
}
|
||||
mult(&Uchi(),&Umu._odata[ssu](Ym),&chi());
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
prefetch(Umu._odata[ssu](Zm));
|
||||
>>>>>>> 55ccb8ccf4aa6b9d6e36e71aa19f89db0463254f
|
||||
accumReconYm(result,Uchi);
|
||||
|
||||
// Zm
|
||||
@ -263,10 +238,6 @@ void WilsonMatrix::Dhop(const LatticeFermion &in, LatticeFermion &out)
|
||||
chi=comm_buf[offset];
|
||||
}
|
||||
mult(&Uchi(),&Umu._odata[ssu](Zm),&chi());
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
prefetch(Umu._odata[ssu](Tm));
|
||||
>>>>>>> 55ccb8ccf4aa6b9d6e36e71aa19f89db0463254f
|
||||
accumReconZm(result,Uchi);
|
||||
|
||||
// Tm
|
||||
|
Reference in New Issue
Block a user