runner_doiact_vec.c 34.8 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"

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

66
67
  mask_t int_mask, int_mask2;
  
James Willis's avatar
James Willis committed
68
  /* Work out the number of remainder interactions and pad secondary cache. */
69
70
71
72
73
74
  *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
75
/* Initialise masks to true. */
76
77
78
    vec_init_mask(int_mask);
    vec_init_mask(int_mask2);

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

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

James Willis's avatar
James Willis committed
100
101
    /* Perform remainder interaction and remove remainder from aligned
     * interaction count. */
102
    *icount_align = icount - rem;
James Willis's avatar
James Willis committed
103
104
105
106
107
108
109
    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,
110
        int_mask2, 1);
111
112
113
  }
}

James Willis's avatar
James Willis committed
114
/**
James Willis's avatar
James Willis committed
115
116
 * @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
117
118
 *
 * @param mask Contains which particles need to interact.
Matthieu Schaller's avatar
Matthieu Schaller committed
119
 * @param pjd Index of the particle to store into.
James Willis's avatar
James Willis committed
120
121
122
123
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 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
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
132
 * @param icount Interaction count.
 * @param rhoSum #vector holding the cumulative sum of the density update on pi.
James Willis's avatar
James Willis committed
133
134
135
136
137
138
139
140
141
142
143
144
145
146
 * @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
147
148
149
150
151
 * @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
152
153
__attribute__((always_inline)) INLINE static void storeInteractions(
    const int mask, const int pjd, vector *v_r2, vector *v_dx, vector *v_dy,
154
155
156
157
158
    vector *v_dz, 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) {
James Willis's avatar
James Willis committed
159
160
161

/* Left-pack values needed into the secondary cache using the interaction mask.
 */
162
#if defined(HAVE_AVX2) || defined(HAVE_AVX512_F)
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
  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]);
  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]);

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

      (*icount)++;
    }
  }
198

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

James Willis's avatar
James Willis committed
201
  /* Flush the c2 cache if it has reached capacity. */
James Willis's avatar
James Willis committed
202
  if (*icount >= (C2_CACHE_SIZE - (NUM_VEC_PROC * VEC_SIZE))) {
203
204

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

James Willis's avatar
James Willis committed
206
    /* Peform remainder interactions. */
Matthieu Schaller's avatar
Matthieu Schaller committed
207
208
209
    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);
210

211
212
213
    mask_t int_mask, int_mask2;
    vec_init_mask(int_mask);
    vec_init_mask(int_mask2);
James Willis's avatar
James Willis committed
214
215

    /* Perform interactions. */
James Willis's avatar
James Willis committed
216
217
218
219
220
221
    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,
222
          div_vSum, curlvxSum, curlvySum, curlvzSum, int_mask, int_mask2, 0);
223
    }
James Willis's avatar
James Willis committed
224
225

    /* Reset interaction count. */
226
227
228
    *icount = 0;
  }
}
229

230
231
/**
 * @brief Populates the arrays max_di and max_dj with the maximum distances of
James Willis's avatar
James Willis committed
232
233
234
 * 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.
235
 *
James Willis's avatar
James Willis committed
236
237
238
239
240
241
 * @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
242
243
244
245
 * @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
James Willis's avatar
James Willis committed
246
247
248
249
 * @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
250
251
 * @param init_pi first pi to interact with a pj particle
 * @param init_pj last pj to interact with a pi particle
252
 * @param e The #engine.
James Willis's avatar
James Willis committed
253
 */
James Willis's avatar
James Willis committed
254
255
256
__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,
257
258
    const float dx_max, const float rshift, const double hi_max,
    const double hj_max, const double di_max, const double dj_min,
259
    int *max_index_i, int *max_index_j, int *init_pi, int *init_pj,
260
    const struct engine *e) {
261

262
263
  const struct part *restrict parts_i = ci->parts;
  const struct part *restrict parts_j = cj->parts;
James Willis's avatar
James Willis committed
264

265
  int first_pi = 0, last_pj = cj->count - 1;
266
  int temp;
267

268
269
270
  /* Find the leftmost particle in cell i that interacts with any particle in cell j. */
  first_pi = ci->count;
  while(first_pi > 0 && sort_i[first_pi - 1].d + dx_max + hi_max > dj_min)
271
272
    first_pi--;

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

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

279
    const struct part *pi = &parts_i[sort_i[first_pi].i];
280

281
282
283
    /* Loop through particles in cell j until they are not in range of pi. */
    while(temp <= cj->count && sort_i[first_pi].d + (pi->h * kernel_gamma + dx_max - rshift) > sort_j[temp].d)
      temp++;
284

285
    max_index_i[first_pi] = temp;
286

287
288
289
    /* 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];
290

291
292
      while(temp <= cj->count && sort_i[i].d + (pi->h * kernel_gamma + dx_max - rshift) > sort_j[temp].d)
        temp++;
293

294
      max_index_i[i] = temp;
295

296
    }
297
298
  }

299
  /* Find the rightmost particle in cell j that interacts with any particle in cell i. */
300
  last_pj = 0;
301
  while(last_pj < cj->count && sort_j[last_pj].d - hj_max - dx_max < di_max)
302
    last_pj++;
303

304
305
  /* Find the maximum index into cell i for each particle in range in cell j. */
  if(last_pj > 0 ) {
306

307
308
    /* Decrement to make sure that we checking that correct particle. */
    last_pj--;
309

310
311
    /* Start from the last particle in cell i. */
    temp = ci->count - 1;
312

313
314
315
316
317
    const struct part *pj = &parts_j[sort_j[last_pj].i];

    /* Loop through particles in cell i until they are not in range of pj. */
    while(temp >= 0 && sort_j[last_pj].d - dx_max - (pj->h * kernel_gamma) < sort_i[temp].d - rshift)
      temp--;
318

319
    max_index_j[last_pj] = temp;
320

321
322
323
    /* 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];
324

325
326
      while(temp >= 0 && sort_j[i].d - dx_max - (pj->h * kernel_gamma) < sort_i[temp].d - rshift)
        temp--;
327

328
      max_index_j[i] = temp;
329

330
    }
331
332
  }

James Willis's avatar
James Willis committed
333
334
  *init_pi = first_pi;
  *init_pj = last_pj;
335
}
James Willis's avatar
James Willis committed
336
#endif /* WITH_VECTORIZATION */
337
338

/**
James Willis's avatar
James Willis committed
339
340
 * @brief Compute the cell self-interaction (non-symmetric) using vector
 * intrinsics with one particle pi at a time.
341
342
343
344
 *
 * @param r The #runner.
 * @param c The #cell.
 */
James Willis's avatar
James Willis committed
345
346
__attribute__((always_inline)) INLINE void runner_doself1_density_vec(
    struct runner *r, struct cell *restrict c) {
347
348

#ifdef WITH_VECTORIZATION
349
  const struct engine *e = r->e;
350
351
352
353
354
355
  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
356

357
358
  vector v_hi, v_vix, v_viy, v_viz, v_hig2, v_r2;

James Willis's avatar
James Willis committed
359
  TIMER_TIC
360

361
362
  if (!cell_is_active(c, e)) return;

363
  if (!cell_are_part_drifted(c, e)) error("Interacting undrifted cell.");
364

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

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

James Willis's avatar
James Willis committed
373
  /* Read the particles from the cell and store them locally in the cache. */
James Willis's avatar
James Willis committed
374
  cache_read_particles(c, cell_cache);
375
376
377
378

  /* Create secondary cache to store particle interactions. */
  struct c2_cache int_cache;
  int icount = 0, icount_align = 0;
379
380
381
382
383
384
385
386

  /* 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? */
387
    if (!part_is_active(pi, e)) continue;
388
389
390
391
392

    vector pix, piy, piz;

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

James Willis's avatar
James Willis committed
393
    /* Fill particle pi vectors. */
394
395
396
397
398
399
400
401
402
403
404
    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
405
    /* Reset cumulative sums of update vectors. */
James Willis's avatar
James Willis committed
406
407
408
    vector rhoSum, rho_dhSum, wcountSum, wcount_dhSum, div_vSum, curlvxSum,
        curlvySum, curlvzSum;

James Willis's avatar
James Willis committed
409
    /* Get the inverse of hi. */
410
    vector v_hi_inv;
James Willis's avatar
James Willis committed
411

412
    v_hi_inv = vec_reciprocal(v_hi);
James Willis's avatar
James Willis committed
413

414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
    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;
430
431
432
433
434
435
436
437

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

    vector pjx, pjy, pjz;
    vector pjx2, pjy2, pjz2;

James Willis's avatar
James Willis committed
443
444
    /* Find all of particle pi's interacions and store needed values in the
     * secondary cache.*/
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
    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]);

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

      /* 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
460
461
      v_dx_tmp.v = vec_sub(pix.v, pjx.v);
      v_dx_tmp2.v = vec_sub(pix.v, pjx2.v);
462
      v_dy_tmp.v = vec_sub(piy.v, pjy.v);
James Willis's avatar
James Willis committed
463
      v_dy_tmp2.v = vec_sub(piy.v, pjy2.v);
464
      v_dz_tmp.v = vec_sub(piz.v, pjz.v);
James Willis's avatar
James Willis committed
465
466
467
468
      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);
469
      v_r2.v = vec_fma(v_dy_tmp.v, v_dy_tmp.v, v_r2.v);
James Willis's avatar
James Willis committed
470
      v_r2_2.v = vec_fma(v_dy_tmp2.v, v_dy_tmp2.v, v_r2_2.v);
471
      v_r2.v = vec_fma(v_dz_tmp.v, v_dz_tmp.v, v_r2.v);
James Willis's avatar
James Willis committed
472
473
      v_r2_2.v = vec_fma(v_dz_tmp2.v, v_dz_tmp2.v, v_r2_2.v);

474
475
476
      /* 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;
      int doi_mask, doi_mask_self_check, doi_mask2, doi_mask2_self_check;
477

James Willis's avatar
James Willis committed
478
      /* Form r2 > 0 mask and r2 < hig2 mask. */
479
480
      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));
481

James Willis's avatar
James Willis committed
482
      /* Form r2 > 0 mask and r2 < hig2 mask. */
483
484
485
486
487
488
      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));

      /* Form integer masks. */
      doi_mask_self_check = vec_form_int_mask(v_doi_mask_self_check);
      doi_mask = vec_form_int_mask(v_doi_mask);
489

490
491
492
493
494
495
      doi_mask2_self_check = vec_form_int_mask(v_doi_mask2_self_check);
      doi_mask2 = vec_form_int_mask(v_doi_mask2);
      
      /* Combine the two masks. */
      doi_mask = doi_mask & doi_mask_self_check;
      doi_mask2 = doi_mask2 & doi_mask2_self_check;
496

James Willis's avatar
James Willis committed
497
498
      /* If there are any interactions left pack interaction values into c2
       * cache. */
499
      if (doi_mask) {
James Willis's avatar
James Willis committed
500
        storeInteractions(doi_mask, pjd, &v_r2, &v_dx_tmp, &v_dy_tmp, &v_dz_tmp,
501
502
503
504
505
506
507
508
                          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 (doi_mask2) {
        storeInteractions(doi_mask2, pjd + VEC_SIZE, &v_r2_2, &v_dx_tmp2,
                          &v_dy_tmp2, &v_dz_tmp2, cell_cache, &int_cache,
James Willis's avatar
James Willis committed
509
510
511
                          &icount, &rhoSum, &rho_dhSum, &wcountSum,
                          &wcount_dhSum, &div_vSum, &curlvxSum, &curlvySum,
                          &curlvzSum, v_hi_inv, v_vix, v_viy, v_viz);
512
513
514
      }
    }

James Willis's avatar
James Willis committed
515
    /* Perform padded vector remainder interactions if any are present. */
Matthieu Schaller's avatar
Matthieu Schaller committed
516
517
518
    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
519
520
521
522
                        &icount_align);

    /* Initialise masks to true in case remainder interactions have been
     * performed. */
523
524
525
    mask_t int_mask, int_mask2;
    vec_init_mask(int_mask);
    vec_init_mask(int_mask2);
526
527

    /* Perform interaction with 2 vectors. */
James Willis's avatar
James Willis committed
528
529
530
531
532
533
534
    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,
535
          0);
536
537
    }

James Willis's avatar
James Willis committed
538
539
540
541
542
543
544
545
546
547
    /* 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]);
548
549
550
551
552

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

James Willis's avatar
James Willis committed
553
  TIMER_TOC(timer_doself_density);
554
#endif /* WITH_VECTORIZATION */
555
556
}

557
/**
James Willis's avatar
James Willis committed
558
559
 * @brief Compute the density interactions between a cell pair (non-symmetric)
 * using vector intrinsics.
560
561
562
563
 *
 * @param r The #runner.
 * @param ci The first #cell.
 * @param cj The second #cell.
564
565
 * @param sid The direction of the pair
 * @param shift The shift vector to apply to the particles in ci.
566
 */
James Willis's avatar
James Willis committed
567
void runner_dopair1_density_vec(struct runner *r, struct cell *ci,
568
569
                                struct cell *cj, const int sid,
                                const double *shift) {
570
571
572
573

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

James Willis's avatar
James Willis committed
574
  vector v_hi, v_vix, v_viy, v_viz, v_hig2;
575
576
577

  TIMER_TIC;

578
579
  //static int intCount = 0;

580
581
582
583
584
  /* 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. */
Peter W. Draper's avatar
Peter W. Draper committed
585
586
  const struct entry *restrict sort_i = ci->sort[sid];
  const struct entry *restrict sort_j = cj->sort[sid];
587

588
589
590
591
592
593
594
595
596
#ifdef SWIFT_DEBUG_CHECKS
  /* Check that the dx_max_sort values in the cell are indeed an upper
     bound on particle movement. */
  for (int pid = 0; pid < ci->count; pid++) {
    const struct part *p = &ci->parts[sort_i[pid].i];
    const float d = p->x[0] * runner_shift[sid][0] +
                    p->x[1] * runner_shift[sid][1] +
                    p->x[2] * runner_shift[sid][2];
    if (fabsf(d - sort_i[pid].d) - ci->dx_max_sort >
597
        1.0e-4 * max(fabsf(d), ci->dx_max_sort_old))
598
599
600
601
602
603
      error(
          "particle shift diff exceeds dx_max_sort in cell ci. ci->nodeID=%d "
          "cj->nodeID=%d d=%e sort_i[pid].d=%e ci->dx_max_sort=%e "
          "ci->dx_max_sort_old=%e",
          ci->nodeID, cj->nodeID, d, sort_i[pid].d, ci->dx_max_sort,
          ci->dx_max_sort_old);
604
605
606
607
608
609
610
  }
  for (int pjd = 0; pjd < cj->count; pjd++) {
    const struct part *p = &cj->parts[sort_j[pjd].i];
    const float d = p->x[0] * runner_shift[sid][0] +
                    p->x[1] * runner_shift[sid][1] +
                    p->x[2] * runner_shift[sid][2];
    if (fabsf(d - sort_j[pjd].d) - cj->dx_max_sort >
611
        1.0e-4 * max(fabsf(d), cj->dx_max_sort_old))
612
613
614
615
616
617
      error(
          "particle shift diff exceeds dx_max_sort in cell cj. cj->nodeID=%d "
          "ci->nodeID=%d d=%e sort_j[pjd].d=%e cj->dx_max_sort=%e "
          "cj->dx_max_sort_old=%e",
          cj->nodeID, ci->nodeID, d, sort_j[pjd].d, cj->dx_max_sort,
          cj->dx_max_sort_old);
618
619
620
  }
#endif /* SWIFT_DEBUG_CHECKS */

621
622
623
624
625
626
627
628
629
  /* Get some other useful values. */
  const int count_i = ci->count;
  const int count_j = cj->count;
  const double hi_max = ci->h_max * kernel_gamma - rshift;
  const double hj_max = cj->h_max * kernel_gamma;
  struct part *restrict parts_i = ci->parts;
  struct part *restrict parts_j = cj->parts;
  const double di_max = sort_i[count_i - 1].d - rshift;
  const double dj_min = sort_j[0].d;
630
  const float dx_max = (ci->dx_max_sort + cj->dx_max_sort);
631
632

  /* Check if any particles are active and return if there are not. */
Matthieu Schaller's avatar
Matthieu Schaller committed
633
634
635
  int numActive = 0;
  for (int pid = count_i - 1;
       pid >= 0 && sort_i[pid].d + hi_max + dx_max > dj_min; pid--) {
636
637
638
639
    struct part *restrict pi = &parts_i[sort_i[pid].i];
    if (part_is_active(pi, e)) {
      numActive++;
      break;
Matthieu Schaller's avatar
Matthieu Schaller committed
640
    }
641
  }
642

Matthieu Schaller's avatar
Matthieu Schaller committed
643
  if (!numActive) {
644
    for (int pjd = 0; pjd < count_j && sort_j[pjd].d - hj_max - dx_max < di_max;
Matthieu Schaller's avatar
Matthieu Schaller committed
645
         pjd++) {
646
647
      struct part *restrict pj = &parts_j[sort_j[pjd].i];
      if (part_is_active(pj, e)) {
648
649
        numActive++;
        break;
Matthieu Schaller's avatar
Matthieu Schaller committed
650
651
      }
    }
652
  }
653

Matthieu Schaller's avatar
Matthieu Schaller committed
654
  if (numActive == 0) return;
655

656
657
658
659
  /* Get both particle caches from the runner and re-allocate
   * them if they are not big enough for the cells. */
  struct cache *restrict ci_cache = &r->ci_cache;
  struct cache *restrict cj_cache = &r->cj_cache;
660

661
662
663
664
665
666
  if (ci_cache->count < count_i) {
    cache_init(ci_cache, count_i);
  }
  if (cj_cache->count < count_j) {
    cache_init(cj_cache, count_j);
  }
667

668
  int first_pi, last_pj;
669
670
  int *max_index_i __attribute__((aligned(sizeof(int) * VEC_SIZE)));
  int *max_index_j __attribute__((aligned(sizeof(int) * VEC_SIZE)));
671

672
673
  max_index_i = r->ci_cache.max_d;
  max_index_j = r->cj_cache.max_d;
674

675
676
677
  /* Find particles maximum distance into cj, max_di[] and ci, max_dj[]. */
  /* Also find the first pi that interacts with any particle in cj and the last
   * pj that interacts with any particle in ci. */
678
  populate_max_d_no_cache(ci, cj, sort_i, sort_j, dx_max, rshift, hi_max,
679
                          hj_max, di_max, dj_min, max_index_i, max_index_j, &first_pi,
680
                          &last_pj, e);
681

682
683
684
685
  /* Limits of the outer loops. */
  int first_pi_loop = first_pi;
  int last_pj_loop = last_pj;

686
687
  /* Take the max/min of both values calculated to work out how many particles
   * to read into the cache. */
688
689
  last_pj = max(last_pj, max_index_i[count_i - 1]);
  first_pi = min(first_pi, max_index_j[0]);
690

691
692
693
694
  /* Read the needed particles into the two caches. */
  int first_pi_align = first_pi;
  int last_pj_align = last_pj;
  cache_read_two_partial_cells_sorted(ci, cj, ci_cache, cj_cache, sort_i,
Matthieu Schaller's avatar
Matthieu Schaller committed
695
696
                                      sort_j, shift, &first_pi_align,
                                      &last_pj_align, 1);
697

698
699
  /* Get the number of particles read into the ci cache. */
  int ci_cache_count = count_i - first_pi_align;
700

701
  if (cell_is_active(ci, e)) {
702

James Willis's avatar
James Willis committed
703
    /* Loop over the parts in ci until nothing is within range in cj. */
704
705
    //for (int pid = count_i - 1; pid >= first_pi_loop && max_index_i[pid] >= 0; pid--) {
    for (int pid = count_i - 1; pid >= first_pi_loop; pid--) {
706

707
708
709
      /* 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;
710

711
712
713
      /* Set the cache index. */
      int ci_cache_idx = pid - first_pi_align;

James Willis's avatar
James Willis committed
714
      /* Skip this particle if no particle in cj is within range of it. */
715
      const float hi = ci_cache->h[ci_cache_idx];
716
717
      const double di_test =
          sort_i[pid].d + hi * kernel_gamma + dx_max - rshift;
718
719
      if (di_test < dj_min) continue;

720
      /* Determine the exit iteration of the interaction loop. */
721
      int exit_iteration = max_index_i[pid];
722

723
      const float hig2 = hi * hi * kernel_gamma2;
724

725
      vector pix, piy, piz;
726

727
728
729
730
731
732
733
734
      /* Fill particle pi vectors. */
      pix.v = vec_set1(ci_cache->x[ci_cache_idx]);
      piy.v = vec_set1(ci_cache->y[ci_cache_idx]);
      piz.v = vec_set1(ci_cache->z[ci_cache_idx]);
      v_hi.v = vec_set1(hi);
      v_vix.v = vec_set1(ci_cache->vx[ci_cache_idx]);
      v_viy.v = vec_set1(ci_cache->vy[ci_cache_idx]);
      v_viz.v = vec_set1(ci_cache->vz[ci_cache_idx]);
735

736
      v_hig2.v = vec_set1(hig2);
737

738
739
      /* Reset cumulative sums of update vectors. */
      vector rhoSum, rho_dhSum, wcountSum, wcount_dhSum, div_vSum, curlvxSum,
Matthieu Schaller's avatar
Matthieu Schaller committed
740
          curlvySum, curlvzSum;
741

742
743
      /* Get the inverse of hi. */
      vector v_hi_inv;
744

745
      v_hi_inv = vec_reciprocal(v_hi);
746

747
748
749
750
751
752
753
754
      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();
755

756
757
758
759
760
      /* Pad the exit iteration if there is a serial remainder. */
      int exit_iteration_align = exit_iteration;
      int rem = exit_iteration % VEC_SIZE;
      if (rem != 0) {
        int pad = VEC_SIZE - rem;
761

762
763
764
        if (exit_iteration_align + pad <= last_pj_align + 1)
          exit_iteration_align += pad;
      }
765

766
      vector pjx, pjy, pjz;
767

768
769
      /* Loop over the parts in cj. */
      for (int pjd = 0; pjd < exit_iteration_align; pjd += VEC_SIZE) {
770

771
772
        /* Get the cache index to the jth particle. */
        int cj_cache_idx = pjd;
773

774
        vector v_dx, v_dy, v_dz, v_r2;
775

776
#ifdef SWIFT_DEBUG_CHECKS
Matthieu Schaller's avatar
Matthieu Schaller committed
777
778
        if (cj_cache_idx % VEC_SIZE != 0 || cj_cache_idx < 0) {
          error("Unaligned read!!! cj_cache_idx=%d", cj_cache_idx);
779
780
        }
#endif
781

782
783
784
785
786
787
788
789
790
791
792
793
794
795
        /* Load 2 sets of vectors from the particle cache. */
        pjx.v = vec_load(&cj_cache->x[cj_cache_idx]);
        pjy.v = vec_load(&cj_cache->y[cj_cache_idx]);
        pjz.v = vec_load(&cj_cache->z[cj_cache_idx]);

        /* Compute the pairwise distance. */
        v_dx.v = vec_sub(pix.v, pjx.v);
        v_dy.v = vec_sub(piy.v, pjy.v);
        v_dz.v = vec_sub(piz.v, pjz.v);

        v_r2.v = vec_mul(v_dx.v, v_dx.v);
        v_r2.v = vec_fma(v_dy.v, v_dy.v, v_r2.v);
        v_r2.v = vec_fma(v_dz.v, v_dz.v, v_r2.v);

796
        mask_t v_doi_mask;
797
798
799
        int doi_mask;

        /* Form r2 < hig2 mask. */
800
        vec_create_mask(v_doi_mask, vec_cmp_lt(v_r2.v, v_hig2.v));
801
802

        /* Form integer mask. */
803
        doi_mask = vec_form_int_mask(v_doi_mask);
804

805
806
        //intCount += __builtin_popcount(doi_mask);
        
807
808
809
810
811
812
813
        /* If there are any interactions perform them. */
        if (doi_mask)
          runner_iact_nonsym_1_vec_density(
              &v_r2, &v_dx, &v_dy, &v_dz, v_hi_inv, v_vix, v_viy, v_viz,
              &cj_cache->vx[cj_cache_idx], &cj_cache->vy[cj_cache_idx],
              &cj_cache->vz[cj_cache_idx], &cj_cache->m[cj_cache_idx], &rhoSum,
              &rho_dhSum, &wcountSum, &wcount_dhSum, &div_vSum, &curlvxSum,
814
              &curlvySum, &curlvzSum, v_doi_mask);
James Willis's avatar
James Willis committed
815

816
      } /* loop over the parts in cj. */
817

818
819
820
821
822
823
824
825
826
827
828
829
830
      /* 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]);

    } /* loop over the parts in ci. */
  }
831

832
  if (cell_is_active(cj, e)) {
833

James Willis's avatar
James Willis committed
834
    /* Loop over the parts in cj until nothing is within range in ci. */
835
836
    //for (int pjd = 0; pjd <= last_pj_loop && max_index_j[pjd] < count_i; pjd++) {
    for (int pjd = 0; pjd <= last_pj_loop; pjd++) {
837

838
839
840
      /* Get a hold of the jth part in cj. */
      struct part *restrict pj = &parts_j[sort_j[pjd].i];
      if (!part_is_active(pj, e)) continue;
841

842
843
844
845
      /* Set the cache index. */
      int cj_cache_idx = pjd;

      /*TODO: rshift term. */
James Willis's avatar
James Willis committed
846
      /* Skip this particle if no particle in ci is within range of it. */
847
      const float hj = cj_cache->h[cj_cache_idx];
848
849
      const double dj_test =
          sort_j[pjd].d - hj * kernel_gamma - dx_max - rshift;
850
      if (dj_test > di_max) continue;
851

852
      /* Determine the exit iteration of the interaction loop. */
853
      int exit_iteration = max_index_j[pjd];
854

855
      const float hjg2 = hj * hj * kernel_gamma2;
856

857
858
      vector pjx, pjy, pjz;
      vector v_hj, v_vjx, v_vjy, v_vjz, v_hjg2;
859

860
861
862
863
864
865
866
867
      /* Fill particle pi vectors. */
      pjx.v = vec_set1(cj_cache->x[cj_cache_idx]);
      pjy.v = vec_set1(cj_cache->y[cj_cache_idx]);
      pjz.v = vec_set1(cj_cache->z[cj_cache_idx]);
      v_hj.v = vec_set1(hj);
      v_vjx.v = vec_set1(cj_cache->vx[cj_cache_idx]);
      v_vjy.v = vec_set1(cj_cache->vy[cj_cache_idx]);
      v_vjz.v = vec_set1(cj_cache->vz[cj_cache_idx]);
868

869
      v_hjg2.v = vec_set1(hjg2);
870

871
872
      /* Reset cumulative sums of update vectors. */
      vector rhoSum, rho_dhSum, wcountSum, wcount_dhSum, div_vSum, curlvxSum,
Matthieu Schaller's avatar
Matthieu Schaller committed
873
          curlvySum, curlvzSum;
874

875
876
      /* Get the inverse of hj. */
      vector v_hj_inv;
877

878
      v_hj_inv = vec_reciprocal(v_hj);
879

880
881
882
883
884
885
886
887
      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();
888

889
      vector pix, piy, piz;
890

891
892
      /* Convert exit iteration to cache indices. */
      int exit_iteration_align = exit_iteration - first_pi_align;
James Willis's avatar
James Willis committed
893

894
895
      /* Pad the exit iteration align so cache reads are aligned. */
      int rem = exit_iteration_align % VEC_SIZE;
Matthieu Schaller's avatar
Matthieu Schaller committed
896
      if (exit_iteration_align < VEC_SIZE) {
897
        exit_iteration_align = 0;
Matthieu Schaller's avatar
Matthieu Schaller committed
898
899
      } else
        exit_iteration_align -= rem;
James Willis's avatar
James Willis committed
900

901
      /* Loop over the parts in ci. */
Matthieu Schaller's avatar
Matthieu Schaller committed
902
903
      for (int ci_cache_idx = exit_iteration_align;
           ci_cache_idx < ci_cache_count; ci_cache_idx += VEC_SIZE) {
James Willis's avatar
James Willis committed
904

905
#ifdef SWIFT_DEBUG_CHECKS
Matthieu Schaller's avatar
Matthieu Schaller committed
906
907
        if (ci_cache_idx % VEC_SIZE != 0 || ci_cache_idx < 0) {
          error("Unaligned read!!! ci_cache_idx=%d", ci_cache_idx);
908
909
        }
#endif
James Willis's avatar
James Willis committed
910

911
        vector v_dx, v_dy, v_dz, v_r2;
James Willis's avatar
James Willis committed
912

913
914
915
916
        /* Load 2 sets of vectors from the particle cache. */
        pix.v = vec_load(&ci_cache->x[ci_cache_idx]);
        piy.v = vec_load(&ci_cache->y[ci_cache_idx]);
        piz.v = vec_load(&ci_cache->z[ci_cache_idx]);
James Willis's avatar
James Willis committed
917

918
919
920
921
        /* Compute the pairwise distance. */
        v_dx.v = vec_sub(pjx.v, pix.v);
        v_dy.v = vec_sub(pjy.v, piy.v);
        v_dz.v = vec_sub(pjz.v, piz.v);
922

923
924
925
        v_r2.v = vec_mul(v_dx.v, v_dx.v);
        v_r2.v = vec_fma(v_dy.v, v_dy.v, v_r2.v);
        v_r2.v = vec_fma(v_dz.v, v_dz.v, v_r2.v);
926

927
        mask_t v_doj_mask;
928
        int doj_mask;
929

930
        /* Form r2 < hig2 mask. */
931
        vec_create_mask(v_doj_mask, vec_cmp_lt(v_r2.v, v_hjg2.v));
932

933
        /* Form integer mask. */
934
        doj_mask = vec_form_int_mask(v_doj_mask);
935

936
937
        //intCount += __builtin_popcount(doj_mask);

938
939
940
941
942
943
944
        /* If there are any interactions perform them. */
        if (doj_mask)
          runner_iact_nonsym_1_vec_density(
              &v_r2, &v_dx, &v_dy, &v_dz, v_hj_inv, v_vjx, v_vjy, v_vjz,
              &ci_cache->vx[ci_cache_idx], &ci_cache->vy[ci_cache_idx],
              &ci_cache->vz[ci_cache_idx], &ci_cache->m[ci_cache_idx], &rhoSum,
              &rho_dhSum, &wcountSum, &wcount_dhSum, &div_vSum, &curlvxSum,
945
              &curlvySum, &curlvzSum, v_doj_mask);
James Willis's avatar
James Willis committed
946

947
      } /* loop over the parts in ci. */
948

Matthieu Schaller's avatar
Matthieu Schaller committed
949
950
      /* Perform horizontal adds on vector sums and store result in particle pj.
       */
951
952
953
954
955
956
957
958
959
960
      VEC_HADD(rhoSum, pj->rho);
      VEC_HADD(rho_dhSum, pj->density.rho_dh);
      VEC_HADD(wcountSum, pj->density.wcount);
      VEC_HADD(wcount_dhSum, pj->density.wcount_dh);
      VEC_HADD(div_vSum, pj->density.div_v);
      VEC_HADD(curlvxSum, pj->density.rot_v[0]);
      VEC_HADD(curlvySum, pj->density.rot_v[1]);
      VEC_HADD(curlvzSum, pj->density.rot_v[2]);

    } /* loop over the parts in cj. */
Matthieu Schaller's avatar
Matthieu Schaller committed
961

962
963
    TIMER_TOC(timer_dopair_density);
  }
964
965
966

#endif /* WITH_VECTORIZATION */
}