runner_doiact_vec.c 46.3 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 "active.h"

25
26
27
/* This object's header. */
#include "runner_doiact_vec.h"

James Willis's avatar
James Willis committed
28
#ifdef WITH_VECTORIZATION
James Willis's avatar
James Willis committed
29
30
31
/**
 * @brief Compute the vector remainder interactions from the secondary cache.
 *
Matthieu Schaller's avatar
Matthieu Schaller committed
32
 * @param int_cache (return) secondary #cache of interactions between two
James Willis's avatar
James Willis committed
33
 * particles.
James Willis's avatar
James Willis committed
34
 * @param icount Interaction count.
Matthieu Schaller's avatar
Matthieu Schaller committed
35
 * @param rhoSum (return) #vector holding the cumulative sum of the density
James Willis's avatar
James Willis committed
36
 * update on pi.
Matthieu Schaller's avatar
Matthieu Schaller committed
37
 * @param rho_dhSum (return) #vector holding the cumulative sum of the density
James Willis's avatar
James Willis committed
38
 * gradient update on pi.
Matthieu Schaller's avatar
Matthieu Schaller committed
39
 * @param wcountSum (return) #vector holding the cumulative sum of the wcount
James Willis's avatar
James Willis committed
40
 * update on pi.
Matthieu Schaller's avatar
Matthieu Schaller committed
41
 * @param wcount_dhSum (return) #vector holding the cumulative sum of the wcount
James Willis's avatar
James Willis committed
42
 * gradient update on pi.
Matthieu Schaller's avatar
Matthieu Schaller committed
43
 * @param div_vSum (return) #vector holding the cumulative sum of the divergence
James Willis's avatar
James Willis committed
44
 * update on pi.
Matthieu Schaller's avatar
Matthieu Schaller committed
45
 * @param curlvxSum (return) #vector holding the cumulative sum of the curl of
James Willis's avatar
James Willis committed
46
 * vx update on pi.
Matthieu Schaller's avatar
Matthieu Schaller committed
47
 * @param curlvySum (return) #vector holding the cumulative sum of the curl of
James Willis's avatar
James Willis committed
48
 * vy update on pi.
Matthieu Schaller's avatar
Matthieu Schaller committed
49
 * @param curlvzSum (return) #vector holding the cumulative sum of the curl of
James Willis's avatar
James Willis committed
50
 * vz update on pi.
James Willis's avatar
James Willis committed
51
52
53
54
 * @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
55
 * @param icount_align (return) Interaction count after the remainder
James Willis's avatar
James Willis committed
56
 * interactions have been performed, should be a multiple of the vector length.
James Willis's avatar
James Willis committed
57
 */
James Willis's avatar
James Willis committed
58
__attribute__((always_inline)) INLINE static void calcRemInteractions(
Matthieu Schaller's avatar
Matthieu Schaller committed
59
60
61
62
63
    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) {
64
65
66
67
68

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

  /* Work out the number of remainder interactions and pad secondary cache. */
71
72
73
74
75
76
  *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
77
/* Initialise masks to true. */
78
79
80
81
82
83
84
85
86
#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
87
88
89
    /* Pad secondary cache so that there are no contributions in the interaction
     * function. */
    for (int i = icount; i < *icount_align; i++) {
90
91
92
93
94
95
96
97
      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;
98
99
100
101
102
103
104
    }

    /* 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
105
      for (int i = VEC_SIZE - pad; i < VEC_SIZE; i++) int_mask2.i[i] = 0;
106
#endif
James Willis's avatar
James Willis committed
107
    } else {
108
109
110
111
#ifdef HAVE_AVX512_F
      knl_mask = knl_mask >> (VEC_SIZE - rem);
      knl_mask2 = 0;
#else
James Willis's avatar
James Willis committed
112
      for (int i = rem; i < VEC_SIZE; i++) int_mask.i[i] = 0;
113
114
115
116
      int_mask2.v = vec_setzero();
#endif
    }

James Willis's avatar
James Willis committed
117
118
    /* Perform remainder interaction and remove remainder from aligned
     * interaction count. */
119
    *icount_align = icount - rem;
James Willis's avatar
James Willis committed
120
121
122
123
124
125
126
127
    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,
128
#ifdef HAVE_AVX512_F
James Willis's avatar
James Willis committed
129
        knl_mask, knl_mask2);
130
#else
James Willis's avatar
James Willis committed
131
        0, 0);
132
133
134
135
#endif
  }
}

James Willis's avatar
James Willis committed
136
/**
James Willis's avatar
James Willis committed
137
138
 * @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
139
140
 *
 * @param mask Contains which particles need to interact.
Matthieu Schaller's avatar
Matthieu Schaller committed
141
 * @param pjd Index of the particle to store into.
James Willis's avatar
James Willis committed
142
143
144
145
146
147
148
149
150
 * @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
151
 * @param int_cache (return) secondary #cache of interactions between two
James Willis's avatar
James Willis committed
152
 * particles.
James Willis's avatar
James Willis committed
153
154
 * @param icount Interaction count.
 * @param rhoSum #vector holding the cumulative sum of the density update on pi.
James Willis's avatar
James Willis committed
155
156
157
158
159
160
161
162
163
164
165
166
167
168
 * @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
169
170
171
172
173
 * @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
174
175
176
177
178
179
180
181
182
183
184
__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.
 */
185
186
187
188
189
#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
190
191
192
193
194
195
196
197
  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]);
198
199
#else
  vector v_mask;
James Willis's avatar
James Willis committed
200
201
202
203
204
205
206
207
208
209
  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]);
210

211
#endif /* HAVE_AVX512_F */
212
213
214

  (*icount) += pack;
#else
James Willis's avatar
James Willis committed
215
  /* Quicker to do it serially in AVX rather than use intrinsics. */
James Willis's avatar
James Willis committed
216
  for (int bit_index = 0; bit_index < VEC_SIZE; bit_index++) {
217
218
    if (mask & (1 << bit_index)) {
      /* Add this interaction to the queue. */
219
220
221
222
223
224
225
226
      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];
227
228
229
230

      (*icount)++;
    }
  }
231

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

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

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

James Willis's avatar
James Willis committed
239
    /* Peform remainder interactions. */
Matthieu Schaller's avatar
Matthieu Schaller committed
240
241
242
    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);
243
244
245
246

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

    /* Perform interactions. */
James Willis's avatar
James Willis committed
249
250
251
252
253
254
255
    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);
256
    }
James Willis's avatar
James Willis committed
257
258

    /* Reset interaction count. */
259
260
261
    *icount = 0;
  }
}
262

James Willis's avatar
James Willis committed
263
264
265
266
/* @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
267
268
269
270
271
272
273
274
 * @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
275
276
277
278
 * @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
279
280
281
 * @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
282
283
284
285
286
__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,
    int *init_pi, int *init_pj) {
287
288
289
290
291
292
293

  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
294

James Willis's avatar
James Willis committed
295
  /* Get the distance of the last pi and the first pj on the sorted axis.*/
296
297
298
299
  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;
300
  int found_pi = 0;
301

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

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

James Willis's avatar
James Willis committed
307
  /* Find the maximum distance of pi particles into cj.*/
308
309
310
311
  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
312

313
314
315
    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
316
317
    if (!found_pi) {
      if (d >= dj_min) {
318
319
320
321
322
323
324
325
326
327
        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
328

James Willis's avatar
James Willis committed
329
  /* Find the maximum distance of pj particles into ci.*/
330
331
332
333
  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
334

335
336
    max_dj[k] = fmaxf(max_dj[k - 1], d);
  }
James Willis's avatar
James Willis committed
337

338
339
340
341
342
  /* 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
343
344

    if (d <= di_max) {
345
346
347
348
349
      last_pj = k;
      break;
    }
  }

James Willis's avatar
James Willis committed
350
351
  *init_pi = first_pi;
  *init_pj = last_pj;
352
}
James Willis's avatar
James Willis committed
353
#endif /* WITH_VECTORIZATION */
354
355

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

#ifdef WITH_VECTORIZATION
366
  const struct engine *e = r->e;
367
368
369
370
371
372
373
  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
374

375
376
  vector v_hi, v_vix, v_viy, v_viz, v_hig2, v_r2;

James Willis's avatar
James Willis committed
377
  TIMER_TIC
378

379
380
  if (!cell_is_active(c, e)) return;

381
  if (!cell_is_drifted(c, e)) cell_drift_particles(c, e);
382

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

  if (cell_cache->count < count) {
    cache_init(cell_cache, count);
389
390
  }

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

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

  /* 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? */
405
    if (!part_is_active(pi, e)) continue;
406
407
408
409
410

    vector pix, piy, piz;

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

James Willis's avatar
James Willis committed
411
    /* Fill particle pi vectors. */
412
413
414
415
416
417
418
419
420
421
422
    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
423
    /* Reset cumulative sums of update vectors. */
James Willis's avatar
James Willis committed
424
425
426
    vector rhoSum, rho_dhSum, wcountSum, wcount_dhSum, div_vSum, curlvxSum,
        curlvySum, curlvzSum;

James Willis's avatar
James Willis committed
427
    /* Get the inverse of hi. */
428
    vector v_hi_inv;
James Willis's avatar
James Willis committed
429

430
    v_hi_inv = vec_reciprocal(v_hi);
James Willis's avatar
James Willis committed
431

432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
    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;
    }

    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
455
456
    /* Find all of particle pi's interacions and store needed values in the
     * secondary cache.*/
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
    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]);
474
      mj2.v = vec_load(&cell_cache->m[pjd + VEC_SIZE]);
475
476
477
478
479

      /* 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
480
481
      v_dx_tmp.v = vec_sub(pix.v, pjx.v);
      v_dx_tmp2.v = vec_sub(pix.v, pjx2.v);
482
      v_dy_tmp.v = vec_sub(piy.v, pjy.v);
James Willis's avatar
James Willis committed
483
      v_dy_tmp2.v = vec_sub(piy.v, pjy2.v);
484
      v_dz_tmp.v = vec_sub(piz.v, pjz.v);
James Willis's avatar
James Willis committed
485
486
487
488
      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);
489
      v_r2.v = vec_fma(v_dy_tmp.v, v_dy_tmp.v, v_r2.v);
James Willis's avatar
James Willis committed
490
      v_r2_2.v = vec_fma(v_dy_tmp2.v, v_dy_tmp2.v, v_r2_2.v);
491
      v_r2.v = vec_fma(v_dz_tmp.v, v_dz_tmp.v, v_r2.v);
James Willis's avatar
James Willis committed
492
493
494
      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.*/
495
#ifdef HAVE_AVX512_F
James Willis's avatar
James Willis committed
496
      // KNL_MASK_16 doi_mask, doi_mask_check, doi_mask2, doi_mask2_check;
497
498
      KNL_MASK_16 doi_mask_check, doi_mask2, doi_mask2_check;

James Willis's avatar
James Willis committed
499
      doi_mask_check = vec_cmp_gt(v_r2.v, vec_setzero());
500
501
      doi_mask = vec_cmp_lt(v_r2.v, v_hig2.v);

James Willis's avatar
James Willis committed
502
      doi_mask2_check = vec_cmp_gt(v_r2_2.v, vec_setzero());
503
504
505
506
507
508
509
510
511
      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
512
      /* Form r2 > 0 mask and r2 < hig2 mask. */
James Willis's avatar
James Willis committed
513
      v_doi_mask_check.v = vec_cmp_gt(v_r2.v, vec_setzero());
514
515
      v_doi_mask.v = vec_cmp_lt(v_r2.v, v_hig2.v);

James Willis's avatar
James Willis committed
516
      /* Form r2 > 0 mask and r2 < hig2 mask. */
James Willis's avatar
James Willis committed
517
      v_doi_mask2_check.v = vec_cmp_gt(v_r2_2.v, vec_setzero());
518
519
      v_doi_mask2.v = vec_cmp_lt(v_r2_2.v, v_hig2.v);

James Willis's avatar
James Willis committed
520
      /* Combine two masks and form integer mask. */
521
522
      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));
523
#endif /* HAVE_AVX512_F */
524

James Willis's avatar
James Willis committed
525
526
      /* If there are any interactions left pack interaction values into c2
       * cache. */
527
      if (doi_mask) {
James Willis's avatar
James Willis committed
528
529
530
531
532
        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);
533
534
      }
      if (doi_mask2) {
James Willis's avatar
James Willis committed
535
536
537
538
539
        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);
540
541
542
      }
    }

James Willis's avatar
James Willis committed
543
    /* Perform padded vector remainder interactions if any are present. */
Matthieu Schaller's avatar
Matthieu Schaller committed
544
545
546
    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
547
548
549
550
                        &icount_align);

    /* Initialise masks to true in case remainder interactions have been
     * performed. */
551
552
553
554
555
556
557
558
559
560
561
562
    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
563
564
565
566
567
568
569
    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,
570
#ifdef HAVE_AVX512_F
James Willis's avatar
James Willis committed
571
          knl_mask, knl_mask2);
572
#else
James Willis's avatar
James Willis committed
573
          0, 0);
574
575
576
#endif
    }

James Willis's avatar
James Willis committed
577
578
579
580
581
582
583
584
585
586
    /* 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]);
587
588
589
590
591

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

James Willis's avatar
James Willis committed
592
  TIMER_TOC(timer_doself_density);
593
#endif /* WITH_VECTORIZATION */
594
595
596
}

/**
James Willis's avatar
James Willis committed
597
598
 * @brief Compute the cell self-interaction (non-symmetric) using vector
 * intrinsics with two particle pis at a time.
599
 *
James Willis's avatar
James Willis committed
600
 * CURRENTLY BROKEN DO NOT USE.
601
602
603
604
 *
 * @param r The #runner.
 * @param c The #cell.
 */
James Willis's avatar
James Willis committed
605
606
__attribute__((always_inline)) INLINE void runner_doself1_density_vec_2(
    struct runner *r, struct cell *restrict c) {
607
608

#ifdef WITH_VECTORIZATION
609
  const struct engine *e = r->e;
610
611
612
613
614
615
616
617
618
  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
619
  TIMER_TIC
620

621
622
  if (!cell_is_active(c, e)) return;

623
  if (!cell_is_drifted(c, e)) cell_drift_particles(c, e);
624

James Willis's avatar
James Willis committed
625
  /* TODO: Need to find two active particles, not just one. */
626
627
628

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

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

James Willis's avatar
James Willis committed
634
635
  if (cell_cache->count < count) {
    cache_init(cell_cache, count);
636
637
  }

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

James Willis's avatar
James Willis committed
641
  /* Create two secondary caches. */
642
643
  int icount = 0, icount_align = 0;
  struct c2_cache int_cache;
James Willis's avatar
James Willis committed
644

645
646
647
  int icount2 = 0, icount_align2 = 0;
  struct c2_cache int_cache2;

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

James Willis's avatar
James Willis committed
651
    /* Get a pointer to the ith particle and next i particle. */
652
653
654
655
    pi = &parts[pid];
    pi2 = &parts[pid + 1];

    /* Is the ith particle active? */
656
    if (!part_is_active(pi, e)) continue;
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679

    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
680

681
682
683
684
685
    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
686
687
688
689
690
    vector rhoSum, rho_dhSum, wcountSum, wcount_dhSum, div_vSum, curlvxSum,
        curlvySum, curlvzSum;
    vector rhoSum2, rho_dhSum2, wcountSum2, wcount_dhSum2, div_vSum2,
        curlvxSum2, curlvySum2, curlvzSum2;

691
    vector v_hi_inv, v_hi_inv2;
James Willis's avatar
James Willis committed
692

693
694
    v_hi_inv = vec_reciprocal(v_hi);
    v_hi_inv2 = vec_reciprocal(v_hi2);
James Willis's avatar
James Willis committed
695

696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
    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
721
722
723
      /* 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++) {
724
725
726
727
728
729
730
731
732
733
734
        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
735
736
    /* Find all of particle pi's interacions and store needed values in
     * secondary cache.*/
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
    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
754
      mj2.v = vec_load(&cell_cache->m[pjd + VEC_SIZE]);
755
756
757
758
759
760
761

      /* 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
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
      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.*/
791
#ifdef HAVE_AVX512_F
James Willis's avatar
James Willis committed
792
      // KNL_MASK_16 doi_mask, doi_mask_check, doi_mask2, doi_mask2_check;
793
794
795
      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
796
      doi_mask_check = vec_cmp_gt(v_r2.v, vec_setzero());
797
798
      doi_mask = vec_cmp_lt(v_r2.v, v_hig2.v);

James Willis's avatar
James Willis committed
799
      doi2_mask_check = vec_cmp_gt(v2_r2.v, vec_setzero());
800
801
      doi2_mask = vec_cmp_lt(v2_r2.v, v_hig2_2.v);

James Willis's avatar
James Willis committed
802
      doi_mask2_check = vec_cmp_gt(v_r2_2.v, vec_setzero());
803
804
      doi_mask2 = vec_cmp_lt(v_r2_2.v, v_hig2.v);

James Willis's avatar
James Willis committed
805
      doi2_mask2_check = vec_cmp_gt(v2_r2_2.v, vec_setzero());
806
      doi2_mask2 = vec_cmp_lt(v2_r2_2.v, v_hig2_2.v);
James Willis's avatar
James Willis committed
807

808
809
810
811
812
813
814
815
816
817
818
819
      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
820
      v_doi_mask_check.v = vec_cmp_gt(v_r2.v, vec_setzero());
821
822
      v_doi_mask.v = vec_cmp_lt(v_r2.v, v_hig2.v);

James Willis's avatar
James Willis committed
823
      v_doi2_mask_check.v = vec_cmp_gt(v2_r2.v, vec_setzero());
824
825
      v_doi2_mask.v = vec_cmp_lt(v2_r2.v, v_hig2_2.v);

James Willis's avatar
James Willis committed
826
      v_doi_mask2_check.v = vec_cmp_gt(v_r2_2.v, vec_setzero());
827
828
      v_doi_mask2.v = vec_cmp_lt(v_r2_2.v, v_hig2.v);

James Willis's avatar
James Willis committed
829
      v_doi2_mask2_check.v = vec_cmp_gt(v2_r2_2.v, vec_setzero());
830
831
832
833
834
      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
835
836
      doi2_mask2 =
          vec_cmp_result(vec_and(v_doi2_mask2.v, v_doi2_mask2_check.v));
837
#endif /* HAVE_AVX512_F */
838
839

      /* Hit or miss? */
James Willis's avatar
James Willis committed
840
841
842
843
844
845
846
847
848
849
850
851
852
      // 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);
853
854
      //}
      /* Hit or miss? */
James Willis's avatar
James Willis committed
855
856
857
858
859
860
      // 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);
861
      //}
James Willis's avatar
James Willis committed
862
863
864
865
866
867
868
      // 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);
869
870
871
      //}
    }

James Willis's avatar
James Willis committed
872
    /* Perform padded vector remainder interactions if any are present. */
Matthieu Schaller's avatar
Matthieu Schaller committed
873
874
875
    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
876
                        &icount_align);
877

878
    calcRemInteractions(&int_cache2, icount2, &rhoSum2, &rho_dhSum2,
James Willis's avatar
James Willis committed
879
880
881
882
883
884
                        &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. */
885
886
887
888
889
890
891
892
893
894
895
896
    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
897

898
899
900
901
902
    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
903
904
905
906
907
908
909
    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,
910
#ifdef HAVE_AVX512_F
James Willis's avatar
James Willis committed
911
          knl_mask, knl_mask2);
912
#else
James Willis's avatar
James Willis committed
913
          0, 0);
914
915
916
#endif
    }

James Willis's avatar
James Willis committed
917
918
919
920
921
922
923
924
    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,
925
#ifdef HAVE_AVX512_F
James Willis's avatar
James Willis committed
926
          knl_mask, knl_mask2);
927
#else
James Willis's avatar
James Willis committed
928
          0, 0);
929
930
#endif
    }
James Willis's avatar
James Willis committed
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
    /* 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]);
950
951
952
953
954
955

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

James Willis's avatar
James Willis committed
956
  TIMER_TOC(timer_doself_density);
957
#endif /* WITH_VECTORIZATION */
958
}
959

960
/**
James Willis's avatar
James Willis committed
961
962
 * @brief Compute the density interactions between a cell pair (non-symmetric)
 * using vector intrinsics.
963
964
965
966
967
 *
 * @param r The #runner.
 * @param ci The first #cell.
 * @param cj The second #cell.
 */
James Willis's avatar
James Willis committed
968
969
void runner_dopair1_density_vec(struct runner *r, struct cell *ci,
                                struct cell *cj) {
970
971
972
973

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

James Willis's avatar
James Willis committed
974
  vector v_hi, v_vix, v_viy, v_viz, v_hig2;
975
976
977
978
979
980

  TIMER_TIC;

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

981
982
  if (!cell_is_drifted(ci, e)) cell_drift_particles(ci, e);
  if (!cell_is_drifted(cj, e)) cell_drift_particles(cj, e);
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008

  /* 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.");

  /* 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;
  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);

1009
1010
  /* Get both particle caches from the runner and re-allocate
   * them if they are not big enough for the cells. */
1011
1012
  struct cache *restrict ci_cache = &r->ci_cache;
  struct cache *restrict cj_cache = &r->cj_cache;
1013
1014
1015
1016

  if (ci_cache->count < count_i) {
    cache_init(ci_cache, count_i);
  }
1017
1018
  if (cj_cache->count < count_j) {
    cache_init(cj_cache, count_j);
1019
1020
  }

1021
  int first_pi, last_pj;
1022
1023
1024
  float *max_di __attribute__((aligned(sizeof(float) * VEC_SIZE)));
  float *max_dj __attribute__((aligned(sizeof(float) * VEC_SIZE)));

1025
1026
  max_di = r->ci_cache.max_d;
  max_dj = r->cj_cache.max_d;
1027

1028
  /* Find particles maximum distance into cj, max_di[] and ci, max_dj[]. */
James Willis's avatar
James Willis committed
1029
1030
1031
1032
  /* 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);
1033

1034
1035
  /* 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. */
1036
1037
  float di, dj;
  int max_ind_j = count_j - 1;
1038
1039
1040
  int max_ind_i = 0;

  dj = sort_j[max_ind_j].d;
James Willis's avatar
James Willis committed
1041
  while (max_ind_j > 0 && max_di[count_i - 1] < dj) {
1042
1043
1044
1045
1046
1047
    max_ind_j--;

    dj = sort_j[max_ind_j].d;
  }

  di = sort_i[max_ind_i].d;
James Willis's avatar
James Willis committed
1048
  while (max_ind_i < count_i - 1 && max_dj[0] > di) {
1049
1050
1051
1052
1053
    max_ind_i++;

    di = sort_i[max_ind_i].d;
  }

James Willis's avatar
James Willis committed
1054
1055
1056
  /* 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);
1057
  first_pi = min(first_pi, max_ind_i);
1058

1059
  /* Read the needed particles into the two caches. */
1060
1061
  int first_pi_align = first_pi;
  int last_pj_align = last_pj;
James Willis's avatar
James Willis committed
1062
1063
1064
  cache_read_two_partial_cells_sorted(ci, cj, ci_cache, cj_cache, sort_i,
                                      sort_j, shift, &first_pi_align,
                                      &last_pj_align, 1);
1065

1066
  /* Loop over the parts in ci. */
1067
  for (int pid = count_i - 1; pid >= first_pi && max_ind_j >= 0; pid--) {
1068
1069
1070
1071

    /* 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;
1072

1073
    /* Determine the exit iteration of the interaction loop. */
1074
    dj = sort_j[max_ind_j].d;
James Willis's avatar
James Willis committed
1075
    while (max_ind_j > 0 && max_di[pid] < dj) {
1076
1077
1078
1079
      max_ind_j--;

      dj = sort_j[max_ind_j].d;
    }
James Willis's avatar
James Willis committed
1080
    int exit_iteration = max_ind_j + 1;
1081

1082
1083
    /* Set the cache index. */
    int ci_cache_idx = pid - first_pi_align;
1084
1085

    const float hi = ci_cache->h[ci_cache_idx];
1086
1087
1088
1089
1090
    const double di = sort_i[pid].d + hi * kernel_gamma + dx_max - rshift;
    if (di < dj_min) continue;

    const float hig2 = hi * hi * kernel_gamma2;

1091
    vector pix, piy, piz;
1092
1093

    /* Fill particle pi vectors. */
1094
1095
1096
    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]);
1097
    v_hi.v = vec_set1(hi);
1098
1099
1100
    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]);
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121

    v_hig2.v = vec_set1(hig2);

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

    /* Get the inverse of hi. */
    vector v_hi_inv;

    v_hi_inv = vec_reciprocal(v_hi);

    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();

1122
    /* Pad the exit iteration if there is a serial remainder. */
1123
    int exit_iteration_align = exit_iteration;
1124
    int rem = exit_iteration % VEC_SIZE;
1125
    if (rem != 0) {
1126
      int pad = VEC_SIZE - rem;
1127

James Willis's avatar
James Willis committed
1128
1129
      if (exit_iteration_align + pad <= last_pj_align + 1)
        exit_iteration_align += pad;
1130
    }
1131

1132
1133
    vector pjx, pjy, pjz;

1134
    /* Loop over the parts in cj. */
1135
    for (int pjd = 0; pjd < exit_iteration_align; pjd += VEC_SIZE) {
1136

1137
      /* Get the cache index to the jth particle. */
1138
      int cj_cache_idx = pjd;
1139

1140
1141
1142
      vector v_dx, v_dy, v_dz, v_r2;

      /* Load 2 sets of vectors from the particle cache. */
1143
1144
1145
      pjx.v = vec_unaligned_load(&cj_cache->x[cj_cache_idx]);
      pjy.v = vec_unaligned_load(&cj_cache->y[cj_cache_idx]);
      pjz.v = vec_unaligned_load(&cj_cache->z[cj_cache_idx]);
1146

1147
      /* Compute the pairwise distance. */