Skip to content
GitLab
Commit 1475cd05 authored by James Willis's avatar James Willis
Browse files

Removed FILL_VEC macro and placed it in vector.h

parent 862ac61e
Hide whitespace changes
Inline Side-by-side
src/kernel_hydro.h
View file @ 1475cd05
...@@ -214,38 +214,15 @@ __attribute__((always_inline)) INLINE static void kernel_eval(float u, ...@@ -214,38 +214,15 @@ __attribute__((always_inline)) INLINE static void kernel_eval(float u,
#ifdef VECTORIZE #ifdef VECTORIZE
#ifdef __MIC__ static const vector kernel_igamma_vec = FILL_VEC((float)kernel_igamma);
#define FILL_VEC(constant) .f[0] = constant, \
.f[1] = constant, \ static const vector kernel_ivals_vec = FILL_VEC((float)kernel_ivals);
.f[2] = constant, \
.f[3] = constant, \ static const vector kernel_constant_vec = FILL_VEC((float)kernel_constant);
.f[4] = constant, \
.f[5] = constant, \ static const vector kernel_igamma3_vec = FILL_VEC((float)kernel_igamma3);
.f[6] = constant, \
.f[7] = constant, \ static const vector kernel_igamma4_vec = FILL_VEC((float)kernel_igamma4);
.f[8] = constant, \
.f[9] = constant, \
.f[10] = constant, \
.f[11] = constant, \
.f[12] = constant, \
.f[13] = constant, \
.f[14] = constant, \
.f[15] = constant
#elif defined(__AVX__) || defined (__AVX2__)
#define FILL_VEC(constant) .f[0] = constant, \
.f[1] = constant, \
.f[2] = constant, \
.f[3] = constant, \
.f[4] = constant, \
.f[5] = constant, \
.f[6] = constant, \
.f[7] = constant
#elif defined(__SSE2__)
#define FILL_VEC(constant) .f[0] = constant, \
.f[1] = constant, \
.f[2] = constant, \
.f[3] = constant
#endif
/** /**
* @brief Computes the kernel function and its derivative (Vectorised version). * @brief Computes the kernel function and its derivative (Vectorised version).
...@@ -256,17 +233,6 @@ __attribute__((always_inline)) INLINE static void kernel_eval(float u, ...@@ -256,17 +233,6 @@ __attribute__((always_inline)) INLINE static void kernel_eval(float u,
* @param w (return) The value of the kernel function $W(x,h)$. * @param w (return) The value of the kernel function $W(x,h)$.
* @param dw_dx (return) The norm of the gradient of $|\\nabla W(x,h)|$. * @param dw_dx (return) The norm of the gradient of $|\\nabla W(x,h)|$.
*/ */
static const vector kernel_igamma_vec = {FILL_VEC((float)kernel_igamma)};
static const vector kernel_ivals_vec = {FILL_VEC((float)kernel_ivals)};
static const vector kernel_constant_vec = {FILL_VEC((float)kernel_constant)};
static const vector kernel_igamma3_vec = {FILL_VEC((float)kernel_igamma3)};
static const vector kernel_igamma4_vec = {FILL_VEC((float)kernel_igamma4)};
__attribute__((always_inline)) __attribute__((always_inline))
INLINE static void kernel_deval_vec(vector *u, vector *w, vector *dw_dx) { INLINE static void kernel_deval_vec(vector *u, vector *w, vector *dw_dx) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment