Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
SWIFTsim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SWIFT
SWIFTsim
Commits
814df924
Commit
814df924
authored
7 years ago
by
James Willis
Browse files
Options
Downloads
Patches
Plain Diff
Formatting.
parent
93c7e699
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!396
Avx512 fixes
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/runner_doiact_vec.c
+7
-6
7 additions, 6 deletions
src/runner_doiact_vec.c
with
7 additions
and
6 deletions
src/runner_doiact_vec.c
+
7
−
6
View file @
814df924
...
...
@@ -64,7 +64,7 @@ __attribute__((always_inline)) INLINE static void calcRemInteractions(
int
*
icount_align
)
{
mask_t
int_mask
,
int_mask2
;
/* Work out the number of remainder interactions and pad secondary cache. */
*
icount_align
=
icount
;
int
rem
=
icount
%
(
NUM_VEC_PROC
*
VEC_SIZE
);
...
...
@@ -72,7 +72,7 @@ __attribute__((always_inline)) INLINE static void calcRemInteractions(
int
pad
=
(
NUM_VEC_PROC
*
VEC_SIZE
)
-
rem
;
*
icount_align
+=
pad
;
/* Initialise masks to true. */
/* Initialise masks to true. */
vec_init_mask
(
int_mask
);
vec_init_mask
(
int_mask2
);
...
...
@@ -272,7 +272,6 @@ __attribute__((always_inline)) INLINE static void populate_max_d_no_cache(
const
struct
part
*
pi
=
&
parts_i
[
sort_i
[
k
].
i
];
const
float
d
=
sort_i
[
k
].
d
+
dx_max
;
// max_di[k] = d + h * kernel_gamma - rshift;
max_di
[
k
]
=
d
+
hi_max
;
/* If the particle is out of range set the index to
...
...
@@ -458,7 +457,8 @@ __attribute__((always_inline)) INLINE void runner_doself1_density_vec(
v_r2_2
.
v
=
vec_fma
(
v_dz_tmp2
.
v
,
v_dz_tmp2
.
v
,
v_r2_2
.
v
);
/* Form a mask from r2 < hig2 and r2 > 0.*/
mask_t
v_doi_mask
,
v_doi_mask_self_check
,
v_doi_mask2
,
v_doi_mask2_self_check
;
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
;
/* Form r2 > 0 mask and r2 < hig2 mask. */
...
...
@@ -466,7 +466,8 @@ __attribute__((always_inline)) INLINE void runner_doself1_density_vec(
vec_create_mask
(
v_doi_mask
,
vec_cmp_lt
(
v_r2
.
v
,
v_hig2
.
v
));
/* Form r2 > 0 mask and r2 < hig2 mask. */
vec_create_mask
(
v_doi_mask2_self_check
,
vec_cmp_gt
(
v_r2_2
.
v
,
vec_setzero
()));
vec_create_mask
(
v_doi_mask2_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. */
...
...
@@ -475,7 +476,7 @@ __attribute__((always_inline)) INLINE void runner_doself1_density_vec(
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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment