runner_doiact_vec.c 70.4 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
23
24
25
/*******************************************************************************
 * 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"

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

26
27
28
/* Local headers. */
#include "active.h"

29
30
31
#ifdef WITH_VECTORIZATION
static const vector kernel_gamma2_vec = FILL_VEC(kernel_gamma2);

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.
James Willis's avatar
James Willis committed
38
 * @param v_rhoSum (return) #vector holding the cumulative sum of the density
James Willis's avatar
James Willis committed
39
 * update on pi.
James Willis's avatar
James Willis committed
40
 * @param v_rho_dhSum (return) #vector holding the cumulative sum of the density
James Willis's avatar
James Willis committed
41
 * gradient update on pi.
James Willis's avatar
James Willis committed
42
 * @param v_wcountSum (return) #vector holding the cumulative sum of the wcount
James Willis's avatar
James Willis committed
43
 * update on pi.
44
45
 * @param v_wcount_dhSum (return) #vector holding the cumulative sum of the
 * wcount
James Willis's avatar
James Willis committed
46
 * gradient update on pi.
47
48
 * @param v_div_vSum (return) #vector holding the cumulative sum of the
 * divergence
James Willis's avatar
James Willis committed
49
 * update on pi.
James Willis's avatar
James Willis committed
50
 * @param v_curlvxSum (return) #vector holding the cumulative sum of the curl of
James Willis's avatar
James Willis committed
51
 * vx update on pi.
James Willis's avatar
James Willis committed
52
 * @param v_curlvySum (return) #vector holding the cumulative sum of the curl of
James Willis's avatar
James Willis committed
53
 * vy update on pi.
James Willis's avatar
James Willis committed
54
 * @param v_curlvzSum (return) #vector holding the cumulative sum of the curl of
James Willis's avatar
James Willis committed
55
 * vz update on pi.
James Willis's avatar
James Willis committed
56
57
58
59
 * @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
60
 * @param icount_align (return) Interaction count after the remainder
James Willis's avatar
James Willis committed
61
 * interactions have been performed, should be a multiple of the vector length.
James Willis's avatar
James Willis committed
62
 */
James Willis's avatar
James Willis committed
63
__attribute__((always_inline)) INLINE static void calcRemInteractions(
James Willis's avatar
James Willis committed
64
65
    struct c2_cache *const int_cache, const int icount, vector *v_rhoSum,
    vector *v_rho_dhSum, vector *v_wcountSum, vector *v_wcount_dhSum,
66
67
68
    vector *v_div_vSum, vector *v_curlvxSum, vector *v_curlvySum,
    vector *v_curlvzSum, vector v_hi_inv, vector v_vix, vector v_viy,
    vector v_viz, int *icount_align) {
69

70
  mask_t int_mask, int_mask2;
James Willis's avatar
James Willis committed
71
72

  /* Work out the number of remainder interactions and pad secondary cache. */
73
74
75
76
77
78
  *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;

79
    /* Initialise masks to true. */
80
81
    vec_init_mask_true(int_mask);
    vec_init_mask_true(int_mask2);
82

James Willis's avatar
James Willis committed
83
84
85
    /* Pad secondary cache so that there are no contributions in the interaction
     * function. */
    for (int i = icount; i < *icount_align; i++) {
86
87
88
89
90
91
92
93
      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;
94
95
96
97
    }

    /* Zero parts of mask that represent the padded values.*/
    if (pad < VEC_SIZE) {
James Willis's avatar
James Willis committed
98
      vec_pad_mask(int_mask2, pad);
James Willis's avatar
James Willis committed
99
    } else {
James Willis's avatar
James Willis committed
100
      vec_pad_mask(int_mask, VEC_SIZE - rem);
101
      vec_zero_mask(int_mask2);
102
103
    }

James Willis's avatar
James Willis committed
104
105
    /* Perform remainder interaction and remove remainder from aligned
     * interaction count. */
106
    *icount_align = icount - rem;
James Willis's avatar
James Willis committed
107
108
109
110
111
    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],
James Willis's avatar
James Willis committed
112
        &int_cache->mq[*icount_align], v_rhoSum, v_rho_dhSum, v_wcountSum,
113
114
        v_wcount_dhSum, v_div_vSum, v_curlvxSum, v_curlvySum, v_curlvzSum,
        int_mask, int_mask2, 1);
115
116
117
  }
}

James Willis's avatar
James Willis committed
118
/**
James Willis's avatar
James Willis committed
119
120
 * @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
121
122
 *
 * @param mask Contains which particles need to interact.
Matthieu Schaller's avatar
Matthieu Schaller committed
123
 * @param pjd Index of the particle to store into.
James Willis's avatar
James Willis committed
124
125
126
127
128
 * @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 cell_cache #cache of all particles in the cell.
Matthieu Schaller's avatar
Matthieu Schaller committed
129
 * @param int_cache (return) secondary #cache of interactions between two
James Willis's avatar
James Willis committed
130
 * particles.
James Willis's avatar
James Willis committed
131
 * @param icount Interaction count.
132
133
 * @param v_rhoSum #vector holding the cumulative sum of the density update on
 * pi.
James Willis's avatar
James Willis committed
134
 * @param v_rho_dhSum #vector holding the cumulative sum of the density gradient
James Willis's avatar
James Willis committed
135
 * update on pi.
James Willis's avatar
James Willis committed
136
 * @param v_wcountSum #vector holding the cumulative sum of the wcount update on
James Willis's avatar
James Willis committed
137
 * pi.
138
139
 * @param v_wcount_dhSum #vector holding the cumulative sum of the wcount
 * gradient
James Willis's avatar
James Willis committed
140
 * update on pi.
James Willis's avatar
James Willis committed
141
 * @param v_div_vSum #vector holding the cumulative sum of the divergence update
James Willis's avatar
James Willis committed
142
 * on pi.
143
144
 * @param v_curlvxSum #vector holding the cumulative sum of the curl of vx
 * update
James Willis's avatar
James Willis committed
145
 * on pi.
146
147
 * @param v_curlvySum #vector holding the cumulative sum of the curl of vy
 * update
James Willis's avatar
James Willis committed
148
 * on pi.
149
150
 * @param v_curlvzSum #vector holding the cumulative sum of the curl of vz
 * update
James Willis's avatar
James Willis committed
151
 * on pi.
James Willis's avatar
James Willis committed
152
153
154
155
156
 * @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
157
__attribute__((always_inline)) INLINE static void storeInteractions(
158
    const int mask, const int pjd, vector *v_r2, vector *v_dx, vector *v_dy,
James Willis's avatar
James Willis committed
159
    vector *v_dz, const struct cache *const cell_cache,
James Willis's avatar
James Willis committed
160
161
    struct c2_cache *const int_cache, int *icount, vector *v_rhoSum,
    vector *v_rho_dhSum, vector *v_wcountSum, vector *v_wcount_dhSum,
162
163
164
    vector *v_div_vSum, vector *v_curlvxSum, vector *v_curlvySum,
    vector *v_curlvzSum, vector v_hi_inv, vector v_vix, vector v_viy,
    vector v_viz) {
James Willis's avatar
James Willis committed
165
166
167

/* Left-pack values needed into the secondary cache using the interaction mask.
 */
