From d15616f9185801ad68bc67e3132a47e6a0a0c897 Mon Sep 17 00:00:00 2001
From: James Willis <james.s.willis@durham.ac.uk>
Date: Fri, 19 May 2017 15:15:30 +0100
Subject: [PATCH] Removed unneeded AVX-512 code.
---
src/hydro/Gadget2/hydro_iact.h | 81 ----------------------------------
1 file changed, 81 deletions(-)
diff --git a/src/hydro/Gadget2/hydro_iact.h b/src/hydro/Gadget2/hydro_iact.h
index b5356dc54b..b57994d240 100644
--- a/src/hydro/Gadget2/hydro_iact.h
+++ b/src/hydro/Gadget2/hydro_iact.h
@@ -433,35 +433,6 @@ runner_iact_nonsym_1_vec_density(vector *r2, vector *dx, vector *dy, vector *dz,
curlvrz.v = vec_mul(curlvrz.v, ri.v);
/* Mask updates to intermediate vector sums for particle pi. */
-#ifdef HAVE_AVX512_F
- rhoSum->v =
- _mm512_mask_add_ps(rhoSum->v, knlMask, vec_mul(mj.v, wi.v), rhoSum->v);
-
- rho_dhSum->v =
- _mm512_mask_sub_ps(rho_dhSum->v, knlMask, rho_dhSum->v,
- vec_mul(mj.v, vec_fma(vec_set1(hydro_dimension), wi.v,
- vec_mul(xi.v, wi_dx.v))));
-
- wcountSum->v = _mm512_mask_add_ps(wcountSum->v, knlMask, wi.v, wcountSum->v);
-
- wcount_dhSum->v = _mm512_mask_sub_ps(wcount_dhSum->v, knlMask,
- wcount_dhSum->v, vec_mul(xi.v, wi_dx.v));
-
- div_vSum->v = _mm512_mask_sub_ps(div_vSum->v, knlMask, div_vSum->v,
- vec_mul(mj.v, vec_mul(dvdr.v, wi_dx.v)));
-
- curlvxSum->v = _mm512_mask_add_ps(curlvxSum->v, knlMask,
- vec_mul(mj.v, vec_mul(curlvrx.v, wi_dx.v)),
- curlvxSum->v);
-
- curlvySum->v = _mm512_mask_add_ps(curlvySum->v, knlMask,
- vec_mul(mj.v, vec_mul(curlvry.v, wi_dx.v)),
- curlvySum->v);
-
- curlvzSum->v = _mm512_mask_add_ps(curlvzSum->v, knlMask,
- vec_mul(mj.v, vec_mul(curlvrz.v, wi_dx.v)),
- curlvzSum->v);
-#else
rhoSum->v = vec_mask_add(rhoSum->v, vec_mul(mj.v, wi.v), mask);
rho_dhSum->v = vec_mask_sub(rho_dhSum->v, vec_mul(mj.v, vec_fma(vec_set1(hydro_dimension), wi.v,
vec_mul(xi.v, wi_dx.v))), mask);
@@ -471,7 +442,6 @@ runner_iact_nonsym_1_vec_density(vector *r2, vector *dx, vector *dy, vector *dz,
curlvxSum->v = vec_mask_add(curlvxSum->v,vec_mul(mj.v, vec_mul(curlvrx.v, wi_dx.v)), mask);
curlvySum->v = vec_mask_add(curlvySum->v,vec_mul(mj.v, vec_mul(curlvry.v, wi_dx.v)), mask);
curlvzSum->v = vec_mask_add(curlvzSum->v,vec_mul(mj.v, vec_mul(curlvrz.v, wi_dx.v)), mask);
-#endif
}
/**
@@ -565,56 +535,6 @@ runner_iact_nonsym_2_vec_density(
curlvrz2.v = vec_mul(curlvrz2.v, ri2.v);
/* Mask updates to intermediate vector sums for particle pi. */
-#ifdef HAVE_AVX512_F
- rhoSum->v =
- _mm512_mask_add_ps(rhoSum->v, knlMask, vec_mul(mj.v, wi.v), rhoSum->v);
- rhoSum->v =
- _mm512_mask_add_ps(rhoSum->v, knlMask2, vec_mul(mj2.v, wi2.v), rhoSum->v);
-
- rho_dhSum->v =
- _mm512_mask_sub_ps(rho_dhSum->v, knlMask, rho_dhSum->v,
- vec_mul(mj.v, vec_fma(vec_set1(hydro_dimension), wi.v,
- vec_mul(xi.v, wi_dx.v))));
- rho_dhSum->v = _mm512_mask_sub_ps(
- rho_dhSum->v, knlMask2, rho_dhSum->v,
- vec_mul(mj2.v, vec_fma(vec_set1(hydro_dimension), wi2.v,
- vec_mul(xi2.v, wi_dx2.v))));
-
- wcountSum->v = _mm512_mask_add_ps(wcountSum->v, knlMask, wi.v, wcountSum->v);
- wcountSum->v =
- _mm512_mask_add_ps(wcountSum->v, knlMask2, wi2.v, wcountSum->v);
-
- wcount_dhSum->v = _mm512_mask_sub_ps(wcount_dhSum->v, knlMask,
- wcount_dhSum->v, vec_mul(xi.v, wi_dx.v));
- wcount_dhSum->v = _mm512_mask_sub_ps(
- wcount_dhSum->v, knlMask2, wcount_dhSum->v, vec_mul(xi2.v, wi_dx2.v));
-
- div_vSum->v = _mm512_mask_sub_ps(div_vSum->v, knlMask, div_vSum->v,
- vec_mul(mj.v, vec_mul(dvdr.v, wi_dx.v)));
- div_vSum->v = _mm512_mask_sub_ps(div_vSum->v, knlMask2, div_vSum->v,
- vec_mul(mj2.v, vec_mul(dvdr2.v, wi_dx2.v)));
-
- curlvxSum->v = _mm512_mask_add_ps(curlvxSum->v, knlMask,
- vec_mul(mj.v, vec_mul(curlvrx.v, wi_dx.v)),
- curlvxSum->v);
- curlvxSum->v = _mm512_mask_add_ps(
- curlvxSum->v, knlMask2, vec_mul(mj2.v, vec_mul(curlvrx2.v, wi_dx2.v)),
- curlvxSum->v);
-
- curlvySum->v = _mm512_mask_add_ps(curlvySum->v, knlMask,
- vec_mul(mj.v, vec_mul(curlvry.v, wi_dx.v)),
- curlvySum->v);
- curlvySum->v = _mm512_mask_add_ps(
- curlvySum->v, knlMask2, vec_mul(mj2.v, vec_mul(curlvry2.v, wi_dx2.v)),
- curlvySum->v);
-
- curlvzSum->v = _mm512_mask_add_ps(curlvzSum->v, knlMask,
- vec_mul(mj.v, vec_mul(curlvrz.v, wi_dx.v)),
- curlvzSum->v);
- curlvzSum->v = _mm512_mask_add_ps(
- curlvzSum->v, knlMask2, vec_mul(mj2.v, vec_mul(curlvrz2.v, wi_dx2.v)),
- curlvzSum->v);
-#else
/* Mask only when needed. */
if(mask_cond) {
rhoSum->v = vec_mask_add(rhoSum->v, vec_mul(mj.v, wi.v), mask);
@@ -656,7 +576,6 @@ runner_iact_nonsym_2_vec_density(
curlvzSum->v += vec_mul(mj.v, vec_mul(curlvrz.v, wi_dx.v));
curlvzSum->v += vec_mul(mj2.v, vec_mul(curlvrz2.v, wi_dx2.v));
}
-#endif
}
#endif
--
GitLab