runner_doiact_vec.c 48.5 KB
Newer Older
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
/*******************************************************************************
 * This file is part of SWIFT.
 * Copyright (c) 2016 James Willis (james.s.willis@durham.ac.uk)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License as published
 * by the Free Software Foundation, either version 3 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 Lesser General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 ******************************************************************************/

/* Config parameters. */
#include "../config.h"

23
24
#include "swift.h"

25
26
#include "active.h"

27
28
29
/* This object's header. */
#include "runner_doiact_vec.h"

30
void runner_dopair1_density(struct runner *r, struct cell *ci, struct cell *cj);
James Willis's avatar
James Willis committed
31
#ifdef WITH_VECTORIZATION
James Willis's avatar
James Willis committed
32
33
34
/**
 * @brief Compute the vector remainder interactions from the secondary cache.
 *
Matthieu Schaller's avatar
Matthieu Schaller committed
35
 * @param int_cache (return) secondary #cache of interactions between two
James Willis's avatar
James Willis committed
36
 * particles.
James Willis's avatar
James Willis committed
37
 * @param icount Interaction count.
Matthieu Schaller's avatar
Matthieu Schaller committed
38
 * @param rhoSum (return) #vector holding the cumulative sum of the density
James Willis's avatar
James Willis committed
39
 * update on pi.
Matthieu Schaller's avatar
Matthieu Schaller committed
40
 * @param rho_dhSum (return) #vector holding the cumulative sum of the density
James Willis's avatar
James Willis committed
41
 * gradient update on pi.
Matthieu Schaller's avatar
Matthieu Schaller committed
42
 * @param wcountSum (return) #vector holding the cumulative sum of the wcount
James Willis's avatar
James Willis committed
43
 * update on pi.
Matthieu Schaller's avatar
Matthieu Schaller committed
44
 * @param wcount_dhSum (return) #vector holding the cumulative sum of the wcount
James Willis's avatar
James Willis committed
45
 * gradient update on pi.
Matthieu Schaller's avatar
Matthieu Schaller committed
46
 * @param div_vSum (return) #vector holding the cumulative sum of the divergence
James Willis's avatar
James Willis committed
47
 * update on pi.
Matthieu Schaller's avatar
Matthieu Schaller committed
48
 * @param curlvxSum (return) #vector holding the cumulative sum of the curl of
James Willis's avatar
James Willis committed
49
 * vx update on pi.
Matthieu Schaller's avatar
Matthieu Schaller committed
50
 * @param curlvySum (return) #vector holding the cumulative sum of the curl of
James Willis's avatar
James Willis committed
51
 * vy update on pi.
Matthieu Schaller's avatar
Matthieu Schaller committed
52
 * @param curlvzSum (return) #vector holding the cumulative sum of the curl of
James Willis's avatar
James Willis committed
53
 * vz update on pi.
James Willis's avatar
James Willis committed
54
55
56
57
 * @param v_hi_inv #vector of 1/h for pi.
 * @param v_vix #vector of x velocity of pi.
 * @param v_viy #vector of y velocity of pi.
 * @param v_viz #vector of z velocity of pi.
Matthieu Schaller's avatar
Matthieu Schaller committed
58
 * @param icount_align (return) Interaction count after the remainder
James Willis's avatar
James Willis committed
59
 * interactions have been performed, should be a multiple of the vector length.
James Willis's avatar
James Willis committed
60
 */
James Willis's avatar
James Willis committed
61
__attribute__((always_inline)) INLINE static void calcRemInteractions(
Matthieu Schaller's avatar
Matthieu Schaller committed
62
63
64
65
66
    struct c2_cache *const int_cache, const int icount, vector *rhoSum,
    vector *rho_dhSum, vector *wcountSum, vector *wcount_dhSum,
    vector *div_vSum, vector *curlvxSum, vector *curlvySum, vector *curlvzSum,
    vector v_hi_inv, vector v_vix, vector v_viy, vector v_viz,
    int *icount_align) {
67
68
69
70
71

#ifdef HAVE_AVX512_F
  KNL_MASK_16 knl_mask, knl_mask2;
#endif
  vector int_mask, int_mask2;
James Willis's avatar
James Willis committed
72
73

  /* Work out the number of remainder interactions and pad secondary cache. */
74
75
76
77
78
79
  *icount_align = icount;
  int rem = icount % (NUM_VEC_PROC * VEC_SIZE);
  if (rem != 0) {
    int pad = (NUM_VEC_PROC * VEC_SIZE) - rem;
    *icount_align += pad;

James Willis's avatar
James Willis committed
80
/* Initialise masks to true. */
81
82
83
84
85
86
87
88
89
#ifdef HAVE_AVX512_F
    knl_mask = 0xFFFF;
    knl_mask2 = 0xFFFF;
    int_mask.m = vec_setint1(0xFFFFFFFF);
    int_mask2.m = vec_setint1(0xFFFFFFFF);
#else
    int_mask.m = vec_setint1(0xFFFFFFFF);
    int_mask2.m = vec_setint1(0xFFFFFFFF);
#endif
James Willis's avatar
James Willis committed
90
91
92
    /* Pad secondary cache so that there are no contributions in the interaction
     * function. */
    for (int i = icount; i < *icount_align; i++) {
93
94
95
96
97
98
99
100
      int_cache->mq[i] = 0.f;
      int_cache->r2q[i] = 1.f;
      int_cache->dxq[i] = 0.f;
      int_cache->dyq[i] = 0.f;
      int_cache->dzq[i] = 0.f;
      int_cache->vxq[i] = 0.f;
      int_cache->vyq[i] = 0.f;
      int_cache->vzq[i] = 0.f;
101
102
103
104
105
106
107
    }

    /* Zero parts of mask that represent the padded values.*/
    if (pad < VEC_SIZE) {
#ifdef HAVE_AVX512_F
      knl_mask2 = knl_mask2 >> pad;
#else
James Willis's avatar
James Willis committed
108
      for (int i = VEC_SIZE - pad; i < VEC_SIZE; i++) int_mask2.i[i] = 0;
109
#endif
James Willis's avatar
James Willis committed
110
    } else {
111
112
113
114
#ifdef HAVE_AVX512_F
      knl_mask = knl_mask >> (VEC_SIZE - rem);
      knl_mask2 = 0;
#else
James Willis's avatar
James Willis committed
115
      for (int i = rem; i < VEC_SIZE; i++) int_mask.i[i] = 0;
116
117
118
119
      int_mask2.v = vec_setzero();
#endif
    }

James Willis's avatar
James Willis committed
120
121
    /* Perform remainder interaction and remove remainder from aligned
     * interaction count. */
122
    *icount_align = icount - rem;
James Willis's avatar
James Willis committed
123
124
125
126
127
128
129
130
    runner_iact_nonsym_2_vec_density(
        &int_cache->r2q[*icount_align], &int_cache->dxq[*icount_align],
        &int_cache->dyq[*icount_align], &int_cache->dzq[*icount_align],
        v_hi_inv, v_vix, v_viy, v_viz, &int_cache->vxq[*icount_align],
        &int_cache->vyq[*icount_align], &int_cache->vzq[*icount_align],
        &int_cache->mq[*icount_align], rhoSum, rho_dhSum, wcountSum,
        wcount_dhSum, div_vSum, curlvxSum, curlvySum, curlvzSum, int_mask,
        int_mask2,
131
#ifdef HAVE_AVX512_F
James Willis's avatar
James Willis committed
132
        knl_mask, knl_mask2);
133
#else
James Willis's avatar
James Willis committed
134
        0, 0);
135
136
137
138
#endif
  }
}