168
#if defined(HAVE_AVX2) || defined(HAVE_AVX512_F)
169
170
171
172
173
174
175
  mask_t packed_mask;
  VEC_FORM_PACKED_MASK(mask, packed_mask);

  VEC_LEFT_PACK(v_r2->v, packed_mask, &int_cache->r2q[*icount]);
  VEC_LEFT_PACK(v_dx->v, packed_mask, &int_cache->dxq[*icount]);
  VEC_LEFT_PACK(v_dy->v, packed_mask, &int_cache->dyq[*icount]);
  VEC_LEFT_PACK(v_dz->v, packed_mask, &int_cache->dzq[*icount]);
James Willis's avatar
James Willis committed
176
177
178
179
180
181
182
183
  VEC_LEFT_PACK(vec_load(&cell_cache->m[pjd]), packed_mask,
                &int_cache->mq[*icount]);
  VEC_LEFT_PACK(vec_load(&cell_cache->vx[pjd]), packed_mask,
                &int_cache->vxq[*icount]);
  VEC_LEFT_PACK(vec_load(&cell_cache->vy[pjd]), packed_mask,
                &int_cache->vyq[*icount]);
  VEC_LEFT_PACK(vec_load(&cell_cache->vz[pjd]), packed_mask,
                &int_cache->vzq[*icount]);
184
185
186

  /* Increment interaction count by number of bits set in mask. */
  (*icount) += __builtin_popcount(mask);
187
#else
James Willis's avatar
James Willis committed
188
  /* Quicker to do it serially in AVX rather than use intrinsics. */
James Willis's avatar
James Willis committed
189
  for (int bit_index = 0; bit_index < VEC_SIZE; bit_index++) {
190
191
    if (mask & (1 << bit_index)) {
      /* Add this interaction to the queue. */
192
193
194
195
196
197
198
199
      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];
200
201
202
203

      (*icount)++;
    }
  }
204

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

James Willis's avatar
James Willis committed
207
  /* Flush the c2 cache if it has reached capacity. */
James Willis's avatar
James Willis committed
208
  if (*icount >= (C2_CACHE_SIZE - (NUM_VEC_PROC * VEC_SIZE))) {
209
210

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

James Willis's avatar
James Willis committed
212
    /* Peform remainder interactions. */
James Willis's avatar
James Willis committed
213
    calcRemInteractions(int_cache, *icount, v_rhoSum, v_rho_dhSum, v_wcountSum,
214
215
216
                        v_wcount_dhSum, v_div_vSum, v_curlvxSum, v_curlvySum,
                        v_curlvzSum, v_hi_inv, v_vix, v_viy, v_viz,
                        &icount_align);
217

218
    mask_t int_mask, int_mask2;
219
220
    vec_init_mask_true(int_mask);
    vec_init_mask_true(int_mask2);
James Willis's avatar
James Willis committed
221
222

    /* Perform interactions. */
223
    for (int j = 0; j < icount_align; j += (NUM_VEC_PROC * VEC_SIZE)) {
James Willis's avatar
James Willis committed
224
      runner_iact_nonsym_2_vec_density(
225
226
          &int_cache->r2q[j], &int_cache->dxq[j], &int_cache->dyq[j],
          &int_cache->dzq[j], v_hi_inv, v_vix, v_viy, v_viz, &int_cache->vxq[j],
James Willis's avatar
James Willis committed
227
          &int_cache->vyq[j], &int_cache->vzq[j], &int_cache->mq[j], v_rhoSum,
228
229
          v_rho_dhSum, v_wcountSum, v_wcount_dhSum, v_div_vSum, v_curlvxSum,
          v_curlvySum, v_curlvzSum, int_mask, int_mask2, 0);
230
    }
James Willis's avatar
James Willis committed
231
232

    /* Reset interaction count. */
233
234
235
    *icount = 0;
  }
}
236

237
/**
238
239
 * @brief Populates the arrays max_index_i and max_index_j with the maximum
 * indices of
James Willis's avatar
James Willis committed
240
241
242
 * 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.
243
 *
James Willis's avatar
James Willis committed
244
245
246
247
248
249
 * @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 dx_max maximum particle movement allowed in cell
 * @param rshift cutoff shift
250
251
252
253
 * @param hi_max Maximal smoothing length in cell ci
 * @param hj_max Maximal smoothing length in cell cj
 * @param di_max Maximal position on the axis that can interact in cell ci
 * @param dj_min Minimal position on the axis that can interact in cell ci
254
 * @param max_index_i array to hold the maximum distances of pi particles into
255
 * #cell cj
256
 * @param max_index_j array to hold the maximum distances of pj particles into
257
 * #cell cj
James Willis's avatar
James Willis committed
258
259
 * @param init_pi first pi to interact with a pj particle
 * @param init_pj last pj to interact with a pi particle
260
 * @param max_active_bin The largest time-bin active during this step.
261
 */
262
__attribute__((always_inline)) INLINE static void populate_max_index_no_cache(
James Willis's avatar
James Willis committed
263
264
    const struct cell *ci, const struct cell *cj,
    const struct entry *restrict sort_i, const struct entry *restrict sort_j,
265
266
    const float dx_max, const float rshift, const double hi_max,
    const double hj_max, const double di_max, const double dj_min,
267
    int *max_index_i, int *max_index_j, int *init_pi, int *init_pj,
268
    const timebin_t max_active_bin) {
269

270
271
  const struct part *restrict parts_i = ci->parts;
  const struct part *restrict parts_j = cj->parts;
272

273
  int first_pi = 0, last_pj = cj->count - 1;
274
  int temp;
275

James Willis's avatar
James Willis committed
276
277
  /* Find the leftmost active particle in cell i that interacts with any
   * particle in cell j. */
278
  first_pi = ci->count;
279
  int active_id = first_pi - 1;
280
  while (first_pi > 0 && sort_i[first_pi - 1].d + dx_max + hi_max > dj_min) {
281
    first_pi--;
282
    /* Store the index of the particle if it is active. */
James Willis's avatar
James Willis committed
283
284
    if (part_is_active_no_debug(&parts_i[sort_i[first_pi].i], max_active_bin))
      active_id = first_pi;
285
  }
286

287
288
  /* Set the first active pi in range of any particle in cell j. */
  first_pi = active_id;
289

290
  /* Find the maximum index into cell j for each particle in range in cell i. */
James Willis's avatar
James Willis committed
291
  if (first_pi < ci->count) {
292

293
294
    /* Start from the first particle in cell j. */
    temp = 0;
295

296
    const struct part *pi = &parts_i[sort_i[first_pi].i];
297
298
    const float first_di =
        sort_i[first_pi].d + pi->h * kernel_gamma + dx_max - rshift;
299

James Willis's avatar
James Willis committed
300
301
    /* Loop through particles in cell j until they are not in range of pi.
     * Make sure that temp stays between 0 and cj->count - 1.*/
302
    while (temp < cj->count - 1 && first_di > sort_j[temp].d) temp++;
303

304
    max_index_i[first_pi] = temp;
305

306
    /* Populate max_index_i for remaining particles that are within range. */
James Willis's avatar
James Willis committed
307
    for (int i = first_pi + 1; i < ci->count; i++) {
308
      temp = max_index_i[i - 1];
309
      pi = &parts_i[sort_i[i].i];
310

311
      const float di = sort_i[i].d + pi->h * kernel_gamma + dx_max - rshift;
312

James Willis's avatar
James Willis committed
313
      /* Make sure that temp stays between 0 and cj->count - 1.*/
314
      while (temp < cj->count - 1 && di > sort_j[temp].d) temp++;
James Willis's avatar
James Willis committed
315

316
      max_index_i[i] = temp;
317
    }
James Willis's avatar
James Willis committed
318
  } else {
319
320
    /* Make sure that max index is set to first particle in cj.*/
    max_index_i[ci->count - 1] = 0;
321
  }
James Willis's avatar
James Willis committed
322

James Willis's avatar
James Willis committed
323
324
  /* Find the rightmost active particle in cell j that interacts with any
   * particle in cell i. */
325
  last_pj = -1;
326
  active_id = last_pj;
James Willis's avatar
James Willis committed
327
328
  while (last_pj < cj->count &&
         sort_j[last_pj + 1].d - hj_max - dx_max < di_max) {
329
    last_pj++;
330
    /* Store the index of the particle if it is active. */
James Willis's avatar
James Willis committed
331
332
    if (part_is_active_no_debug(&parts_j[sort_j[last_pj].i], max_active_bin))
      active_id = last_pj;
333
  }
James Willis's avatar
James Willis committed
334

335
  /* Set the last active pj in range of any particle in cell i. */
336
  last_pj = active_id;
337

338
  /* Find the maximum index into cell i for each particle in range in cell j. */
339
  if (last_pj >= 0) {
340

341
342
    /* Start from the last particle in cell i. */
    temp = ci->count - 1;
343

344
    const struct part *pj = &parts_j[sort_j[last_pj].i];
345
346
    const float last_dj =
        sort_j[last_pj].d - dx_max - pj->h * kernel_gamma + rshift;
347

348
    /* Loop through particles in cell i until they are not in range of pj. */
349
    while (temp > 0 && last_dj < sort_i[temp].d) temp--;
350

351
    max_index_j[last_pj] = temp;
352

353
    /* Populate max_index_j for remaining particles that are within range. */
James Willis's avatar
James Willis committed
354
    for (int i = last_pj - 1; i >= 0; i--) {
355
      temp = max_index_j[i + 1];
356
      pj = &parts_j[sort_j[i].i];
357
      const float dj = sort_j[i].d - dx_max - (pj->h * kernel_gamma) + rshift;
358

359
      while (temp > 0 && dj < sort_i[temp].d) temp--;
360

361
      max_index_j[i] = temp;
362
    }
James Willis's avatar
James Willis committed
363
  } else {
364
    /* Make sure that max index is set to last particle in ci.*/
James Willis's avatar
James Willis committed
365
    max_index_j[0] = ci->count - 1;
366
  }
367

James Willis's avatar
James Willis committed
368
369
  *init_pi = first_pi;
  *init_pj = last_pj;
370
371
}

James Willis's avatar
James Willis committed
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
/**
 * @brief Populates the arrays max_index_i and max_index_j with the maximum
 * indices 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.
 *
 * @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 dx_max maximum particle movement allowed in cell
 * @param rshift cutoff shift
 * @param hi_max_raw Maximal smoothing length in cell ci
 * @param hj_max_raw Maximal smoothing length in cell cj
 * @param hi_max Maximal smoothing length in cell ci scaled by kernel_gamma
 * @param hj_max Maximal smoothing length in cell cj scaled by kernel_gamma
 * @param di_max Maximal position on the axis that can interact in cell ci
 * @param dj_min Minimal position on the axis that can interact in cell ci
 * @param max_index_i array to hold the maximum distances of pi particles into
 * #cell cj
 * @param max_index_j array to hold the maximum distances of pj particles into
 * #cell cj
 * @param init_pi first pi to interact with a pj particle
 * @param init_pj last pj to interact with a pi particle
 * @param max_active_bin The largest time-bin active during this step.
 */
James Willis's avatar
James Willis committed
399
400
401
402
403
__attribute__((always_inline)) INLINE static void
populate_max_index_no_cache_force(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,
James Willis's avatar
James Willis committed
404
405
406
407
408
                                  const double hi_max_raw,
                                  const double hj_max_raw, const double hi_max,
                                  const double hj_max, const double di_max,
                                  const double dj_min, int *max_index_i,
                                  int *max_index_j, int *init_pi, int *init_pj,
409
                                  const timebin_t max_active_bin) {
410

411
412
  const struct part *restrict parts_i = ci->parts;
  const struct part *restrict parts_j = cj->parts;
James Willis's avatar
James Willis committed
413

414
  int first_pi = 0, last_pj = cj->count - 1;
415
416
417
418
419
420
  int temp;

  /* Find the leftmost active particle in cell i that interacts with any
   * particle in cell j. */
  first_pi = ci->count;
  int active_id = first_pi - 1;
James Willis's avatar
James Willis committed
421
422
  while (first_pi > 0 &&
         sort_i[first_pi - 1].d + dx_max + max(hi_max, hj_max) > dj_min) {
423
424
    first_pi--;
    /* Store the index of the particle if it is active. */
James Willis's avatar
James Willis committed
425
426
    if (part_is_active_no_debug(&parts_i[sort_i[first_pi].i], max_active_bin))
      active_id = first_pi;
427
  }
428

429
430
431
432
433
434
435
436
437
438
  /* Set the first active pi in range of any particle in cell j. */
  first_pi = active_id;

  /* Find the maximum index into cell j for each particle in range in cell i. */
  if (first_pi < ci->count) {

    /* Start from the first particle in cell j. */
    temp = 0;

    const struct part *pi = &parts_i[sort_i[first_pi].i];
James Willis's avatar
James Willis committed
439
440
441
    const float first_di = sort_i[first_pi].d +
                           max(pi->h, hj_max_raw) * kernel_gamma + dx_max -
                           rshift;
442

James Willis's avatar
James Willis committed
443
444
    /* Loop through particles in cell j until they are not in range of pi.
     * Make sure that temp stays between 0 and cj->count - 1.*/
445
    while (temp < cj->count - 1 && first_di > sort_j[temp].d) temp++;
446
447
448
449
450
451
452
453

    max_index_i[first_pi] = temp;

    /* Populate max_index_i for remaining particles that are within range. */
    for (int i = first_pi + 1; i < ci->count; i++) {
      temp = max_index_i[i - 1];
      pi = &parts_i[sort_i[i].i];

James Willis's avatar
James Willis committed
454
455
456
      const float di =
          sort_i[i].d + max(pi->h, hj_max_raw) * kernel_gamma + dx_max - rshift;

James Willis's avatar
James Willis committed
457
      /* Make sure that temp stays between 0 and cj->count - 1.*/
458
      while (temp < cj->count - 1 && di > sort_j[temp].d) temp++;
James Willis's avatar
James Willis committed
459

460
      max_index_i[i] = temp;
461
    }
462
463
464
  } else {
    /* Make sure that max index is set to first particle in cj.*/
    max_index_i[ci->count - 1] = 0;
465
466
  }

467
468
469
470
471
  /* Find the rightmost active particle in cell j that interacts with any
   * particle in cell i. */
  last_pj = -1;
  active_id = last_pj;
  while (last_pj < cj->count &&
472
         sort_j[last_pj + 1].d - max(hj_max, hi_max) - dx_max < di_max) {
473
474
    last_pj++;
    /* Store the index of the particle if it is active. */
James Willis's avatar
James Willis committed
475
476
    if (part_is_active_no_debug(&parts_j[sort_j[last_pj].i], max_active_bin))
      active_id = last_pj;
477
  }
James Willis's avatar
James Willis committed
478

479
480
  /* Set the last active pj in range of any particle in cell i. */
  last_pj = active_id;
Matthieu Schaller's avatar
Matthieu Schaller committed
481

482
  /* Find the maximum index into cell i for each particle in range in cell j. */
483
  if (last_pj >= 0) {
Matthieu Schaller's avatar
Matthieu Schaller committed
484

485
486
487
488
    /* Start from the last particle in cell i. */
    temp = ci->count - 1;

    const struct part *pj = &parts_j[sort_j[last_pj].i];
James Willis's avatar
James Willis committed
489
490
    const float last_dj = sort_j[last_pj].d - dx_max -
                          max(pj->h, hi_max_raw) * kernel_gamma + rshift;
491
492

    /* Loop through particles in cell i until they are not in range of pj. */
493
    while (temp > 0 && last_dj < sort_i[temp].d) temp--;
James Willis's avatar
James Willis committed
494

495
496
497
498
499
500
501
    max_index_j[last_pj] = temp;

    /* Populate max_index_j for remaining particles that are within range. */
    for (int i = last_pj - 1; i >= 0; i--) {
      temp = max_index_j[i + 1];
      pj = &parts_j[sort_j[i].i];

James Willis's avatar
James Willis committed
502
503
504
      const float dj = sort_j[i].d - dx_max -
                       (max(pj->h, hi_max_raw) * kernel_gamma) + rshift;

505
      while (temp > 0 && dj < sort_i[temp].d) temp--;
James Willis's avatar
James Willis committed
506

507
      max_index_j[i] = temp;
508
    }
509
510
511
  } else {
    /* Make sure that max index is set to last particle in ci.*/
    max_index_j[0] = ci->count - 1;
512
513
  }

James Willis's avatar
James Willis committed
514
515
  *init_pi = first_pi;
  *init_pj = last_pj;
516
}
517

James Willis's avatar
James Willis committed
518
#endif /* WITH_VECTORIZATION */
519
520

/**
James Willis's avatar
James Willis committed
521
522
 * @brief Compute the cell self-interaction (non-symmetric) using vector
 * intrinsics with one particle pi at a time.
523
524
525
526
 *
 * @param r The #runner.
 * @param c The #cell.
 */
James Willis's avatar
James Willis committed
527
528
__attribute__((always_inline)) INLINE void runner_doself1_density_vec(
    struct runner *r, struct cell *restrict c) {
529
530

#ifdef WITH_VECTORIZATION
Matthieu Schaller's avatar
Matthieu Schaller committed
531
532
533
  /* Get some local variables */
  const struct engine *e = r->e;
  const timebin_t max_active_bin = e->max_active_bin;
534
535
  struct part *restrict parts = c->parts;
  const int count = c->count;
James Willis's avatar
James Willis committed
536

Matthieu Schaller's avatar
Matthieu Schaller committed
537
  TIMER_TIC;
538

Matthieu Schaller's avatar
Matthieu Schaller committed
539
  /* Anything to do here? */
540
541
  if (!cell_is_active(c, e)) return;

542
  if (!cell_are_part_drifted(c, e)) error("Interacting undrifted cell.");
543

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

  if (cell_cache->count < count) {
    cache_init(cell_cache, count);
550
551
  }

James Willis's avatar
James Willis committed
552
  /* Read the particles from the cell and store them locally in the cache. */
James Willis's avatar
James Willis committed
553
  cache_read_particles(c, cell_cache);
554
555
556
557

  /* Create secondary cache to store particle interactions. */
  struct c2_cache int_cache;
  int icount = 0, icount_align = 0;
558
559
560
561
562

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

    /* Get a pointer to the ith particle. */
Matthieu Schaller's avatar
Matthieu Schaller committed
563
    struct part *restrict pi = &parts[pid];
564
565

    /* Is the ith particle active? */
566
    if (!part_is_active_no_debug(pi, max_active_bin)) continue;
567
568
569

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

James Willis's avatar
James Willis committed
570
    /* Fill particle pi vectors. */
571
572
573
574
575
576
577
    const vector v_pix = vector_set1(cell_cache->x[pid]);
    const vector v_piy = vector_set1(cell_cache->y[pid]);
    const vector v_piz = vector_set1(cell_cache->z[pid]);
    const vector v_hi = vector_set1(hi);
    const vector v_vix = vector_set1(cell_cache->vx[pid]);
    const vector v_viy = vector_set1(cell_cache->vy[pid]);
    const vector v_viz = vector_set1(cell_cache->vz[pid]);
578
579

    const float hig2 = hi * hi * kernel_gamma2;
580
    const vector v_hig2 = vector_set1(hig2);
James Willis's avatar
James Willis committed
581

James Willis's avatar
James Willis committed
582
    /* Get the inverse of hi. */
583
    vector v_hi_inv = vec_reciprocal(v_hi);
James Willis's avatar
James Willis committed
584

585
586
587
588
589
590
591
592
593
    /* Reset cumulative sums of update vectors. */
    vector v_rhoSum = vector_setzero();
    vector v_rho_dhSum = vector_setzero();
    vector v_wcountSum = vector_setzero();
    vector v_wcount_dhSum = vector_setzero();
    vector v_div_vSum = vector_setzero();
    vector v_curlvxSum = vector_setzero();
    vector v_curlvySum = vector_setzero();
    vector v_curlvzSum = vector_setzero();
594
595

    /* Pad cache if there is a serial remainder. */
Matthieu Schaller's avatar
Matthieu Schaller committed
596
    int count_align = count;
James Willis's avatar
James Willis committed
597
    const int rem = count % (NUM_VEC_PROC * VEC_SIZE);
598
    if (rem != 0) {
James Willis's avatar
James Willis committed
599
      count_align += (NUM_VEC_PROC * VEC_SIZE) - rem;
600
601
602
603

      /* 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++) {
James Willis's avatar
James Willis committed
604
605
606
        cell_cache->x[i] = v_pix.f[0];
        cell_cache->y[i] = v_piy.f[0];
        cell_cache->z[i] = v_piz.f[0];
607
      }
608
609
    }

James Willis's avatar
James Willis committed
610
611
    /* Find all of particle pi's interacions and store needed values in the
     * secondary cache.*/
James Willis's avatar
James Willis committed
612
    for (int pjd = 0; pjd < count_align; pjd += (NUM_VEC_PROC * VEC_SIZE)) {
613
614

      /* Load 2 sets of vectors from the particle cache. */
615
616
617
      const vector v_pjx = vector_load(&cell_cache->x[pjd]);
      const vector v_pjy = vector_load(&cell_cache->y[pjd]);
      const vector v_pjz = vector_load(&cell_cache->z[pjd]);
618

619
620
621
      const vector v_pjx2 = vector_load(&cell_cache->x[pjd + VEC_SIZE]);
      const vector v_pjy2 = vector_load(&cell_cache->y[pjd + VEC_SIZE]);
      const vector v_pjz2 = vector_load(&cell_cache->z[pjd + VEC_SIZE]);
James Willis's avatar
James Willis committed
622

623
      /* Compute the pairwise distance. */
James Willis's avatar
James Willis committed
624
      vector v_dx, v_dy, v_dz, v_r2;
625
626
      vector v_dx_2, v_dy_2, v_dz_2, v_r2_2;

James Willis's avatar
James Willis committed
627
628
629
630
631
632
      v_dx.v = vec_sub(v_pix.v, v_pjx.v);
      v_dx_2.v = vec_sub(v_pix.v, v_pjx2.v);
      v_dy.v = vec_sub(v_piy.v, v_pjy.v);
      v_dy_2.v = vec_sub(v_piy.v, v_pjy2.v);
      v_dz.v = vec_sub(v_piz.v, v_pjz.v);
      v_dz_2.v = vec_sub(v_piz.v, v_pjz2.v);
633
634
635
636
637
638
639

      v_r2.v = vec_mul(v_dx.v, v_dx.v);
      v_r2_2.v = vec_mul(v_dx_2.v, v_dx_2.v);
      v_r2.v = vec_fma(v_dy.v, v_dy.v, v_r2.v);
      v_r2_2.v = vec_fma(v_dy_2.v, v_dy_2.v, v_r2_2.v);
      v_r2.v = vec_fma(v_dz.v, v_dz.v, v_r2.v);
      v_r2_2.v = vec_fma(v_dz_2.v, v_dz_2.v, v_r2_2.v);
James Willis's avatar
James Willis committed
640

641
      /* Form a mask from r2 < hig2 and r2 > 0.*/
James Willis's avatar
James Willis committed
642
643
      mask_t v_doi_mask, v_doi_mask_self_check, v_doi_mask2,
          v_doi_mask2_self_check;
644

James Willis's avatar
James Willis committed
645
      /* Form r2 > 0 mask and r2 < hig2 mask. */
646
      vec_create_mask(v_doi_mask_self_check, vec_cmp_gt(v_r2.v, vec_setzero()));
647
      vec_create_mask(v_doi_mask, vec_cmp_lt(v_r2.v, v_hig2.v));
648

James Willis's avatar
James Willis committed
649
      /* Form r2 > 0 mask and r2 < hig2 mask. */
James Willis's avatar
James Willis committed
650
651
      vec_create_mask(v_doi_mask2_self_check,
                      vec_cmp_gt(v_r2_2.v, vec_setzero()));
652
      vec_create_mask(v_doi_mask2, vec_cmp_lt(v_r2_2.v, v_hig2.v));
653

James Willis's avatar
James Willis committed
654
      /* Combine two masks and form integer masks. */
655
656
657
658
      const int doi_mask = vec_is_mask_true(v_doi_mask) &
                           vec_is_mask_true(v_doi_mask_self_check);
      const int doi_mask2 = vec_is_mask_true(v_doi_mask2) &
                            vec_is_mask_true(v_doi_mask2_self_check);
659

660
#ifdef DEBUG_INTERACTIONS_SPH
661
662
      for (int bit_index = 0; bit_index < VEC_SIZE; bit_index++) {
        if (doi_mask & (1 << bit_index)) {
663
          pi->ids_ngbs_density[pi->num_ngb_density] = parts[pjd + bit_index].id;
664
665
666
          ++pi->num_ngb_density;
        }
        if (doi_mask2 & (1 << bit_index)) {
667
          pi->ids_ngbs_density[pi->num_ngb_density] = parts[pjd + VEC_SIZE + bit_index].id;
668
669
670
671
672
          ++pi->num_ngb_density;
        }
      }
#endif

James Willis's avatar
James Willis committed
673
674
      /* If there are any interactions left pack interaction values into c2
       * cache. */
675
      if (doi_mask) {
James Willis's avatar
James Willis committed
676
        storeInteractions(doi_mask, pjd, &v_r2, &v_dx, &v_dy, &v_dz, cell_cache,
677
678
679
680
                          &int_cache, &icount, &v_rhoSum, &v_rho_dhSum,
                          &v_wcountSum, &v_wcount_dhSum, &v_div_vSum,
                          &v_curlvxSum, &v_curlvySum, &v_curlvzSum, v_hi_inv,
                          v_vix, v_viy, v_viz);
681
      }
James Willis's avatar
James Willis committed
682
683
      if (doi_mask2) {
        storeInteractions(doi_mask2, pjd + VEC_SIZE, &v_r2_2, &v_dx_2, &v_dy_2,
James Willis's avatar
James Willis committed
684
                          &v_dz_2, cell_cache, &int_cache, &icount, &v_rhoSum,
685
686
687
                          &v_rho_dhSum, &v_wcountSum, &v_wcount_dhSum,
                          &v_div_vSum, &v_curlvxSum, &v_curlvySum, &v_curlvzSum,
                          v_hi_inv, v_vix, v_viy, v_viz);
James Willis's avatar
James Willis committed
688
      }
689
690
    }

James Willis's avatar
James Willis committed
691
    /* Perform padded vector remainder interactions if any are present. */
692
693
694
695
    calcRemInteractions(&int_cache, icount, &v_rhoSum, &v_rho_dhSum,
                        &v_wcountSum, &v_wcount_dhSum, &v_div_vSum,
                        &v_curlvxSum, &v_curlvySum, &v_curlvzSum, v_hi_inv,
                        v_vix, v_viy, v_viz, &icount_align);
James Willis's avatar
James Willis committed
696
697
698

    /* Initialise masks to true in case remainder interactions have been
     * performed. */
699
    mask_t int_mask, int_mask2;
700
701
    vec_init_mask_true(int_mask);
    vec_init_mask_true(int_mask2);
702
703

    /* Perform interaction with 2 vectors. */
James Willis's avatar
James Willis committed
704
    for (int pjd = 0; pjd < icount_align; pjd += (NUM_VEC_PROC * VEC_SIZE)) {
James Willis's avatar
James Willis committed
705
706
707
708
      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],
709
710
711
          &int_cache.mq[pjd], &v_rhoSum, &v_rho_dhSum, &v_wcountSum,
          &v_wcount_dhSum, &v_div_vSum, &v_curlvxSum, &v_curlvySum,
          &v_curlvzSum, int_mask, int_mask2, 0);
712
713
    }

