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

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
266
  int first_pi = 0, last_pj = cj->count - 1;

Matthieu Schaller's avatar
Matthieu Schaller committed
267
268
  /* Find the first active particle in ci to interact with any particle in cj.
   */
269
  /* Populate max_di with distances. */
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
  //int active_id = ci->count - 1;
  //for (int k = ci->count - 1; k >= 0; k--) {
  //  const struct part *pi = &parts_i[sort_i[k].i];
  //  const float d = sort_i[k].d + dx_max;

  //  //max_di[k] = d + hi_max;

  //  /* If the particle is out of range set the index to
  //   * the last active particle within range. */
  //  if (d + hi_max < dj_min) {
  //    if (part_is_active(pi, e)) {
  //      first_pi = k;
  //    }
  //    else {
  //      first_pi = active_id;
  //    }
  //    break;
  //  } else {
  //    if (part_is_active(pi, e)) active_id = k;
  //  }
  //}

  //for(int i=0; i<ci->count; i++) max_index_i[i] = FLT_MAX;
  //for(int i=0; i<cj->count; i++) max_index_j[i] = FLT_MAX;
  
  float di, dj;

  first_pi = ci->count - 1;
  di = sort_i[first_pi].d + dx_max;

  while(first_pi >= 0 && di + hi_max > dj_min) {
    first_pi--;
    di = sort_i[first_pi].d + dx_max;
  }

  first_pi++;

  int temp = 0;
  
  const struct part *pi = &parts_i[sort_i[first_pi].i];

  di = sort_i[first_pi].d + dx_max;

  while(di + (pi->h * kernel_gamma - rshift) > sort_j[temp].d) {
    temp++;
  }

  max_index_i[first_pi] = temp;

  for(int i = first_pi + 1; i<ci->count; i++) {
    temp = max_index_i[i - 1];

    di = sort_i[i].d + dx_max;
    
    while(di + (pi->h * kernel_gamma - rshift) > sort_j[temp].d) {
      temp++;
326
    }
327
328
329
330

    max_index_i[i] = temp;

    //message("first_pi: %d, max_index_i: %d", first_pi, max_index_i[i]);
331
332
  }

333
  /* Find the maximum distance of pi particles into cj.*/
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
  //int first_pj = 0;
  //const struct part *pi = &parts_i[sort_i[first_pi].i];
  //float dj = sort_j[first_pj].d;

  //while (sort_i[first_pi].d + dx_max + pi->h > dj) {
  //  first_pj++;
  //  dj = sort_j[first_pj].d;
  //}

  //max_index_i[first_pi] = first_pj;

  //for (int i = first_pi + 1; i < ci->count; i++) {
  //  int temp = max_index_i[i - 1];
  //  pi = &parts_i[sort_i[i].i];
  //  dj = sort_j[temp].d;

  //  while (sort_i[i].d + dx_max + pi->h > dj) {
  //    temp++;
  //    dj = sort_j[temp].d;
  //  }

  //  max_index_i[i] = temp;
  //}
James Willis's avatar
James Willis committed
357

358
  /* Find the last particle in cj to interact with any particle in ci. */
359
  /* Populate max_dj with distances. */
360
361
362
363
364
365
366
367
368
369
370
371
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
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
  //active_id = 0;
  //for (int k = 0; k < cj->count; k++) {
  //  const struct part *pj = &parts_j[sort_j[k].i];
  //  const float d = sort_j[k].d - dx_max;

  //  /*TODO: don't think rshift should be taken off here, waiting on Pedro. */
  //  // max_dj[k] = d - h * kernel_gamma - rshift;
  //  //max_dj[k] = d - hj_max;

  //  /* If the particle is out of range set the index to
  //   * the last active particle within range. */
  //  if (d - hj_max > di_max) {
  //    if (part_is_active(pj, e)) {
  //      last_pj = k;
  //    }
  //    else {
  //      last_pj = active_id;
  //    }
  //    break;
  //  } else {
  //    if (part_is_active(pj, e)) active_id = k;
  //  }
  //}

  //last_pj = 0;
  //dj = sort_j[last_pj].d - dx_max;

  //while(dj - hj_max < di_max) {
  //  last_pj++;
  //  dj = sort_j[last_pj].d - dx_max;
  //} 
  //
  ///* Find the maximum distance of pj particles into ci.*/
  //int last_pi = ci->count - 1;
  //  
  //const struct part *pj = &parts_j[sort_j[last_pj].i];
  //di = sort_i[last_pi].d;

  //while (sort_j[last_pj].d - dx_max - (pj->h * kernel_gamma) < di) {
  //  last_pi--;
  //  di = sort_i[last_pi].d;
  //}

  //max_index_j[last_pj] = last_pi;

  //for (int i = last_pj - 1; i >= 0; i--) {
  //  int temp = max_index_j[i + 1];
  //  pj = &parts_j[sort_j[i].i];
  //  di = sort_i[temp].d;

  //  while (sort_j[i].d - dx_max - (pj->h * kernel_gamma) < di) {
  //    temp--;
  //    di = sort_i[temp].d;
  //  }

  //  max_index_j[last_pj] = temp;
  //}

  last_pj = 0;
  dj = sort_j[last_pj].d - dx_max;

  while(last_pj < cj->count && dj - hi_max < di_max) {
    last_pj++;
    dj = sort_j[last_pj].d - dx_max;
424
425
  }

426
427
428
429
430
431
432
433
434
435
  last_pj--;

  temp = ci->count - 1;
  
  const struct part *pj = &parts_j[sort_j[last_pj].i];

  dj = sort_j[last_pj].d - dx_max;

  while(dj - (pj->h * kernel_gamma) < sort_i[temp].d) {
    temp--;
436
437
  }

438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
  max_index_j[last_pj] = temp;

  for(int i = last_pj - 1; i>=0; i--) {
    temp = max_index_j[i + 1];

    dj = sort_j[i].d - dx_max;
    
    while(dj - (pj->h * kernel_gamma) < sort_i[temp].d) {
      temp--;
    }

    max_index_j[i] = temp;

    //message("first_pi: %d, max_index_i: %d", first_pi, max_index_i[i]);
  }
  //for(int i=0; i<ci->count; i++) max_index_i[i] = cj->count - 1;//temp;
  //for(int i=0; i<cj->count; i++) max_index_j[i] = 0;//temp;

James Willis's avatar
James Willis committed
456
457
  *init_pi = first_pi;
  *init_pj = last_pj;
458
}
James Willis's avatar
James Willis committed
459
#endif /* WITH_VECTORIZATION */
460
461

/**
James Willis's avatar
James Willis committed
462
463
 * @brief Compute the cell self-interaction (non-symmetric) using vector
 * intrinsics with one particle pi at a time.
464
465
466
467
 *
 * @param r The #runner.
 * @param c The #cell.
 */