James Willis's avatar
James Willis committed
139
/**
James Willis's avatar
James Willis committed
140
141
 * @brief Left-packs the values needed by an interaction into the secondary
 * cache (Supports AVX, AVX2 and AVX512 instruction sets).
James Willis's avatar
James Willis committed
142
143
 *
 * @param mask Contains which particles need to interact.
Matthieu Schaller's avatar
Matthieu Schaller committed
144
 * @param pjd Index of the particle to store into.
James Willis's avatar
James Willis committed
145
146
147
148
149
150
151
152
153
 * @param v_r2 #vector of the separation between two particles squared.
 * @param v_dx #vector of the x separation between two particles.
 * @param v_dy #vector of the y separation between two particles.
 * @param v_dz #vector of the z separation between two particles.
 * @param v_mj #vector of the mass of particle pj.
 * @param v_vjx #vector of x velocity of pj.
 * @param v_vjy #vector of y velocity of pj.
 * @param v_vjz #vector of z velocity of pj.
 * @param cell_cache #cache of all particles in the cell.
Matthieu Schaller's avatar
Matthieu Schaller committed
154
 * @param int_cache (return) secondary #cache of interactions between two
James Willis's avatar
James Willis committed
155
 * particles.
James Willis's avatar
James Willis committed
156
157
 * @param icount Interaction count.
 * @param rhoSum #vector holding the cumulative sum of the density update on pi.
James Willis's avatar
James Willis committed
158
159
160
161
162
163
164
165
166
167
168
169
170
171
 * @param rho_dhSum #vector holding the cumulative sum of the density gradient
 * update on pi.
 * @param wcountSum #vector holding the cumulative sum of the wcount update on
 * pi.
 * @param wcount_dhSum #vector holding the cumulative sum of the wcount gradient
 * update on pi.
 * @param div_vSum #vector holding the cumulative sum of the divergence update
 * on pi.
 * @param curlvxSum #vector holding the cumulative sum of the curl of vx update
 * on pi.
 * @param curlvySum #vector holding the cumulative sum of the curl of vy update
 * on pi.
 * @param curlvzSum #vector holding the cumulative sum of the curl of vz update
 * on pi.
James Willis's avatar
James Willis committed
172
173
174
175
176
 * @param v_hi_inv #vector of 1/h for pi.
 * @param v_vix #vector of x velocity of pi.
 * @param v_viy #vector of y velocity of pi.
 * @param v_viz #vector of z velocity of pi.
 */
James Willis's avatar
James Willis committed
177
178
179
180
181
182
183
184
185
186
187
__attribute__((always_inline)) INLINE static void storeInteractions(
    const int mask, const int pjd, vector *v_r2, vector *v_dx, vector *v_dy,
    vector *v_dz, vector *v_mj, vector *v_vjx, vector *v_vjy, vector *v_vjz,
    const struct cache *const cell_cache, struct c2_cache *const int_cache,
    int *icount, vector *rhoSum, vector *rho_dhSum, vector *wcountSum,
    vector *wcount_dhSum, vector *div_vSum, vector *curlvxSum,
    vector *curlvySum, vector *curlvzSum, vector v_hi_inv, vector v_vix,
    vector v_viy, vector v_viz) {

/* Left-pack values needed into the secondary cache using the interaction mask.
 */
188
189
190
191
192
#if defined(HAVE_AVX2) || defined(HAVE_AVX512_F)
  int pack = 0;

#ifdef HAVE_AVX512_F
  pack += __builtin_popcount(mask);
James Willis's avatar
James Willis committed
193
194
195
196
197
198
199
200
  VEC_LEFT_PACK(v_r2->v, mask, &int_cache->r2q[*icount]);
  VEC_LEFT_PACK(v_dx->v, mask, &int_cache->dxq[*icount]);
  VEC_LEFT_PACK(v_dy->v, mask, &int_cache->dyq[*icount]);
  VEC_LEFT_PACK(v_dz->v, mask, &int_cache->dzq[*icount]);
  VEC_LEFT_PACK(v_mj->v, mask, &int_cache->mq[*icount]);
  VEC_LEFT_PACK(v_vjx->v, mask, &int_cache->vxq[*icount]);
  VEC_LEFT_PACK(v_vjy->v, mask, &int_cache->vyq[*icount]);
  VEC_LEFT_PACK(v_vjz->v, mask, &int_cache->vzq[*icount]);
201
202
#else
  vector v_mask;
James Willis's avatar
James Willis committed
203
204
205
206
207
208
209
210
211
212
  VEC_FORM_PACKED_MASK(mask, v_mask.m, pack);

  VEC_LEFT_PACK(v_r2->v, v_mask.m, &int_cache->r2q[*icount]);
  VEC_LEFT_PACK(v_dx->v, v_mask.m, &int_cache->dxq[*icount]);
  VEC_LEFT_PACK(v_dy->v, v_mask.m, &int_cache->dyq[*icount]);
  VEC_LEFT_PACK(v_dz->v, v_mask.m, &int_cache->dzq[*icount]);
  VEC_LEFT_PACK(v_mj->v, v_mask.m, &int_cache->mq[*icount]);
  VEC_LEFT_PACK(v_vjx->v, v_mask.m, &int_cache->vxq[*icount]);
  VEC_LEFT_PACK(v_vjy->v, v_mask.m, &int_cache->vyq[*icount]);
  VEC_LEFT_PACK(v_vjz->v, v_mask.m, &int_cache->vzq[*icount]);
213

214
#endif /* HAVE_AVX512_F */
215
216
217

  (*icount) += pack;
#else
James Willis's avatar
James Willis committed
218
  /* Quicker to do it serially in AVX rather than use intrinsics. */
James Willis's avatar
James Willis committed
219
  for (int bit_index = 0; bit_index < VEC_SIZE; bit_index++) {
220
221
    if (mask & (1 << bit_index)) {
      /* Add this interaction to the queue. */
222
223
224
225
226
227
228
229
      int_cache->r2q[*icount] = v_r2->f[bit_index];
      int_cache->dxq[*icount] = v_dx->f[bit_index];
      int_cache->dyq[*icount] = v_dy->f[bit_index];
      int_cache->dzq[*icount] = v_dz->f[bit_index];
      int_cache->mq[*icount] = cell_cache->m[pjd + bit_index];
      int_cache->vxq[*icount] = cell_cache->vx[pjd + bit_index];
      int_cache->vyq[*icount] = cell_cache->vy[pjd + bit_index];
      int_cache->vzq[*icount] = cell_cache->vz[pjd + bit_index];
230
231
232
233

      (*icount)++;
    }
  }
234

James Willis's avatar
James Willis committed
235
236
#endif /* defined(HAVE_AVX2) || defined(HAVE_AVX512_F) */

James Willis's avatar
James Willis committed
237
  /* Flush the c2 cache if it has reached capacity. */
James Willis's avatar
James Willis committed
238
  if (*icount >= (C2_CACHE_SIZE - (NUM_VEC_PROC * VEC_SIZE))) {
239
240

    int icount_align = *icount;
James Willis's avatar
James Willis committed
241

James Willis's avatar
James Willis committed
242
    /* Peform remainder interactions. */
Matthieu Schaller's avatar
Matthieu Schaller committed
243
244
245
    calcRemInteractions(int_cache, *icount, rhoSum, rho_dhSum, wcountSum,
                        wcount_dhSum, div_vSum, curlvxSum, curlvySum, curlvzSum,
                        v_hi_inv, v_vix, v_viy, v_viz, &icount_align);
246
247
248
249

    vector int_mask, int_mask2;
    int_mask.m = vec_setint1(0xFFFFFFFF);
    int_mask2.m = vec_setint1(0xFFFFFFFF);
James Willis's avatar
James Willis committed
250
251

    /* Perform interactions. */
James Willis's avatar
James Willis committed
252
253
254
255
256
257
258
    for (int pjd = 0; pjd < icount_align; pjd += (NUM_VEC_PROC * VEC_SIZE)) {
      runner_iact_nonsym_2_vec_density(
          &int_cache->r2q[pjd], &int_cache->dxq[pjd], &int_cache->dyq[pjd],
          &int_cache->dzq[pjd], v_hi_inv, v_vix, v_viy, v_viz,
          &int_cache->vxq[pjd], &int_cache->vyq[pjd], &int_cache->vzq[pjd],
          &int_cache->mq[pjd], rhoSum, rho_dhSum, wcountSum, wcount_dhSum,
          div_vSum, curlvxSum, curlvySum, curlvzSum, int_mask, int_mask2, 0, 0);
259
    }
James Willis's avatar
James Willis committed
260
261

    /* Reset interaction count. */
262
263
264
    *icount = 0;
  }
}
265

James Willis's avatar
James Willis committed
266
267
268
269
/* @brief Populates the arrays max_di and max_dj with the maximum distances of
 * particles into their neighbouring cells. Also finds the first pi that
 * interacts with any particle in cj and the last pj that interacts with any
 * particle in ci.
James Willis's avatar
James Willis committed
270
271
272
273
274
275
276
277
 * @param ci #cell pointer to ci
 * @param cj #cell pointer to cj
 * @param sort_i #entry array for particle distance in ci
 * @param sort_j #entry array for particle distance in cj
 * @param ci_cache #cache for cell ci
 * @param cj_cache #cache for cell cj
 * @param dx_max maximum particle movement allowed in cell
 * @param rshift cutoff shift
James Willis's avatar
James Willis committed
278
279
280
281
 * @param max_di array to hold the maximum distances of pi particles into cell
 * cj
 * @param max_dj array to hold the maximum distances of pj particles into cell
 * cj
James Willis's avatar
James Willis committed
282
283
284
 * @param init_pi first pi to interact with a pj particle
 * @param init_pj last pj to interact with a pi particle
 */
James Willis's avatar
James Willis committed
285
286
287
288
__attribute__((always_inline)) INLINE static void populate_max_d_no_cache(
    const struct cell *ci, const struct cell *cj,
    const struct entry *restrict sort_i, const struct entry *restrict sort_j,
    const float dx_max, const float rshift, float *max_di, float *max_dj,
289
    int *init_pi, int *init_pj, const struct engine *e) {
290
291
292
293
294
295
296

  struct part *restrict parts_i = ci->parts;
  struct part *restrict parts_j = cj->parts;
  struct part *p = &parts_i[sort_i[0].i];

  float h = p->h;
  float d = sort_i[0].d;
James Willis's avatar
James Willis committed
297

James Willis's avatar
James Willis committed
298
  /* Get the distance of the last pi and the first pj on the sorted axis.*/
299
300
301
302
  const float di_max = sort_i[ci->count - 1].d - rshift;
  const float dj_min = sort_j[0].d;

  int first_pi = 0, last_pj = cj->count - 1;
303
  int found_pi = 0;
304

James Willis's avatar
James Willis committed
305
  /* For particles in ci */
306
307
  max_di[0] = d + h * kernel_gamma + dx_max - rshift;

James Willis's avatar
James Willis committed
308
  if (max_di[0] >= dj_min) found_pi = 1;
309

James Willis's avatar
James Willis committed
310
  /* Find the maximum distance of pi particles into cj.*/
311
312
313
314
  for (int k = 1; k < ci->count; k++) {
    p = &parts_i[sort_i[k].i];
    h = p->h;
    d = sort_i[k].d + h * kernel_gamma + dx_max - rshift;
James Willis's avatar
James Willis committed
315

316
317
318
    max_di[k] = fmaxf(max_di[k - 1], d);

    /* Find the first particle in ci to interact with any particle in cj. */
James Willis's avatar
James Willis committed
319
    if (!found_pi) {
320
      if (d >= dj_min && part_is_active(p,e)) {
321
322
323
324
325
326
327
328
329
330
        first_pi = k;
        found_pi = 1;
      }
    }
  }

  /* For particles in cj */
  p = &parts_j[sort_j[0].i];
  h = p->h;
  max_dj[0] = sort_j[0].d - h * kernel_gamma - dx_max - rshift;
James Willis's avatar
James Willis committed
331

James Willis's avatar
James Willis committed
332
  /* Find the maximum distance of pj particles into ci.*/
333
334
335
336
  for (int k = 1; k < cj->count; k++) {
    p = &parts_j[sort_j[k].i];
    h = p->h;
    d = sort_j[k].d - h * kernel_gamma - dx_max - rshift;
James Willis's avatar
James Willis committed
337

338
339
    max_dj[k] = fmaxf(max_dj[k - 1], d);
  }
James Willis's avatar
James Willis committed
340

341
342
343
344
345
  /* Find the last particle in cj to interact with any particle in ci. */
  for (int k = cj->count - 1; k >= 0; k--) {
    p = &parts_j[sort_j[k].i];
    h = p->h;
    d = sort_j[k].d - h * kernel_gamma - dx_max - rshift;
James Willis's avatar
James Willis committed
346

347
    if (d <= di_max && part_is_active(p,e)) {
348
349
350
351
352
      last_pj = k;
      break;
    }
  }

James Willis's avatar
James Willis committed
353
354
  *init_pi = first_pi;
  *init_pj = last_pj;
355
}
James Willis's avatar
James Willis committed
356
#endif /* WITH_VECTORIZATION */
357
358

/**
James Willis's avatar
James Willis committed
359
360
 * @brief Compute the cell self-interaction (non-symmetric) using vector
 * intrinsics with one particle pi at a time.
361
362
363
364
 *
 * @param r The #runner.
 * @param c The #cell.
 */
James Willis's avatar
James Willis committed
365
366
__attribute__((always_inline)) INLINE void runner_doself1_density_vec(
    struct runner *r, struct cell *restrict c) {
367
368

#ifdef WITH_VECTORIZATION
369
  const struct engine *e = r->e;
370
371
372
373
374
375
376
  int doi_mask;
  struct part *restrict pi;
  int count_align;
  int num_vec_proc = NUM_VEC_PROC;

  struct part *restrict parts = c->parts;
  const int count = c->count;
James Willis's avatar
James Willis committed
377

378
379
  vector v_hi, v_vix, v_viy, v_viz, v_hig2, v_r2;

James Willis's avatar
James Willis committed
380
  TIMER_TIC
381

382
383
  if (!cell_is_active(c, e)) return;

384
  if (!cell_is_drifted(c, e)) cell_drift_particles(c, e);
385

James Willis's avatar
James Willis committed
386
  /* Get the particle cache from the runner and re-allocate
387
   * the cache if it is not big enough for the cell. */
388
  struct cache *restrict cell_cache = &r->ci_cache;
James Willis's avatar
James Willis committed
389
390
391

  if (cell_cache->count < count) {
    cache_init(cell_cache, count);
392
393
  }

James Willis's avatar
James Willis committed
394
  /* Read the particles from the cell and store them locally in the cache. */
James Willis's avatar
James Willis committed
395
  cache_read_particles(c, cell_cache);
396
397
398
399

  /* Create secondary cache to store particle interactions. */
  struct c2_cache int_cache;
  int icount = 0, icount_align = 0;
400
401
402
403
404
405
406
407

  /* Loop over the particles in the cell. */
  for (int pid = 0; pid < count; pid++) {

    /* Get a pointer to the ith particle. */
    pi = &parts[pid];

    /* Is the ith particle active? */
408
    if (!part_is_active(pi, e)) continue;
409
410
411
412
413

    vector pix, piy, piz;

    const float hi = cell_cache->h[pid];

James Willis's avatar
James Willis committed
414
    /* Fill particle pi vectors. */
415
416
417
418
419
420
421
422
423
424
425
    pix.v = vec_set1(cell_cache->x[pid]);
    piy.v = vec_set1(cell_cache->y[pid]);
    piz.v = vec_set1(cell_cache->z[pid]);
    v_hi.v = vec_set1(hi);
    v_vix.v = vec_set1(cell_cache->vx[pid]);
    v_viy.v = vec_set1(cell_cache->vy[pid]);
    v_viz.v = vec_set1(cell_cache->vz[pid]);

    const float hig2 = hi * hi * kernel_gamma2;
    v_hig2.v = vec_set1(hig2);

James Willis's avatar
James Willis committed
426
    /* Reset cumulative sums of update vectors. */
James Willis's avatar
James Willis committed
427
428
429
    vector rhoSum, rho_dhSum, wcountSum, wcount_dhSum, div_vSum, curlvxSum,
        curlvySum, curlvzSum;

James Willis's avatar
James Willis committed
430
    /* Get the inverse of hi. */
431
    vector v_hi_inv;
James Willis's avatar
James Willis committed
432

433
    v_hi_inv = vec_reciprocal(v_hi);
James Willis's avatar
James Willis committed
434

435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
    rhoSum.v = vec_setzero();
    rho_dhSum.v = vec_setzero();
    wcountSum.v = vec_setzero();
    wcount_dhSum.v = vec_setzero();
    div_vSum.v = vec_setzero();
    curlvxSum.v = vec_setzero();
    curlvySum.v = vec_setzero();
    curlvzSum.v = vec_setzero();

    /* Pad cache if there is a serial remainder. */
    count_align = count;
    int rem = count % (num_vec_proc * VEC_SIZE);
    if (rem != 0) {
      int pad = (num_vec_proc * VEC_SIZE) - rem;

      count_align += pad;
451
452
453
454
455
456
457
458

      /* Set positions to the same as particle pi so when the r2 > 0 mask is
       * applied these extra contributions are masked out.*/
      for (int i = count; i < count_align; i++) {
        cell_cache->x[i] = pix.f[0];
        cell_cache->y[i] = piy.f[0];
        cell_cache->z[i] = piz.f[0];
      }
459
460
461
462
463
464
465
    }

    vector pjx, pjy, pjz;
    vector pjvx, pjvy, pjvz, mj;
    vector pjx2, pjy2, pjz2;
    vector pjvx2, pjvy2, pjvz2, mj2;

James Willis's avatar
James Willis committed
466
467
    /* Find all of particle pi's interacions and store needed values in the
     * secondary cache.*/
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
    for (int pjd = 0; pjd < count_align; pjd += (num_vec_proc * VEC_SIZE)) {

      /* Load 2 sets of vectors from the particle cache. */
      pjx.v = vec_load(&cell_cache->x[pjd]);
      pjy.v = vec_load(&cell_cache->y[pjd]);
      pjz.v = vec_load(&cell_cache->z[pjd]);
      pjvx.v = vec_load(&cell_cache->vx[pjd]);
      pjvy.v = vec_load(&cell_cache->vy[pjd]);
      pjvz.v = vec_load(&cell_cache->vz[pjd]);
      mj.v = vec_load(&cell_cache->m[pjd]);

      pjx2.v = vec_load(&cell_cache->x[pjd + VEC_SIZE]);
      pjy2.v = vec_load(&cell_cache->y[pjd + VEC_SIZE]);
      pjz2.v = vec_load(&cell_cache->z[pjd + VEC_SIZE]);
      pjvx2.v = vec_load(&cell_cache->vx[pjd + VEC_SIZE]);
      pjvy2.v = vec_load(&cell_cache->vy[pjd + VEC_SIZE]);
      pjvz2.v = vec_load(&cell_cache->vz[pjd + VEC_SIZE]);
485
      mj2.v = vec_load(&cell_cache->m[pjd + VEC_SIZE]);
486
487
488
489
490

      /* Compute the pairwise distance. */
      vector v_dx_tmp, v_dy_tmp, v_dz_tmp;
      vector v_dx_tmp2, v_dy_tmp2, v_dz_tmp2, v_r2_2;

James Willis's avatar
James Willis committed
491
492
      v_dx_tmp.v = vec_sub(pix.v, pjx.v);
      v_dx_tmp2.v = vec_sub(pix.v, pjx2.v);
493
      v_dy_tmp.v = vec_sub(piy.v, pjy.v);
James Willis's avatar
James Willis committed
494
      v_dy_tmp2.v = vec_sub(piy.v, pjy2.v);
495
      v_dz_tmp.v = vec_sub(piz.v, pjz.v);
James Willis's avatar
James Willis committed
496
497
498
499
      v_dz_tmp2.v = vec_sub(piz.v, pjz2.v);

      v_r2.v = vec_mul(v_dx_tmp.v, v_dx_tmp.v);
      v_r2_2.v = vec_mul(v_dx_tmp2.v, v_dx_tmp2.v);
500
      v_r2.v = vec_fma(v_dy_tmp.v, v_dy_tmp.v, v_r2.v);
James Willis's avatar
James Willis committed
501
      v_r2_2.v = vec_fma(v_dy_tmp2.v, v_dy_tmp2.v, v_r2_2.v);
502
      v_r2.v = vec_fma(v_dz_tmp.v, v_dz_tmp.v, v_r2.v);
James Willis's avatar
James Willis committed
503
504
505
      v_r2_2.v = vec_fma(v_dz_tmp2.v, v_dz_tmp2.v, v_r2_2.v);

/* Form a mask from r2 < hig2 and r2 > 0.*/
506
#ifdef HAVE_AVX512_F
James Willis's avatar
James Willis committed
507
      // KNL_MASK_16 doi_mask, doi_mask_check, doi_mask2, doi_mask2_check;
508
509
      KNL_MASK_16 doi_mask_check, doi_mask2, doi_mask2_check;

James Willis's avatar
James Willis committed
510
      doi_mask_check = vec_cmp_gt(v_r2.v, vec_setzero());
511
512
      doi_mask = vec_cmp_lt(v_r2.v, v_hig2.v);

James Willis's avatar
James Willis committed
513
      doi_mask2_check = vec_cmp_gt(v_r2_2.v, vec_setzero());
514
515
516
517
518
519
520
521
522
      doi_mask2 = vec_cmp_lt(v_r2_2.v, v_hig2.v);

      doi_mask = doi_mask & doi_mask_check;
      doi_mask2 = doi_mask2 & doi_mask2_check;

#else
      vector v_doi_mask, v_doi_mask_check, v_doi_mask2, v_doi_mask2_check;
      int doi_mask2;

James Willis's avatar
James Willis committed
523
      /* Form r2 > 0 mask and r2 < hig2 mask. */
James Willis's avatar
James Willis committed
524
      v_doi_mask_check.v = vec_cmp_gt(v_r2.v, vec_setzero());
525
526
      v_doi_mask.v = vec_cmp_lt(v_r2.v, v_hig2.v);

James Willis's avatar
James Willis committed
527
      /* Form r2 > 0 mask and r2 < hig2 mask. */
James Willis's avatar
James Willis committed
528
      v_doi_mask2_check.v = vec_cmp_gt(v_r2_2.v, vec_setzero());
529
530
      v_doi_mask2.v = vec_cmp_lt(v_r2_2.v, v_hig2.v);

James Willis's avatar
James Willis committed
531
      /* Combine two masks and form integer mask. */
532
533
      doi_mask = vec_cmp_result(vec_and(v_doi_mask.v, v_doi_mask_check.v));
      doi_mask2 = vec_cmp_result(vec_and(v_doi_mask2.v, v_doi_mask2_check.v));
534
#endif /* HAVE_AVX512_F */
535

James Willis's avatar
James Willis committed
536
537
      /* If there are any interactions left pack interaction values into c2
       * cache. */
538
      if (doi_mask) {
James Willis's avatar
James Willis committed
539
540
541
542
543
        storeInteractions(doi_mask, pjd, &v_r2, &v_dx_tmp, &v_dy_tmp, &v_dz_tmp,
                          &mj, &pjvx, &pjvy, &pjvz, cell_cache, &int_cache,
                          &icount, &rhoSum, &rho_dhSum, &wcountSum,
                          &wcount_dhSum, &div_vSum, &curlvxSum, &curlvySum,
                          &curlvzSum, v_hi_inv, v_vix, v_viy, v_viz);
544
545
      }
      if (doi_mask2) {
James Willis's avatar
James Willis committed
546
547
548
549
550
        storeInteractions(
            doi_mask2, pjd + VEC_SIZE, &v_r2_2, &v_dx_tmp2, &v_dy_tmp2,
            &v_dz_tmp2, &mj2, &pjvx2, &pjvy2, &pjvz2, cell_cache, &int_cache,
            &icount, &rhoSum, &rho_dhSum, &wcountSum, &wcount_dhSum, &div_vSum,
            &curlvxSum, &curlvySum, &curlvzSum, v_hi_inv, v_vix, v_viy, v_viz);
551
552
553
      }
    }

James Willis's avatar
James Willis committed
554
    /* Perform padded vector remainder interactions if any are present. */
Matthieu Schaller's avatar
Matthieu Schaller committed
555
556
557
    calcRemInteractions(&int_cache, icount, &rhoSum, &rho_dhSum, &wcountSum,
                        &wcount_dhSum, &div_vSum, &curlvxSum, &curlvySum,
                        &curlvzSum, v_hi_inv, v_vix, v_viy, v_viz,
James Willis's avatar
James Willis committed
558
559
560
561
                        &icount_align);

    /* Initialise masks to true in case remainder interactions have been
     * performed. */
562
563
564
565
566
567
568
569
570
571
572
573
    vector int_mask, int_mask2;
#ifdef HAVE_AVX512_F
    KNL_MASK_16 knl_mask = 0xFFFF;
    KNL_MASK_16 knl_mask2 = 0xFFFF;
    int_mask.m = vec_setint1(0xFFFFFFFF);
    int_mask2.m = vec_setint1(0xFFFFFFFF);
#else
    int_mask.m = vec_setint1(0xFFFFFFFF);
    int_mask2.m = vec_setint1(0xFFFFFFFF);
#endif

    /* Perform interaction with 2 vectors. */
James Willis's avatar
James Willis committed
574
575
576
577
578
579
580
    for (int pjd = 0; pjd < icount_align; pjd += (num_vec_proc * VEC_SIZE)) {
      runner_iact_nonsym_2_vec_density(
          &int_cache.r2q[pjd], &int_cache.dxq[pjd], &int_cache.dyq[pjd],
          &int_cache.dzq[pjd], v_hi_inv, v_vix, v_viy, v_viz,
          &int_cache.vxq[pjd], &int_cache.vyq[pjd], &int_cache.vzq[pjd],
          &int_cache.mq[pjd], &rhoSum, &rho_dhSum, &wcountSum, &wcount_dhSum,
          &div_vSum, &curlvxSum, &curlvySum, &curlvzSum, int_mask, int_mask2,
581
#ifdef HAVE_AVX512_F
James Willis's avatar
James Willis committed
582
          knl_mask, knl_mask2);
583
#else
James Willis's avatar
James Willis committed
584
          0, 0);
585
586
587
#endif
    }

James Willis's avatar
James Willis committed
588
589
590
591
592
593
594
595
596
597
    /* Perform horizontal adds on vector sums and store result in particle pi.
     */
    VEC_HADD(rhoSum, pi->rho);
    VEC_HADD(rho_dhSum, pi->density.rho_dh);
    VEC_HADD(wcountSum, pi->density.wcount);
    VEC_HADD(wcount_dhSum, pi->density.wcount_dh);
    VEC_HADD(div_vSum, pi->density.div_v);
    VEC_HADD(curlvxSum, pi->density.rot_v[0]);
    VEC_HADD(curlvySum, pi->density.rot_v[1]);
    VEC_HADD(curlvzSum, pi->density.rot_v[2]);
598
599
600
601
602

    /* Reset interaction count. */
    icount = 0;
  } /* loop over all particles. */

James Willis's avatar
James Willis committed
603
  TIMER_TOC(timer_doself_density);
604
#endif /* WITH_VECTORIZATION */
605
606
607
}

/**
James Willis's avatar
James Willis committed
608
609
 * @brief Compute the cell self-interaction (non-symmetric) using vector
 * intrinsics with two particle pis at a time.
610
 *
James Willis's avatar
James Willis committed
611
 * CURRENTLY BROKEN DO NOT USE.
612
613
614
615
 *
 * @param r The #runner.
 * @param c The #cell.
 */
James Willis's avatar
James Willis committed
616
617
__attribute__((always_inline)) INLINE void runner_doself1_density_vec_2(
    struct runner *r, struct cell *restrict c) {
618
619

#ifdef WITH_VECTORIZATION
620
  const struct engine *e = r->e;
621
622
623
624
625
626
627
628
629
  int doi_mask;
  int doi2_mask;
  struct part *restrict pi;
  struct part *restrict pi2;
  int count_align;

  vector v_hi, v_vix, v_viy, v_viz, v_hig2, v_r2;
  vector v_hi2, v_vix2, v_viy2, v_viz2, v_hig2_2, v2_r2;

James Willis's avatar
James Willis committed
630
  TIMER_TIC
631

632
633
  if (!cell_is_active(c, e)) return;

634
  if (!cell_is_drifted(c, e)) cell_drift_particles(c, e);
635

James Willis's avatar
James Willis committed
636
  /* TODO: Need to find two active particles, not just one. */
637
638
639

  struct part *restrict parts = c->parts;
  const int count = c->count;
James Willis's avatar
James Willis committed
640
641

  /* Get the particle cache from the runner and re-allocate
James Willis's avatar
James Willis committed
642
   * the cache if it is not big enough for the cell. */
643
  struct cache *restrict cell_cache = &r->ci_cache;
644

James Willis's avatar
James Willis committed
645
646
  if (cell_cache->count < count) {
    cache_init(cell_cache, count);
647
648
  }

James Willis's avatar
James Willis committed
649
  /* Read the particles from the cell and store them locally in the cache. */
650
  cache_read_particles(c, &r->ci_cache);
651

James Willis's avatar
James Willis committed
652
  /* Create two secondary caches. */
653
654
  int icount = 0, icount_align = 0;
  struct c2_cache int_cache;
James Willis's avatar
James Willis committed
655

656
657
658
  int icount2 = 0, icount_align2 = 0;
  struct c2_cache int_cache2;

659
  /* Loop over the particles in the cell. */
James Willis's avatar
James Willis committed
660
  for (int pid = 0; pid < count; pid += 2) {
661

James Willis's avatar
James Willis committed
662
    /* Get a pointer to the ith particle and next i particle. */
663
664
665
666
    pi = &parts[pid];
    pi2 = &parts[pid + 1];

    /* Is the ith particle active? */
667
    if (!part_is_active(pi, e)) continue;
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690

    vector pix, piy, piz;
    vector pix2, piy2, piz2;

    const float hi = cell_cache->h[pid];
    const float hi2 = cell_cache->h[pid + 1];

    /* Fill pi position vector. */
    pix.v = vec_set1(cell_cache->x[pid]);
    piy.v = vec_set1(cell_cache->y[pid]);
    piz.v = vec_set1(cell_cache->z[pid]);
    v_hi.v = vec_set1(hi);
    v_vix.v = vec_set1(cell_cache->vx[pid]);
    v_viy.v = vec_set1(cell_cache->vy[pid]);
    v_viz.v = vec_set1(cell_cache->vz[pid]);

    pix2.v = vec_set1(cell_cache->x[pid + 1]);
    piy2.v = vec_set1(cell_cache->y[pid + 1]);
    piz2.v = vec_set1(cell_cache->z[pid + 1]);
    v_hi2.v = vec_set1(hi2);
    v_vix2.v = vec_set1(cell_cache->vx[pid + 1]);
    v_viy2.v = vec_set1(cell_cache->vy[pid + 1]);
    v_viz2.v = vec_set1(cell_cache->vz[pid + 1]);
James Willis's avatar
James Willis committed
691

692
693
694
695
696
    const float hig2 = hi * hi * kernel_gamma2;
    const float hig2_2 = hi2 * hi2 * kernel_gamma2;
    v_hig2.v = vec_set1(hig2);
    v_hig2_2.v = vec_set1(hig2_2);

James Willis's avatar
James Willis committed
697
698
699
700
701
    vector rhoSum, rho_dhSum, wcountSum, wcount_dhSum, div_vSum, curlvxSum,
        curlvySum, curlvzSum;
    vector rhoSum2, rho_dhSum2, wcountSum2, wcount_dhSum2, div_vSum2,
        curlvxSum2, curlvySum2, curlvzSum2;

702
    vector v_hi_inv, v_hi_inv2;
James Willis's avatar
James Willis committed
703

704
705
    v_hi_inv = vec_reciprocal(v_hi);
    v_hi_inv2 = vec_reciprocal(v_hi2);
James Willis's avatar
James Willis committed
706

707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
    rhoSum.v = vec_setzero();
    rho_dhSum.v = vec_setzero();
    wcountSum.v = vec_setzero();
    wcount_dhSum.v = vec_setzero();
    div_vSum.v = vec_setzero();
    curlvxSum.v = vec_setzero();
    curlvySum.v = vec_setzero();
    curlvzSum.v = vec_setzero();

    rhoSum2.v = vec_setzero();
    rho_dhSum2.v = vec_setzero();
    wcountSum2.v = vec_setzero();
    wcount_dhSum2.v = vec_setzero();
    div_vSum2.v = vec_setzero();
    curlvxSum2.v = vec_setzero();
    curlvySum2.v = vec_setzero();
    curlvzSum2.v = vec_setzero();

    /* Pad cache if there is a serial remainder. */
    count_align = count;
    int rem = count % (NUM_VEC_PROC * VEC_SIZE);
    if (rem != 0) {
      int pad = (NUM_VEC_PROC * VEC_SIZE) - rem;

      count_align += pad;
James Willis's avatar
James Willis committed
732
733
734
      /* Set positions to the same as particle pi so when the r2 > 0 mask is
       * applied these extra contributions are masked out.*/
      for (int i = count; i < count_align; i++) {
735
736
737
738
739
740
741
742
743
744
745
        cell_cache->x[i] = pix.f[0];
        cell_cache->y[i] = piy.f[0];
        cell_cache->z[i] = piz.f[0];
      }
    }

    vector pjx, pjy, pjz;
    vector pjvx, pjvy, pjvz, mj;
    vector pjx2, pjy2, pjz2;
    vector pjvx2, pjvy2, pjvz2, mj2;

James Willis's avatar
James Willis committed
746
747
    /* Find all of particle pi's interacions and store needed values in
     * secondary cache.*/
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
    for (int pjd = 0; pjd < count_align; pjd += (NUM_VEC_PROC * VEC_SIZE)) {

      /* Load 2 sets of vectors from the particle cache. */
      pjx.v = vec_load(&cell_cache->x[pjd]);
      pjy.v = vec_load(&cell_cache->y[pjd]);
      pjz.v = vec_load(&cell_cache->z[pjd]);
      pjvx.v = vec_load(&cell_cache->vx[pjd]);
      pjvy.v = vec_load(&cell_cache->vy[pjd]);
      pjvz.v = vec_load(&cell_cache->vz[pjd]);
      mj.v = vec_load(&cell_cache->m[pjd]);

      pjx2.v = vec_load(&cell_cache->x[pjd + VEC_SIZE]);
      pjy2.v = vec_load(&cell_cache->y[pjd + VEC_SIZE]);
      pjz2.v = vec_load(&cell_cache->z[pjd + VEC_SIZE]);
      pjvx2.v = vec_load(&cell_cache->vx[pjd + VEC_SIZE]);
      pjvy2.v = vec_load(&cell_cache->vy[pjd + VEC_SIZE]);
      pjvz2.v = vec_load(&cell_cache->vz[pjd + VEC_SIZE]);
James Willis's avatar
James Willis committed
765
      mj2.v = vec_load(&cell_cache->m[pjd + VEC_SIZE]);
766
767
768
769
770
771
772

      /* Compute the pairwise distance. */
      vector v_dx_tmp, v_dy_tmp, v_dz_tmp;
      vector v_dx_tmp2, v_dy_tmp2, v_dz_tmp2, v_r2_2;
      vector v_dx2_tmp, v_dy2_tmp, v_dz2_tmp;
      vector v_dx2_tmp2, v_dy2_tmp2, v_dz2_tmp2, v2_r2_2;

James Willis's avatar
James Willis committed
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
      v_dx_tmp.v = vec_sub(pix.v, pjx.v);
      v_dy_tmp.v = vec_sub(piy.v, pjy.v);
      v_dz_tmp.v = vec_sub(piz.v, pjz.v);
      v_dx_tmp2.v = vec_sub(pix.v, pjx2.v);
      v_dy_tmp2.v = vec_sub(piy.v, pjy2.v);
      v_dz_tmp2.v = vec_sub(piz.v, pjz2.v);

      v_dx2_tmp.v = vec_sub(pix2.v, pjx.v);
      v_dy2_tmp.v = vec_sub(piy2.v, pjy.v);
      v_dz2_tmp.v = vec_sub(piz2.v, pjz.v);
      v_dx2_tmp2.v = vec_sub(pix2.v, pjx2.v);
      v_dy2_tmp2.v = vec_sub(piy2.v, pjy2.v);
      v_dz2_tmp2.v = vec_sub(piz2.v, pjz2.v);

      v_r2.v = vec_mul(v_dx_tmp.v, v_dx_tmp.v);
      v_r2.v = vec_fma(v_dy_tmp.v, v_dy_tmp.v, v_r2.v);
      v_r2.v = vec_fma(v_dz_tmp.v, v_dz_tmp.v, v_r2.v);
      v_r2_2.v = vec_mul(v_dx_tmp2.v, v_dx_tmp2.v);
      v_r2_2.v = vec_fma(v_dy_tmp2.v, v_dy_tmp2.v, v_r2_2.v);
      v_r2_2.v = vec_fma(v_dz_tmp2.v, v_dz_tmp2.v, v_r2_2.v);

      v2_r2.v = vec_mul(v_dx2_tmp.v, v_dx2_tmp.v);
      v2_r2.v = vec_fma(v_dy2_tmp.v, v_dy2_tmp.v, v2_r2.v);
      v2_r2.v = vec_fma(v_dz2_tmp.v, v_dz2_tmp.v, v2_r2.v);
      v2_r2_2.v = vec_mul(v_dx2_tmp2.v, v_dx2_tmp2.v);
      v2_r2_2.v = vec_fma(v_dy2_tmp2.v, v_dy2_tmp2.v, v2_r2_2.v);
      v2_r2_2.v = vec_fma(v_dz2_tmp2.v, v_dz2_tmp2.v, v2_r2_2.v);

/* Form a mask from r2 < hig2 and r2 > 0.*/
802
#ifdef HAVE_AVX512_F
James Willis's avatar
James Willis committed
803
      // KNL_MASK_16 doi_mask, doi_mask_check, doi_mask2, doi_mask2_check;
804
805
806
      KNL_MASK_16 doi_mask_check, doi_mask2, doi_mask2_check;
      KNL_MASK_16 doi2_mask_check, doi2_mask2, doi2_mask2_check;

James Willis's avatar
James Willis committed
807
      doi_mask_check = vec_cmp_gt(v_r2.v, vec_setzero());
808
809
      doi_mask = vec_cmp_lt(v_r2.v, v_hig2.v);

James Willis's avatar
James Willis committed
810
      doi2_mask_check = vec_cmp_gt(v2_r2.v, vec_setzero());
811
812
      doi2_mask = vec_cmp_lt(v2_r2.v, v_hig2_2.v);

James Willis's avatar
James Willis committed
813
      doi_mask2_check = vec_cmp_gt(v_r2_2.v, vec_setzero());
814
815
      doi_mask2 = vec_cmp_lt(v_r2_2.v, v_hig2.v);

James Willis's avatar
James Willis committed
816
      doi2_mask2_check = vec_cmp_gt(v2_r2_2.v, vec_setzero());
817
      doi2_mask2 = vec_cmp_lt(v2_r2_2.v, v_hig2_2.v);
James Willis's avatar
James Willis committed
818

819
820
821
822
823
824
825
826
827
828
829
830
      doi_mask = doi_mask & doi_mask_check;
      doi_mask2 = doi_mask2 & doi_mask2_check;

      doi2_mask = doi2_mask & doi2_mask_check;
      doi2_mask2 = doi2_mask2 & doi2_mask2_check;
#else
      vector v_doi_mask, v_doi_mask_check, v_doi_mask2, v_doi_mask2_check;
      int doi_mask2;

      vector v_doi2_mask, v_doi2_mask_check, v_doi2_mask2, v_doi2_mask2_check;
      int doi2_mask2;

James Willis's avatar
James Willis committed
831
      v_doi_mask_check.v = vec_cmp_gt(v_r2.v, vec_setzero());
832
833
      v_doi_mask.v = vec_cmp_lt(v_r2.v, v_hig2.v);

James Willis's avatar
James Willis committed
834
      v_doi2_mask_check.v = vec_cmp_gt(v2_r2.v, vec_setzero());
835
836
      v_doi2_mask.v = vec_cmp_lt(v2_r2.v, v_hig2_2.v);

James Willis's avatar
James Willis committed
837
      v_doi_mask2_check.v = vec_cmp_gt(v_r2_2.v, vec_setzero());
838
839
      v_doi_mask2.v = vec_cmp_lt(v_r2_2.v, v_hig2.v);

James Willis's avatar
James Willis committed
840
      v_doi2_mask2_check.v = vec_cmp_gt(v2_r2_2.v, vec_setzero());
841
842
843
844
845
      v_doi2_mask2.v = vec_cmp_lt(v2_r2_2.v, v_hig2_2.v);

      doi_mask = vec_cmp_result(vec_and(v_doi_mask.v, v_doi_mask_check.v));
      doi_mask2 = vec_cmp_result(vec_and(v_doi_mask2.v, v_doi_mask2_check.v));
      doi2_mask = vec_cmp_result(vec_and(v_doi2_mask.v, v_doi2_mask_check.v));
James Willis's avatar
James Willis committed
846
847
      doi2_mask2 =
          vec_cmp_result(vec_and(v_doi2_mask2.v, v_doi2_mask2_check.v));
848
#endif /* HAVE_AVX512_F */
849
850

      /* Hit or miss? */
James Willis's avatar
James Willis committed
851
852
853
854
855
856
857
858
859
860
861
862
863
      // if (doi_mask) {
      storeInteractions(doi_mask, pjd, &v_r2, &v_dx_tmp, &v_dy_tmp, &v_dz_tmp,
                        &mj, &pjvx, &pjvy, &pjvz, cell_cache, &int_cache,
                        &icount, &rhoSum, &rho_dhSum, &wcountSum, &wcount_dhSum,
                        &div_vSum, &curlvxSum, &curlvySum, &curlvzSum, v_hi_inv,
                        v_vix, v_viy, v_viz);
      //}
      // if (doi2_mask) {
      storeInteractions(
          doi2_mask, pjd, &v2_r2, &v_dx2_tmp, &v_dy2_tmp, &v_dz2_tmp, &mj,
          &pjvx, &pjvy, &pjvz, cell_cache, &int_cache2, &icount2, &rhoSum2,
          &rho_dhSum2, &wcountSum2, &wcount_dhSum2, &div_vSum2, &curlvxSum2,
          &curlvySum2, &curlvzSum2, v_hi_inv2, v_vix2, v_viy2, v_viz2);
864
865
      //}
      /* Hit or miss? */
James Willis's avatar
James Willis committed
866
867
868
869
870
871
      // if (doi_mask2) {
      storeInteractions(doi_mask2, pjd + VEC_SIZE, &v_r2_2, &v_dx_tmp2,
                        &v_dy_tmp2, &v_dz_tmp2, &mj2, &pjvx2, &pjvy2, &pjvz2,
                        cell_cache, &int_cache, &icount, &rhoSum, &rho_dhSum,
                        &wcountSum, &wcount_dhSum, &div_vSum, &curlvxSum,
                        &curlvySum, &curlvzSum, v_hi_inv, v_vix, v_viy, v_viz);
872
      //}
James Willis's avatar
James Willis committed
873
874
875
876
877
878
879
      // if (doi2_mask2) {
      storeInteractions(doi2_mask2, pjd + VEC_SIZE, &v2_r2_2, &v_dx2_tmp2,
                        &v_dy2_tmp2, &v_dz2_tmp2, &mj2, &pjvx2, &pjvy2, &pjvz2,
                        cell_cache, &int_cache2, &icount2, &rhoSum2,
                        &rho_dhSum2, &wcountSum2, &wcount_dhSum2, &div_vSum2,
                        &curlvxSum2, &curlvySum2, &curlvzSum2, v_hi_inv2,
                        v_vix2, v_viy2, v_viz2);
880
881
882
      //}
    }

James Willis's avatar
James Willis committed
883
    /* Perform padded vector remainder interactions if any are present. */
Matthieu Schaller's avatar
Matthieu Schaller committed
884
885
886
    calcRemInteractions(&int_cache, icount, &rhoSum, &rho_dhSum, &wcountSum,
                        &wcount_dhSum, &div_vSum, &curlvxSum, &curlvySum,
                        &curlvzSum, v_hi_inv, v_vix, v_viy, v_viz,
James Willis's avatar
James Willis committed
887
                        &icount_align);
888

889
    calcRemInteractions(&int_cache2, icount2, &rhoSum2, &rho_dhSum2,
James Willis's avatar
James Willis committed
890
891
892
893
894
895
                        &wcountSum2, &wcount_dhSum2, &div_vSum2, &curlvxSum2,
                        &curlvySum2, &curlvzSum2, v_hi_inv2, v_vix2, v_viy2,
                        v_viz2, &icount_align2);

    /* Initialise masks to true incase remainder interactions have been
     * performed. */
896
897
898
899
900
901
902
903
904
905
906
907
    vector int_mask, int_mask2;
    vector int2_mask, int2_mask2;
#ifdef HAVE_AVX512_F
    KNL_MASK_16 knl_mask = 0xFFFF;
    KNL_MASK_16 knl_mask2 = 0xFFFF;
    int_mask.m = vec_setint1(0xFFFFFFFF);
    int_mask2.m = vec_setint1(0xFFFFFFFF);
    int2_mask.m = vec_setint1(0xFFFFFFFF);
    int2_mask2.m = vec_setint1(0xFFFFFFFF);
#else
    int_mask.m = vec_setint1(0xFFFFFFFF);
    int_mask2.m = vec_setint1(0xFFFFFFFF);
James Willis's avatar
James Willis committed
908

909
910
911
912
913
    int2_mask.m = vec_setint1(0xFFFFFFFF);
    int2_mask2.m = vec_setint1(0xFFFFFFFF);
#endif

    /* Perform interaction with 2 vectors. */
James Willis's avatar
James Willis committed
914
915
916
917
918
919
920
    for (int pjd = 0; pjd < icount_align; pjd += (NUM_VEC_PROC * VEC_SIZE)) {
      runner_iact_nonsym_2_vec_density(
          &int_cache.r2q[pjd], &int_cache.dxq[pjd], &int_cache.dyq[pjd],
          &int_cache.dzq[pjd], v_hi_inv, v_vix, v_viy, v_viz,
          &int_cache.vxq[pjd], &int_cache.vyq[pjd], &int_cache.vzq[pjd],
          &int_cache.mq[pjd], &rhoSum, &rho_dhSum, &wcountSum, &wcount_dhSum,
          &div_vSum, &curlvxSum, &curlvySum, &curlvzSum, int_mask, int_mask2,
921
#ifdef HAVE_AVX512_F
James Willis's avatar
James Willis committed
922
          knl_mask, knl_mask2);
923
#else
James Willis's avatar
James Willis committed
924
          0, 0);
925
926
927
#endif
    }

James Willis's avatar
James Willis committed
928
929
930
931
932
933
934
935
    for (int pjd = 0; pjd < icount_align2; pjd += (NUM_VEC_PROC * VEC_SIZE)) {
      runner_iact_nonsym_2_vec_density(
          &int_cache2.r2q[pjd], &int_cache2.dxq[pjd], &int_cache2.dyq[pjd],
          &int_cache2.dzq[pjd], v_hi_inv2, v_vix2, v_viy2, v_viz2,
          &int_cache2.vxq[pjd], &int_cache2.vyq[pjd], &int_cache2.vzq[pjd],
          &int_cache2.mq[pjd], &rhoSum2, &rho_dhSum2, &wcountSum2,
          &wcount_dhSum2, &div_vSum2, &curlvxSum2, &curlvySum2, &curlvzSum2,
          int2_mask, int2_mask2,
936
#ifdef HAVE_AVX512_F
James Willis's avatar
James Willis committed
937
          knl_mask, knl_mask2);
938
#else
James Willis's avatar
James Willis committed
939
          0, 0);
940
941
#endif
    }