James Willis's avatar
James Willis committed
714
715
    /* Perform horizontal adds on vector sums and store result in particle pi.
     */
James Willis's avatar
James Willis committed
716
717
718
719
720
721
722
723
    VEC_HADD(v_rhoSum, pi->rho);
    VEC_HADD(v_rho_dhSum, pi->density.rho_dh);
    VEC_HADD(v_wcountSum, pi->density.wcount);
    VEC_HADD(v_wcount_dhSum, pi->density.wcount_dh);
    VEC_HADD(v_div_vSum, pi->density.div_v);
    VEC_HADD(v_curlvxSum, pi->density.rot_v[0]);
    VEC_HADD(v_curlvySum, pi->density.rot_v[1]);
    VEC_HADD(v_curlvzSum, pi->density.rot_v[2]);
724
725
726
727
728

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

James Willis's avatar
James Willis committed
729
  TIMER_TOC(timer_doself_density);
730
#endif /* WITH_VECTORIZATION */
731
732
}

733
734
735
736
737
738
739
740
741
742
/**
 * @brief Compute the interactions between a cell pair, but only for the
 *      given indices in ci. (Vectorised)
 *
 * @param r The #runner.
 * @param c The first #cell.
 * @param parts The #part to interact.
 * @param ind The list of indices of particles in @c c to interact with.
 * @param pi_count The number of particles in @c ind.
 */
