From 08188caab1f5825d8d0ffd4b96a1e8aca0e5c250 Mon Sep 17 00:00:00 2001 From: ctpeterson Date: Thu, 19 Dec 2024 14:44:29 -0500 Subject: [PATCH] Added minor modifications to fat7lderiv to make it compatible with cleaned up hisqsmear.nim --- src/gauge/fat7lderiv.nim | 240 ++++++++++++++++++++++++++++----------- 1 file changed, 174 insertions(+), 66 deletions(-) diff --git a/src/gauge/fat7lderiv.nim b/src/gauge/fat7lderiv.nim index 70a0a9c..6ecee7d 100644 --- a/src/gauge/fat7lderiv.nim +++ b/src/gauge/fat7lderiv.nim @@ -4,6 +4,121 @@ import base/profile, layout let STAPLE_FLOPS = 3*198+216+18 let SIDE_FORCE_FLOPS = 7*198+3*216+3*18 +#[ +proc staple(auto out, auto in0, auto link0, int mu, int nu) = +#define link ftmp0[0] +#define linkmu ftmp[0][mu] +#define in ftmp0[1] +#define innu ftmp[1][nu] +#define linkin mtmp[0] +#define back btmp0[0] +#define backnu btmp[0][nu] +#define linkinnu mtmp[1] + + QDP_M_eq_M(link, link0, QDP_all); + QDP_M_eq_sM(linkmu, link, QDP_neighbor[mu], QDP_forward, QDP_all); + QDP_M_eq_M(in, in0, QDP_all); + QDP_M_eq_sM(innu, in, QDP_neighbor[nu], QDP_forward, QDP_all); + QDP_M_eq_Ma_times_M(linkin, link, in, QDP_all); + QDP_M_eq_M_times_M(back, linkin, linkmu, QDP_all); + QDP_M_eq_sM(backnu, back, QDP_neighbor[nu], QDP_backward, QDP_all); + QDP_M_eq_M_times_M(linkinnu, link, innu, QDP_all); + QDP_discard_M(innu); + QDP_M_peq_M_times_Ma(out, linkinnu, linkmu, QDP_all); + QDP_discard_M(linkmu); + QDP_M_peq_M(out, backnu, QDP_all); + QDP_discard_M(backnu); +#define STAPLE_FLOPS (3*198+216+18) + +#undef link +#undef linkmu +#undef in +#undef innu +#undef linkin +#undef back +#undef backnu +#undef linkinnu +} +]# + +#[ +static void +side_force(QDP_ColorMatrix *force, QDP_ColorMatrix *bot0, QDP_ColorMatrix *side0, + QDP_ColorMatrix *top0, int mu, int nu, QDP_ColorMatrix *stpl) +{ +#define side ftmp0[0] +#define sidemu ftmp[0][mu] +#define top ftmp0[1] +#define topnu ftmp[1][nu] +#define bot ftmp0[2] +#define botnu ftmp[2][nu] +#define sidebot mtmp[0] +#define sidetop mtmp[1] +#define topnusidebot btmp0[0] +#define fbmu btmp[0][mu] +#define botnusidetop btmp0[1] +#define fmbmu btmp[1][mu] +#define sidebotsidemu btmp0[2] +#define stm btmp[2][nu] +#define botnusidemu mtmp[2] +#define botsidemu mtmp[3] + + // force += bot * sidemu * topnu+ + // force -= bot-mu+ * side-mu * topnu-mu + // -= top <-> bot + // stpl += side * botnu * sidemu+ + // stpl += side-nu+ * bot-nu * sidemu-nu + QDP_M_eq_M(side, side0, QDP_all); + QDP_M_eq_sM(sidemu, side, QDP_neighbor[mu], QDP_forward, QDP_all); + QDP_M_eq_M(top, top0, QDP_all); + QDP_M_eq_sM(topnu, top, QDP_neighbor[nu], QDP_forward, QDP_all); + QDP_M_eq_M(bot, bot0, QDP_all); + QDP_M_eq_sM(botnu, bot, QDP_neighbor[nu], QDP_forward, QDP_all); + QDP_M_eq_Ma_times_M(sidebot, side, bot, QDP_all); + QDP_M_eq_Ma_times_M(sidetop, side, top, QDP_all); + QDP_M_eq_Ma_times_M(topnusidebot, topnu, sidebot, QDP_all); + QDP_M_eq_sM(fbmu, topnusidebot, QDP_neighbor[mu], QDP_backward, QDP_all); + QDP_M_eq_Ma_times_M(botnusidetop, botnu, sidetop, QDP_all); + QDP_M_eq_sM(fmbmu, botnusidetop, QDP_neighbor[mu], QDP_backward, QDP_all); + QDP_M_eq_M_times_M(sidebotsidemu, sidebot, sidemu, QDP_all); + QDP_M_eq_sM(stm, sidebotsidemu, QDP_neighbor[nu], QDP_backward, QDP_all); + QDP_M_eq_M_times_Ma(botnusidemu, botnu, sidemu, QDP_all); + QDP_discard_M(botnu); + QDP_M_peq_M_times_M(stpl, side, botnusidemu, QDP_all); + //QDP_M_meq_M_times_Ma(force, top, botnusidemu, QDP_all); + QDP_M_peq_M_times_Ma(force, top, botnusidemu, QDP_all); + QDP_M_eq_M_times_M(botsidemu, bot, sidemu, QDP_all); + QDP_discard_M(sidemu); + QDP_M_peq_M_times_Ma(force, botsidemu, topnu, QDP_all); + QDP_discard_M(topnu); + //QDP_M_meq_Ma(force, fbmu, QDP_all); + QDP_M_peq_Ma(force, fbmu, QDP_all); + QDP_discard_M(fbmu); + QDP_M_peq_Ma(force, fmbmu, QDP_all); + QDP_discard_M(fmbmu); + QDP_M_peq_M(stpl, stm, QDP_all); + QDP_discard_M(stm); +#define SIDE_FORCE_FLOPS (7*198+3*216+3*18) + +#undef side +#undef sidemu +#undef top +#undef topnu +#undef bot +#undef botnu +#undef sidebot +#undef sidetop +#undef topnusidebot +#undef fbmu +#undef botnusidetop +#undef fmbmu +#undef sidebotsidemu +#undef stm +#undef botnusidemu +#undef botsidemu +} +]# + proc fat7lDeriv*(deriv: auto, gauge: auto, mid: auto, coef: Fat7lCoefs, llderiv: auto, llgauge: auto, llmid: auto, naik: float, perf: var PerfInfo) = @@ -18,7 +133,7 @@ proc fat7lDeriv*(deriv: auto, gauge: auto, mid: auto, coef: Fat7lCoefs, let have3 = (coef3!=0.0) or have5 type lcm = type(gauge[0]) let lo = gauge[0].l - proc newlcm: lcm = result.new(lo) + proc newlcm: lcm = result.new(gauge[0].l) var stpl3: array[4,lcm] mid5: array[4,lcm] @@ -27,8 +142,8 @@ proc fat7lDeriv*(deriv: auto, gauge: auto, mid: auto, coef: Fat7lCoefs, s1a,s1b: array[4,Shifter[lcm,type(gauge[0][0])]] tm1,tm2: lcm sm1: array[4,Shifter[lcm,type(gauge[0][0])]] - if have3 or (naik!=0): - if have5 or (naik!=0): + if have3: + if have5: for mu in 0..3: stpl3[mu] = newlcm() mid5[mu] = newlcm() @@ -178,7 +293,7 @@ proc fat7lDeriv*(deriv: auto, gauge: auto, mid: auto, coef: Fat7lCoefs, if naik!=0.0: for mu in 0..3: # force += mid * Umumu' * Umu' - # force += U-mu' * mid-mu * Umu' + # force -= U-mu' * mid-mu * Umu' # force += U-mu' * U-mu-mu' * mid-mu-mu #QDP_M_eq_M(Uf, U, QDP_all); #QDP_M_eq_sM(Umu, Uf, QDP_neighbor[mu], QDP_forward, QDP_all); @@ -214,23 +329,6 @@ proc fat7lDeriv*(deriv: auto, gauge: auto, mid: auto, coef: Fat7lCoefs, perf.flops += nflops * gauge[0].l.localGeom.prod perf.secs += getElapsedTime() -proc fat7lDeriv*( - deriv: auto, - gauge: auto, - mid: auto, - coef: Fat7lCoefs, - lgauge: auto, - lmid: auto, - naik: float, - perf: var PerfInfo - ) = - var (fx,fxl) = (newOneOf(mid),newOneOf(lmid)) - fat7lDeriv(fx,gauge,mid,coef,fxl,lgauge,lmid,naik,perf) - threads: - for mu in 0..