From 0a93e94d7d853daf417fc9fe649c25d2b995c87e Mon Sep 17 00:00:00 2001 From: Matthieu Schaller <matthieu.schaller@durham.ac.uk> Date: Fri, 22 Jul 2016 00:16:23 +0100 Subject: [PATCH] Style improvement --- src/runner_doiact.h | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/runner_doiact.h b/src/runner_doiact.h index 193666ad26..b0960dd759 100644 --- a/src/runner_doiact.h +++ b/src/runner_doiact.h @@ -121,8 +121,7 @@ void DOPAIR_NAIVE(struct runner *r, struct cell *restrict ci, float dxq[3 * VEC_SIZE] __attribute__((aligned(16))); struct part *piq[VEC_SIZE], *pjq[VEC_SIZE]; #endif - - TIMER_TIC + TIMER_TIC; /* Anything to do here? */ if (ci->ti_end_min > ti_current && cj->ti_end_min > ti_current) return; @@ -224,7 +223,7 @@ void DOSELF_NAIVE(struct runner *r, struct cell *restrict c) { struct part *piq[VEC_SIZE], *pjq[VEC_SIZE]; #endif - TIMER_TIC + TIMER_TIC; /* Anything to do here? */ if (c->ti_end_min > ti_current) return; @@ -326,7 +325,7 @@ void DOPAIR_SUBSET_NAIVE(struct runner *r, struct cell *restrict ci, struct part *piq[VEC_SIZE], *pjq[VEC_SIZE]; #endif - TIMER_TIC + TIMER_TIC; const int count_j = cj->count; struct part *restrict parts_j = cj->parts; @@ -433,7 +432,7 @@ void DOPAIR_SUBSET(struct runner *r, struct cell *restrict ci, struct part *piq[VEC_SIZE], *pjq[VEC_SIZE]; #endif - TIMER_TIC + TIMER_TIC; const int count_j = cj->count; struct part *restrict parts_j = cj->parts; @@ -627,7 +626,7 @@ void DOSELF_SUBSET(struct runner *r, struct cell *restrict ci, struct part *piq[VEC_SIZE], *pjq[VEC_SIZE]; #endif - TIMER_TIC + TIMER_TIC; const int count_i = ci->count; struct part *restrict parts_j = ci->parts; @@ -719,7 +718,7 @@ void DOPAIR1(struct runner *r, struct cell *ci, struct cell *cj) { struct part *piq[VEC_SIZE], *pjq[VEC_SIZE]; #endif - TIMER_TIC + TIMER_TIC; /* Anything to do here? */ if (ci->ti_end_min > ti_current && cj->ti_end_min > ti_current) return; @@ -912,7 +911,7 @@ void DOPAIR2(struct runner *r, struct cell *ci, struct cell *cj) { struct part *piq2[VEC_SIZE], *pjq2[VEC_SIZE]; #endif - TIMER_TIC + TIMER_TIC; /* Anything to do here? */ if (ci->ti_end_min > ti_current && cj->ti_end_min > ti_current) return; @@ -1298,7 +1297,8 @@ void DOSELF1(struct runner *r, struct cell *restrict c) { float dxq2[3 * VEC_SIZE] __attribute__((aligned(16))); struct part *piq2[VEC_SIZE], *pjq2[VEC_SIZE]; #endif - TIMER_TIC + + TIMER_TIC; if (c->ti_end_min > ti_current) return; if (c->ti_end_max < ti_current) error("Cell in an impossible time-zone"); @@ -1526,7 +1526,8 @@ void DOSELF2(struct runner *r, struct cell *restrict c) { float dxq2[3 * VEC_SIZE] __attribute__((aligned(16))); struct part *piq2[VEC_SIZE], *pjq2[VEC_SIZE]; #endif - TIMER_TIC + + TIMER_TIC; if (c->ti_end_min > ti_current) return; if (c->ti_end_max < ti_current) error("Cell in an impossible time-zone"); @@ -1721,7 +1722,7 @@ void DOSUB_PAIR1(struct runner *r, struct cell *ci, struct cell *cj, int sid, struct space *s = r->e->s; const int ti_current = r->e->ti_current; - TIMER_TIC + TIMER_TIC; /* Should we even bother? */ if (ci->ti_end_min > ti_current && cj->ti_end_min > ti_current) return; @@ -1962,7 +1963,7 @@ void DOSUB_SELF1(struct runner *r, struct cell *ci, int gettimer) { const int ti_current = r->e->ti_current; - TIMER_TIC + TIMER_TIC; /* Should we even bother? */ if (ci->ti_end_min > ti_current) return; @@ -2005,7 +2006,7 @@ void DOSUB_PAIR2(struct runner *r, struct cell *ci, struct cell *cj, int sid, struct space *s = r->e->s; const int ti_current = r->e->ti_current; - TIMER_TIC + TIMER_TIC; /* Should we even bother? */ if (ci->ti_end_min > ti_current && cj->ti_end_min > ti_current) return; @@ -2246,7 +2247,7 @@ void DOSUB_SELF2(struct runner *r, struct cell *ci, int gettimer) { const int ti_current = r->e->ti_current; - TIMER_TIC + TIMER_TIC; /* Should we even bother? */ if (ci->ti_end_min > ti_current) return; @@ -2278,7 +2279,7 @@ void DOSUB_SUBSET(struct runner *r, struct cell *ci, struct part *parts, struct space *s = r->e->s; const int ti_current = r->e->ti_current; - TIMER_TIC + TIMER_TIC; /* Find out in which sub-cell of ci the parts are. */ struct cell *sub = NULL; -- GitLab