743
__attribute__((always_inline)) INLINE void runner_doself_subset_density_vec(
James Willis's avatar
James Willis committed
744
745
    struct runner *r, struct cell *restrict c, struct part *restrict parts,
    int *restrict ind, int pi_count) {
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766

#ifdef WITH_VECTORIZATION
  const int count = c->count;

  TIMER_TIC

  /* Get the particle cache from the runner and re-allocate
   * the cache if it is not big enough for the cell. */
  struct cache *restrict cell_cache = &r->ci_cache;

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

  /* Read the particles from the cell and store them locally in the cache. */
  cache_read_particles(c, cell_cache);

  /* Create secondary cache to store particle interactions. */
  struct c2_cache int_cache;
  int icount = 0, icount_align = 0;

767
  /* Loop over the subset of particles in the parts that need updating. */
768
769
770
  for (int pid = 0; pid < pi_count; pid++) {

    /* Get a pointer to the ith particle. */
Matthieu Schaller's avatar
Matthieu Schaller committed
771
    struct part *pi = &parts[ind[pid]];
772

773
774
775
776
#ifdef SWIFT_DEBUG_CHECKS
    const struct engine *e = r->e;
    if (!part_is_active(pi, e)) error("Inactive particle in subset function!");
#endif
777

778
    const float hi = pi->h;
779
780

    /* Fill particle pi vectors. */
James Willis's avatar
James Willis committed
781
782
783
784
785
786
787
    const vector v_pix = vector_set1(pi->x[0] - c->loc[0]);
    const vector v_piy = vector_set1(pi->x[1] - c->loc[1]);
    const vector v_piz = vector_set1(pi->x[2] - c->loc[2]);
    const vector v_hi = vector_set1(hi);
    const vector v_vix = vector_set1(pi->v[0]);
    const vector v_viy = vector_set1(pi->v[1]);
    const vector v_viz = vector_set1(pi->v[2]);
788
789

    const float hig2 = hi * hi * kernel_gamma2;
James Willis's avatar
James Willis committed
790
    const vector v_hig2 = vector_set1(hig2);
791
792

    /* Get the inverse of hi. */
James Willis's avatar
James Willis committed
793
    vector v_hi_inv = vec_reciprocal(v_hi);
794

James Willis's avatar
James Willis committed
795
796
797
798
799
800
801
802
803
    /* Reset cumulative sums of update vectors. */
    vector v_rhoSum = vector_setzero();
    vector v_rho_dhSum = vector_setzero();
    vector v_wcountSum = vector_setzero();
    vector v_wcount_dhSum = vector_setzero();
    vector v_div_vSum = vector_setzero();
    vector v_curlvxSum = vector_setzero();
    vector v_curlvySum = vector_setzero();
    vector v_curlvzSum = vector_setzero();
804
805

    /* Pad cache if there is a serial remainder. */
James Willis's avatar
James Willis committed
806
    int count_align = count;
Matthieu Schaller's avatar
Matthieu Schaller committed
807
    const int rem = count % (NUM_VEC_PROC * VEC_SIZE);
808
    if (rem != 0) {
Matthieu Schaller's avatar
Matthieu Schaller committed
809
      const int pad = (NUM_VEC_PROC * VEC_SIZE) - rem;
810
811
812
813
814
815

      count_align += pad;

      /* 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++) {
James Willis's avatar
James Willis committed
816
817
818
        cell_cache->x[i] = v_pix.f[0];
        cell_cache->y[i] = v_piy.f[0];
        cell_cache->z[i] = v_piz.f[0];
819
820
821
822
823
      }
    }

    /* Find all of particle pi's interacions and store needed values in the
     * secondary cache.*/
James Willis's avatar
James Willis committed
824
    for (int pjd = 0; pjd < count_align; pjd += (NUM_VEC_PROC * VEC_SIZE)) {
825
826

      /* Load 2 sets of vectors from the particle cache. */
James Willis's avatar
James Willis committed
827
828
829
      const vector v_pjx = vector_load(&cell_cache->x[pjd]);
      const vector v_pjy = vector_load(&cell_cache->y[pjd]);
      const vector v_pjz = vector_load(&cell_cache->z[pjd]);
830

James Willis's avatar
James Willis committed
831
832
833
      const vector v_pjx2 = vector_load(&cell_cache->x[pjd + VEC_SIZE]);
      const vector v_pjy2 = vector_load(&cell_cache->y[pjd + VEC_SIZE]);
      const vector v_pjz2 = vector_load(&cell_cache->z[pjd + VEC_SIZE]);
834
835

      /* Compute the pairwise distance. */
James Willis's avatar
James Willis committed
836
      vector v_dx, v_dy, v_dz, v_r2;
837
838
      vector v_dx_2, v_dy_2, v_dz_2, v_r2_2;

Matthieu Schaller's avatar
Matthieu Schaller committed
839
      /* p_i - p_j */
James Willis's avatar
James Willis committed
840
841
842
843
844
845
      v_dx.v = vec_sub(v_pix.v, v_pjx.v);
      v_dx_2.v = vec_sub(v_pix.v, v_pjx2.v);
      v_dy.v = vec_sub(v_piy.v, v_pjy.v);
      v_dy_2.v = vec_sub(v_piy.v, v_pjy2.v);
      v_dz.v = vec_sub(v_piz.v, v_pjz.v);
      v_dz_2.v = vec_sub(v_piz.v, v_pjz2.v);
846

Matthieu Schaller's avatar
Matthieu Schaller committed
847
      /* r2 = dx^2 + dy^2 + dz^2 */
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
      v_r2.v = vec_mul(v_dx.v, v_dx.v);
      v_r2_2.v = vec_mul(v_dx_2.v, v_dx_2.v);
      v_r2.v = vec_fma(v_dy.v, v_dy.v, v_r2.v);
      v_r2_2.v = vec_fma(v_dy_2.v, v_dy_2.v, v_r2_2.v);
      v_r2.v = vec_fma(v_dz.v, v_dz.v, v_r2.v);
      v_r2_2.v = vec_fma(v_dz_2.v, v_dz_2.v, v_r2_2.v);

      /* Form a mask from r2 < hig2 and r2 > 0.*/
      mask_t v_doi_mask, v_doi_mask_self_check, v_doi_mask2,
          v_doi_mask2_self_check;

      /* Form r2 > 0 mask and r2 < hig2 mask. */
      vec_create_mask(v_doi_mask_self_check, vec_cmp_gt(v_r2.v, vec_setzero()));
      vec_create_mask(v_doi_mask, vec_cmp_lt(v_r2.v, v_hig2.v));

      /* Form r2 > 0 mask and r2 < hig2 mask. */
      vec_create_mask(v_doi_mask2_self_check,
                      vec_cmp_gt(v_r2_2.v, vec_setzero()));
      vec_create_mask(v_doi_mask2, vec_cmp_lt(v_r2_2.v, v_hig2.v));

James Willis's avatar
James Willis committed
868
869
870
871
872
      /* Combine two masks and form integer masks. */
      const int doi_mask = vec_is_mask_true(v_doi_mask) &
                           vec_is_mask_true(v_doi_mask_self_check);
      const int doi_mask2 = vec_is_mask_true(v_doi_mask2) &
                            vec_is_mask_true(v_doi_mask2_self_check);
James Willis's avatar
James Willis committed
873

874
875
876
877
878
879
880
881
882
883
884
885
886
#ifdef DEBUG_INTERACTIONS_SPH
      for (int bit_index = 0; bit_index < VEC_SIZE; bit_index++) {
        if (doi_mask & (1 << bit_index)) {
          pi->ids_ngbs_density[pi->num_ngb_density] = parts[pjd + bit_index].id;
          ++pi->num_ngb_density;
        }
        if (doi_mask2 & (1 << bit_index)) {
          pi->ids_ngbs_density[pi->num_ngb_density] = parts[pjd + VEC_SIZE + bit_index].id;
          ++pi->num_ngb_density;
        }
      }
#endif

887
888
889
890
      /* If there are any interactions left pack interaction values into c2
       * cache. */
      if (doi_mask) {
        storeInteractions(doi_mask, pjd, &v_r2, &v_dx, &v_dy, &v_dz, cell_cache,
James Willis's avatar
James Willis committed
891
892
893
894
                          &int_cache, &icount, &v_rhoSum, &v_rho_dhSum,
                          &v_wcountSum, &v_wcount_dhSum, &v_div_vSum,
                          &v_curlvxSum, &v_curlvySum, &v_curlvzSum, v_hi_inv,
                          v_vix, v_viy, v_viz);
895
896
897
      }
      if (doi_mask2) {
        storeInteractions(doi_mask2, pjd + VEC_SIZE, &v_r2_2, &v_dx_2, &v_dy_2,
James Willis's avatar
James Willis committed
898
                          &v_dz_2, cell_cache, &int_cache, &icount, &v_rhoSum,
James Willis's avatar
James Willis committed
899
900
901
                          &v_rho_dhSum, &v_wcountSum, &v_wcount_dhSum,
                          &v_div_vSum, &v_curlvxSum, &v_curlvySum, &v_curlvzSum,
                          v_hi_inv, v_vix, v_viy, v_viz);
902
903
904
905
      }
    }

    /* Perform padded vector remainder interactions if any are present. */
James Willis's avatar
James Willis committed
906
907
908
909
    calcRemInteractions(&int_cache, icount, &v_rhoSum, &v_rho_dhSum,
                        &v_wcountSum, &v_wcount_dhSum, &v_div_vSum,
                        &v_curlvxSum, &v_curlvySum, &v_curlvzSum, v_hi_inv,
                        v_vix, v_viy, v_viz, &icount_align);
910
911
912
913
914
915
916
917

    /* Initialise masks to true in case remainder interactions have been
     * performed. */
    mask_t int_mask, int_mask2;
    vec_init_mask_true(int_mask);
    vec_init_mask_true(int_mask2);

    /* Perform interaction with 2 vectors. */
James Willis's avatar
James Willis committed
918
    for (int pjd = 0; pjd < icount_align; pjd += (NUM_VEC_PROC * VEC_SIZE)) {
919
920
921
922
      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],
James Willis's avatar
James Willis committed
923
924
925
          &int_cache.mq[pjd], &v_rhoSum, &v_rho_dhSum, &v_wcountSum,
          &v_wcount_dhSum, &v_div_vSum, &v_curlvxSum, &v_curlvySum,
          &v_curlvzSum, int_mask, int_mask2, 0);
926
927
928
929
    }

    /* Perform horizontal adds on vector sums and store result in particle pi.
     */
James Willis's avatar
James Willis committed
930
931
932
933
934
935
936
937
    VEC_HADD(v_rhoSum, pi->rho);
    VEC_HADD(v_rho_dhSum, pi->density.rho_dh);
    VEC_HADD(v_wcountSum, pi->density.wcount);
    VEC_HADD(v_wcount_dhSum, pi->density.wcount_dh);
    VEC_HADD(v_div_vSum, pi->density.div_v);
    VEC_HADD(v_curlvxSum, pi->density.rot_v[0]);
    VEC_HADD(v_curlvySum, pi->density.rot_v[1]);
    VEC_HADD(v_curlvzSum, pi->density.rot_v[2]);
938
939
940
941
942

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

943
  TIMER_TOC(timer_doself_subset);