James Willis's avatar
James Willis committed
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
    /* Perform horizontal adds on vector sums and store result in particle pi.
     */
    VEC_HADD(rhoSum, pi->rho);
    VEC_HADD(rho_dhSum, pi->density.rho_dh);
    VEC_HADD(wcountSum, pi->density.wcount);
    VEC_HADD(wcount_dhSum, pi->density.wcount_dh);
    VEC_HADD(div_vSum, pi->density.div_v);
    VEC_HADD(curlvxSum, pi->density.rot_v[0]);
    VEC_HADD(curlvySum, pi->density.rot_v[1]);
    VEC_HADD(curlvzSum, pi->density.rot_v[2]);

    VEC_HADD(rhoSum2, pi2->rho);
    VEC_HADD(rho_dhSum2, pi2->density.rho_dh);
    VEC_HADD(wcountSum2, pi2->density.wcount);
    VEC_HADD(wcount_dhSum2, pi2->density.wcount_dh);
    VEC_HADD(div_vSum2, pi2->density.div_v);
    VEC_HADD(curlvxSum2, pi2->density.rot_v[0]);
    VEC_HADD(curlvySum2, pi2->density.rot_v[1]);
    VEC_HADD(curlvzSum2, pi2->density.rot_v[2]);
961
962
963
964
965
966

    /* Reset interaction count. */
    icount = 0;
    icount2 = 0;
  } /* loop over all particles. */