James Willis's avatar
James Willis committed
468
469
__attribute__((always_inline)) INLINE void runner_doself1_density_vec(
    struct runner *r, struct cell *restrict c) {
470
471

#ifdef WITH_VECTORIZATION
472
  const struct engine *e = r->e;
473
474
475
476
477
478
  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
479

480
481
  vector v_hi, v_vix, v_viy, v_viz, v_hig2, v_r2;

James Willis's avatar
James Willis committed
482
  TIMER_TIC
483

484
485
  if (!cell_is_active(c, e)) return;

486
  if (!cell_are_part_drifted(c, e)) error("Interacting undrifted cell.");
487

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

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

James Willis's avatar
James Willis committed
496
  /* Read the particles from the cell and store them locally in the cache. */
James Willis's avatar
James Willis committed
497
  cache_read_particles(c, cell_cache);
498
499
500
501

  /* Create secondary cache to store particle interactions. */
  struct c2_cache int_cache;
  int icount = 0, icount_align = 0;
502
503
504
505
506
507
508
509

  /* 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? */
510
    if (!part_is_active(pi, e)) continue;
511
512
513
514
515

    vector pix, piy, piz;

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

James Willis's avatar
James Willis committed
516
    /* Fill particle pi vectors. */
517
518
519
520
521
522
523
524
525
526
527
    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
528
    /* Reset cumulative sums of update vectors. */
James Willis's avatar
James Willis committed
529
530
531
    vector rhoSum, rho_dhSum, wcountSum, wcount_dhSum, div_vSum, curlvxSum,
        curlvySum, curlvzSum;

James Willis's avatar
James Willis committed
532
    /* Get the inverse of hi. */
533
    vector v_hi_inv;
James Willis's avatar
James Willis committed
534

535
    v_hi_inv = vec_reciprocal(v_hi);
James Willis's avatar
James Willis committed
536

537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
    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;
553
554
555
556
557
558
559
560

      /* 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];
      }
561
562
563
564
565
    }

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

James Willis's avatar
James Willis committed
566
567
    /* Find all of particle pi's interacions and store needed values in the
     * secondary cache.*/
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
    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
583
584
      v_dx_tmp.v = vec_sub(pix.v, pjx.v);
      v_dx_tmp2.v = vec_sub(pix.v, pjx2.v);
585
      v_dy_tmp.v = vec_sub(piy.v, pjy.v);
James Willis's avatar
James Willis committed
586
      v_dy_tmp2.v = vec_sub(piy.v, pjy2.v);
587
      v_dz_tmp.v = vec_sub(piz.v, pjz.v);
James Willis's avatar
James Willis committed
588
589
590
591
      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);
592
      v_r2.v = vec_fma(v_dy_tmp.v, v_dy_tmp.v, v_r2.v);
James Willis's avatar
James Willis committed
593
      v_r2_2.v = vec_fma(v_dy_tmp2.v, v_dy_tmp2.v, v_r2_2.v);
594
      v_r2.v = vec_fma(v_dz_tmp.v, v_dz_tmp.v, v_r2.v);
James Willis's avatar
James Willis committed
595
596
      v_r2_2.v = vec_fma(v_dz_tmp2.v, v_dz_tmp2.v, v_r2_2.v);

597
598
599
      /* 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;
600

James Willis's avatar
James Willis committed
601
      /* Form r2 > 0 mask and r2 < hig2 mask. */
602
603
      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));
604

James Willis's avatar
James Willis committed
605
      /* Form r2 > 0 mask and r2 < hig2 mask. */
606
607
608
609
610
611
      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);
612

613
614
615
616
617
618
      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;
619

James Willis's avatar
James Willis committed
620
621
      /* If there are any interactions left pack interaction values into c2
       * cache. */
622
      if (doi_mask) {
James Willis's avatar
James Willis committed
623
        storeInteractions(doi_mask, pjd, &v_r2, &v_dx_tmp, &v_dy_tmp, &v_dz_tmp,
624
625
626
627
628
629
630
631
                          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
632
633
634
                          &icount, &rhoSum, &rho_dhSum, &wcountSum,
                          &wcount_dhSum, &div_vSum, &curlvxSum, &curlvySum,
                          &curlvzSum, v_hi_inv, v_vix, v_viy, v_viz);
635
636
637
      }
    }

James Willis's avatar
James Willis committed
638
    /* Perform padded vector remainder interactions if any are present. */
Matthieu Schaller's avatar
Matthieu Schaller committed
639
640
641
    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
642
643
644
645
                        &icount_align);

    /* Initialise masks to true in case remainder interactions have been
     * performed. */
646
647
648
    mask_t int_mask, int_mask2;
    vec_init_mask(int_mask);
    vec_init_mask(int_mask2);
649
650

    /* Perform interaction with 2 vectors. */
James Willis's avatar
James Willis committed
651
652
653
654
655
656
657
    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,
658
          0);
659
660
    }

James Willis's avatar
James Willis committed
661
662
663
664
665
666
667
668
669
670
    /* 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]);
671
672
673
674
675

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

James Willis's avatar
James Willis committed
676
  TIMER_TOC(timer_doself_density);
677
#endif /* WITH_VECTORIZATION */
678
679
}

680
/**
James Willis's avatar
James Willis committed
681
682
 * @brief Compute the density interactions between a cell pair (non-symmetric)
 * using vector intrinsics.
683
684
685
686
 *
 * @param r The #runner.
 * @param ci The first #cell.
 * @param cj The second #cell.
687
688
 * @param sid The direction of the pair
 * @param shift The shift vector to apply to the particles in ci.
689
 */
James Willis's avatar
James Willis committed
690
void runner_dopair1_density_vec(struct runner *r, struct cell *ci,
691
692
                                struct cell *cj, const int sid,
                                const double *shift) {
693
694
695
696

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

James Willis's avatar
James Willis committed
697
  vector v_hi, v_vix, v_viy, v_viz, v_hig2;
698
699
700

  TIMER_TIC;

701
702
  //static int intCount = 0;

703
704
705
706
707
  /* 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
708
709
  const struct entry *restrict sort_i = ci->sort[sid];
  const struct entry *restrict sort_j = cj->sort[sid];
710

711
712
713
714
715
716
717
718
719
#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 >
720
        1.0e-4 * max(fabsf(d), ci->dx_max_sort_old))
721
722
723
724
725
726
      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);
727
728
729
730
731
732
733
  }
  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 >
734
        1.0e-4 * max(fabsf(d), cj->dx_max_sort_old))
735
736
737
738
739
740
      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);
741
742
743
  }
#endif /* SWIFT_DEBUG_CHECKS */

744
745
746
747
748
749
750
751
752
  /* 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;
753
  const float dx_max = (ci->dx_max_sort + cj->dx_max_sort);
754
755

  /* Check if any particles are active and return if there are not. */
Matthieu Schaller's avatar
Matthieu Schaller committed
756
757
758
  int numActive = 0;
  for (int pid = count_i - 1;
       pid >= 0 && sort_i[pid].d + hi_max + dx_max > dj_min; pid--) {
759
760
761
762
    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
763
    }
764
  }
765

Matthieu Schaller's avatar
Matthieu Schaller committed
766
  if (!numActive) {
767
    for (int pjd = 0; pjd < count_j && sort_j[pjd].d - hj_max - dx_max < di_max;
Matthieu Schaller's avatar
Matthieu Schaller committed
768
         pjd++) {
769
770
      struct part *restrict pj = &parts_j[sort_j[pjd].i];
      if (part_is_active(pj, e)) {
771
772
        numActive++;
        break;
Matthieu Schaller's avatar
Matthieu Schaller committed
773
774
      }
    }
775
  }
776

Matthieu Schaller's avatar
Matthieu Schaller committed
777
  if (numActive == 0) return;
778

779
780
781
782
  /* 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;
783

784
785
786
787
788
789
  if (ci_cache->count < count_i) {
    cache_init(ci_cache, count_i);
  }
  if (cj_cache->count < count_j) {
    cache_init(cj_cache, count_j);
  }
790

791
  int first_pi, last_pj;
792
793
  int *max_index_i __attribute__((aligned(sizeof(int) * VEC_SIZE)));
  int *max_index_j __attribute__((aligned(sizeof(int) * VEC_SIZE)));
794

795
796
  max_index_i = r->ci_cache.max_d;
  max_index_j = r->cj_cache.max_d;
797

798
799
800
  /* 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. */
801
  populate_max_d_no_cache(ci, cj, sort_i, sort_j, dx_max, rshift, hi_max,
802
                          hj_max, di_max, dj_min, max_index_i, max_index_j, &first_pi,
803
                          &last_pj, e);
804

805
806
807
808
  /* Limits of the outer loops. */
  int first_pi_loop = first_pi;
  int last_pj_loop = last_pj;

809
810
  /* Take the max/min of both values calculated to work out how many particles
   * to read into the cache. */
811
812
  last_pj = max(last_pj, max_index_i[count_i - 1]);
  first_pi = min(first_pi, max_index_j[0]);
813

814
815
816
817
  /* 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
818
819
                                      sort_j, shift, &first_pi_align,
                                      &last_pj_align, 1);
820

821
822
  /* Get the number of particles read into the ci cache. */
  int ci_cache_count = count_i - first_pi_align;
823

824
  if (cell_is_active(ci, e)) {
825

James Willis's avatar
James Willis committed
826
    /* Loop over the parts in ci until nothing is within range in cj. */
827
828
    //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--) {
829

830
831
832
      /* 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;
833

834
835
836
      /* Set the cache index. */
      int ci_cache_idx = pid - first_pi_align;

James Willis's avatar
James Willis committed
837
      /* Skip this particle if no particle in cj is within range of it. */
838
      const float hi = ci_cache->h[ci_cache_idx];
839
840
      const double di_test =
          sort_i[pid].d + hi * kernel_gamma + dx_max - rshift;
841
842
      if (di_test < dj_min) continue;

843
      /* Determine the exit iteration of the interaction loop. */
844
      int exit_iteration = max_index_i[pid];
845

846
      const float hig2 = hi * hi * kernel_gamma2;
847

848
      vector pix, piy, piz;
849

850
851
852
853
854
855
856
857
      /* 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]);
858

859
      v_hig2.v = vec_set1(hig2);
860

861
862
      /* Reset cumulative sums of update vectors. */
      vector rhoSum, rho_dhSum, wcountSum, wcount_dhSum, div_vSum, curlvxSum,
Matthieu Schaller's avatar
Matthieu Schaller committed
863
          curlvySum, curlvzSum;
864

865
866
      /* Get the inverse of hi. */
      vector v_hi_inv;
867

868
      v_hi_inv = vec_reciprocal(v_hi);
869

870
871
872
873
874
875
876
877
      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();
878

879
880
881
882
883
      /* 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;
884

885
886
887
        if (exit_iteration_align + pad <= last_pj_align + 1)
          exit_iteration_align += pad;
      }
888

889
      vector pjx, pjy, pjz;
890

891
892
      /* Loop over the parts in cj. */
      for (int pjd = 0; pjd < exit_iteration_align; pjd += VEC_SIZE) {
893

894
895
        /* Get the cache index to the jth particle. */
        int cj_cache_idx = pjd;
896

897
        vector v_dx, v_dy, v_dz, v_r2;
898

899
#ifdef SWIFT_DEBUG_CHECKS
Matthieu Schaller's avatar
Matthieu Schaller committed
900
901
        if (cj_cache_idx % VEC_SIZE != 0 || cj_cache_idx < 0) {
          error("Unaligned read!!! cj_cache_idx=%d", cj_cache_idx);
902
903
        }
#endif
904

905
906
907
908
909
910
911
912
913
914
915
916
917
918
        /* 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);

919
        mask_t v_doi_mask;
920
921
922
        int doi_mask;

        /* Form r2 < hig2 mask. */
923
        vec_create_mask(v_doi_mask, vec_cmp_lt(v_r2.v, v_hig2.v));
924
925

        /* Form integer mask. */
926
        doi_mask = vec_form_int_mask(v_doi_mask);
927

928
929
        //intCount += __builtin_popcount(doi_mask);
        
930
931
932
933
934
935
936
        /* 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,
937
              &curlvySum, &curlvzSum, v_doi_mask);
James Willis's avatar
James Willis committed
938

939
      } /* loop over the parts in cj. */
940

941
942
943
944
945
946
947
948
949
950
951
952
953
      /* 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. */
  }
954

955
  if (cell_is_active(cj, e)) {
956

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

961
962
963
      /* 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;
964

965
966
967
968
      /* Set the cache index. */
      int cj_cache_idx = pjd;

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

975
      /* Determine the exit iteration of the interaction loop. */
976
      int exit_iteration = max_index_j[pjd];
977

978
      const float hjg2 = hj * hj * kernel_gamma2;
979

980
981
      vector pjx, pjy, pjz;
      vector v_hj, v_vjx, v_vjy, v_vjz, v_hjg2;
982

983
984
985
986
987
988
989
990
      /* 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]);
991

992
      v_hjg2.v = vec_set1(hjg2);
993

994
995
      /* Reset cumulative sums of update vectors. */
      vector rhoSum, rho_dhSum, wcountSum, wcount_dhSum, div_vSum, curlvxSum,
Matthieu Schaller's avatar
Matthieu Schaller committed
996
          curlvySum, curlvzSum;
997

998
999
      /* Get the inverse of hj. */
      vector v_hj_inv;
1000

1001
      v_hj_inv = vec_reciprocal(v_hj);
1002

1003
1004
1005
1006
1007
1008
1009
1010
      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();
1011

1012
      vector pix, piy, piz;
1013

1014
1015
      /* Convert exit iteration to cache indices. */
      int exit_iteration_align = exit_iteration - first_pi_align;
James Willis's avatar
James Willis committed
1016

1017
1018
      /* Pad the exit iteration align so cache reads are aligned. */
      int rem = exit_iteration_align % VEC_SIZE;
Matthieu Schaller's avatar
Matthieu Schaller committed
1019
      if (exit_iteration_align < VEC_SIZE) {
1020
        exit_iteration_align = 0;
Matthieu Schaller's avatar
Matthieu Schaller committed
1021
1022
      } else
        exit_iteration_align -= rem;
James Willis's avatar
James Willis committed
1023

1024
      /* Loop over the parts in ci. */
Matthieu Schaller's avatar
Matthieu Schaller committed
1025
1026
      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
1027

1028
#ifdef SWIFT_DEBUG_CHECKS
Matthieu Schaller's avatar
Matthieu Schaller committed
1029
1030
        if (ci_cache_idx % VEC_SIZE != 0 || ci_cache_idx < 0) {
          error("Unaligned read!!! ci_cache_idx=%d", ci_cache_idx);
1031
1032
        }
#endif
James Willis's avatar
James Willis committed
1033

1034
        vector v_dx, v_dy, v_dz, v_r2;
James Willis's avatar
James Willis committed
1035

1036
1037
1038
1039
        /* 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
1040

1041
1042
1043
1044
        /* 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);
1045

1046
1047
1048
        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);
1049

1050
        mask_t v_doj_mask;
1051
        int doj_mask;
1052

1053
        /* Form r2 < hig2 mask. */
1054
        vec_create_mask(v_doj_mask, vec_cmp_lt(v_r2.v, v_hjg2.v));
1055

1056
        /* Form integer mask. */
1057
        doj_mask = vec_form_int_mask(v_doj_mask);
1058

1059
1060
        //intCount += __builtin_popcount(doj_mask);

1061
1062
1063
1064
1065
1066
1067
        /* 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,
1068
              &curlvySum, &curlvzSum, v_doj_mask);
James Willis's avatar
James Willis committed
1069

1070
      } /* loop over the parts in ci. */
1071

Matthieu Schaller's avatar
Matthieu Schaller committed
1072
1073
      /* Perform horizontal adds on vector sums and store result in particle pj.
       */
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
      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
1084

1085
1086
    TIMER_TOC(timer_dopair_density);
  }
1087

1088
1089
  //message("Interaction Count: %d", intCount);

1090
1091
#endif /* WITH_VECTORIZATION */
}