James Willis's avatar
James Willis committed
967
  TIMER_TOC(timer_doself_density);
968
#endif /* WITH_VECTORIZATION */
969
}
970

971
/**
James Willis's avatar
James Willis committed
972
973
 * @brief Compute the density interactions between a cell pair (non-symmetric)
 * using vector intrinsics.
974
975
976
977
978
 *
 * @param r The #runner.
 * @param ci The first #cell.
 * @param cj The second #cell.
 */
James Willis's avatar
James Willis committed
979
980
void runner_dopair1_density_vec(struct runner *r, struct cell *ci,
                                struct cell *cj) {
981
982
983
984

#ifdef WITH_VECTORIZATION
  const struct engine *restrict e = r->e;

James Willis's avatar
James Willis committed
985
  vector v_hi, v_vix, v_viy, v_viz, v_hig2;
986
987
988
989
990
991

  TIMER_TIC;

  /* Anything to do here? */
  if (!cell_is_active(ci, e) && !cell_is_active(cj, e)) return;

992
993
  if (!cell_is_drifted(ci, e)) cell_drift_particles(ci, e);
  if (!cell_is_drifted(cj, e)) cell_drift_particles(cj, e);
994
995
996
997
998
999
1000
1001
1002

  /* Get the sort ID. */
  double shift[3] = {0.0, 0.0, 0.0};
  const int sid = space_getsid(e->s, &ci, &cj, shift);

  /* Have the cells been sorted? */
  if (!(ci->sorted & (1 << sid)) || !(cj->sorted & (1 << sid)))
    error("Trying to interact unsorted cells.");

1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
  if(sid == 0 || sid == 2 || sid == 6 || sid == 8) {
    runner_dopair1_density(r, ci, cj);
  }
  else {
    /* Get the cutoff shift. */
    double rshift = 0.0;
    for (int k = 0; k < 3; k++) rshift += shift[k] * runner_shift[sid][k];

    /* Pick-out the sorted lists. */
    const struct entry *restrict sort_i = &ci->sort[sid * (ci->count + 1)];
    const struct entry *restrict sort_j = &cj->sort[sid * (cj->count + 1)];

    /* Get some other useful values. */
    const int count_i = ci->count;
    const int count_j = cj->count;
    const double hi_max = ci->h_max * kernel_gamma - rshift;
    const double hj_max = cj->h_max * kernel_gamma;
    struct part *restrict parts_i = ci->parts;
    struct part *restrict parts_j = cj->parts;
    const double di_max = sort_i[count_i - 1].d - rshift;
    const double dj_min = sort_j[0].d;
    const float dx_max = (ci->dx_max + cj->dx_max);

    /* Check if any particles are active and return if there are not. */
    int numActive = 0; 
    for (int pid = count_i - 1; 
        pid >= 0 && sort_i[pid].d + hi_max + dx_max > dj_min; pid--) {
      struct part *restrict pi = &parts_i[sort_i[pid].i];
      if (part_is_active(pi, e)) {
        numActive++;
        break;
      }    
    }
1036

1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
    if(!numActive) {
      for (int pjd = 0; pjd < count_j && sort_j[pjd].d - hj_max - dx_max < di_max;
          pjd++) {
        struct part *restrict pj = &parts_j[sort_j[pjd].i];
        if (part_is_active(pj, e)) {
          numActive++;
          break;
        }    
      }    
    }
1047

1048
    if(numActive == 0) return;
1049

1050
1051
1052
1053
    /* Get both particle caches from the runner and re-allocate
     * them if they are not big enough for the cells. */
    struct cache *restrict ci_cache = &r->ci_cache;
    struct cache *restrict cj_cache = &r->cj_cache;
1054

1055
1056
1057
1058
1059
1060
    if (ci_cache->count < count_i) {
      cache_init(ci_cache, count_i);
    }
    if (cj_cache->count < count_j) {
      cache_init(cj_cache, count_j);
    }
1061

1062
1063
1064
    int first_pi, last_pj;
    float *max_di __attribute__((aligned(sizeof(float) * VEC_SIZE)));
    float *max_dj __attribute__((aligned(sizeof(float) * VEC_SIZE)));
1065

1066
1067
    max_di = r->ci_cache.max_d;
    max_dj = r->cj_cache.max_d;
1068

1069
1070
1071
1072
1073
    /* Find particles maximum distance into cj, max_di[] and ci, max_dj[]. */
    /* Also find the first pi that interacts with any particle in cj and the last
     * pj that interacts with any particle in ci. */
    populate_max_d_no_cache(ci, cj, sort_i, sort_j, dx_max, rshift, max_di,
        max_dj, &first_pi, &last_pj, e);
1074

1075
1076
1077
1078
1079
    /* Find the maximum index into cj that is required by a particle in ci. */
    /* Find the maximum index into ci that is required by a particle in cj. */
    float di, dj;
    int max_ind_j = count_j - 1;
    int max_ind_i = 0;
1080
1081

    dj = sort_j[max_ind_j].d;
1082
1083
    while (max_ind_j > 0 && max_di[count_i - 1] < dj) {
      max_ind_j--;
1084

1085
1086
      dj = sort_j[max_ind_j].d;
    }
1087
1088

    di = sort_i[max_ind_i].d;
1089
1090
    while (max_ind_i < count_i - 1 && max_dj[0] > di) {
      max_ind_i++;
1091

1092
1093
      di = sort_i[max_ind_i].d;
    }
1094

1095
1096
1097
1098
    /* Take the max/min of both values calculated to work out how many particles
     * to read into the cache. */
    last_pj = max(last_pj, max_ind_j);
    first_pi = min(first_pi, max_ind_i);
1099

1100
1101
1102
1103
1104
1105
    /* Read the needed particles into the two caches. */
    int first_pi_align = first_pi;
    int last_pj_align = last_pj;
    cache_read_two_partial_cells_sorted(ci, cj, ci_cache, cj_cache, sort_i,
        sort_j, shift, &first_pi_align,
        &last_pj_align, 1);
1106

1107
    if (cell_is_active(ci, e)) {
1108

1109
1110
      /* Loop over the parts in ci. */
      for (int pid = count_i - 1; pid >= first_pi && max_ind_j >= 0; pid--) {
1111

1112
1113
1114
        /* Get a hold of the ith part in ci. */
        struct part *restrict pi = &parts_i[sort_i[pid].i];
        if (!part_is_active(pi, e)) continue;
1115

1116
1117
1118
1119
        /* Determine the exit iteration of the interaction loop. */
        dj = sort_j[max_ind_j].d;
        while (max_ind_j > 0 && max_di[pid] < dj) {
          max_ind_j--;
1120

1121
1122
1123
          dj = sort_j[max_ind_j].d;
        }
        int exit_iteration = max_ind_j + 1;
1124

1125
1126
        /* Set the cache index. */
        int ci_cache_idx = pid - first_pi_align;
1127

1128
1129
1130
        const float hi = ci_cache->h[ci_cache_idx];
        const double di = sort_i[pid].d + hi * kernel_gamma + dx_max - rshift;
        if (di < dj_min) continue;
1131

1132
        const float hig2 = hi * hi * kernel_gamma2;
1133

1134
        vector pix, piy, piz;
1135

1136
1137
1138
1139
1140
1141
1142
1143
        /* Fill particle pi vectors. */
        pix.v = vec_set1(ci_cache->x[ci_cache_idx]);
        piy.v = vec_set1(ci_cache->y[ci_cache_idx]);
        piz.v = vec_set1(ci_cache->z[ci_cache_idx]);
        v_hi.v = vec_set1(hi);
        v_vix.v = vec_set1(ci_cache->vx[ci_cache_idx]);
        v_viy.v = vec_set1(ci_cache->vy[ci_cache_idx]);
        v_viz.v = vec_set1(ci_cache->vz[ci_cache_idx]);
1144

1145
        v_hig2.v = vec_set1(hig2);
1146

1147
1148
1149
        /* Reset cumulative sums of update vectors. */
        vector rhoSum, rho_dhSum, wcountSum, wcount_dhSum, div_vSum, curlvxSum,
               curlvySum, curlvzSum;
1150