From 3b68017c4d148f294e4254cdd54ef8e211399b65 Mon Sep 17 00:00:00 2001 From: Roland Schulz Date: Wed, 23 Oct 2013 18:12:12 -0400 Subject: [PATCH] Fix NBNxN SIMD reference kernels nbfp_stride was added independently by both 25eb0e14 and 5deee8a0. Removing static is not OK for gcc. Mark will resolve later whether this was even needed for his upstream work. Change-Id: I97ea4131163512354b5e339dd19549c3e49e9de2 --- include/gmx_simd_ref.h | 10 ++++------ src/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils.h | 7 ------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/include/gmx_simd_ref.h b/include/gmx_simd_ref.h index a1b78400b5..ecad324af0 100644 --- a/include/gmx_simd_ref.h +++ b/include/gmx_simd_ref.h @@ -347,9 +347,8 @@ gmx_simd_ref_cmplt_pr(gmx_simd_ref_pr a, gmx_simd_ref_pr b) return c; } -/* Logical AND on SIMD booleans. Can't be static or it can't be a - template parameter (at least on XLC for BlueGene/Q) */ -gmx_inline gmx_simd_ref_pb +/* Logical AND on SIMD booleans. */ +static gmx_inline gmx_simd_ref_pb gmx_simd_ref_and_pb(gmx_simd_ref_pb a, gmx_simd_ref_pb b) { gmx_simd_ref_pb c; @@ -363,9 +362,8 @@ gmx_simd_ref_and_pb(gmx_simd_ref_pb a, gmx_simd_ref_pb b) return c; } -/* Logical OR on SIMD booleans. Can't be static or it can't be a - template parameter (at least on XLC for BlueGene/Q) */ -gmx_inline gmx_simd_ref_pb +/* Logical OR on SIMD booleans. */ +static gmx_inline gmx_simd_ref_pb gmx_simd_ref_or_pb(gmx_simd_ref_pb a, gmx_simd_ref_pb b) { gmx_simd_ref_pb c; diff --git a/src/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils.h b/src/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils.h index 9fde8f06e7..20215c6210 100644 --- a/src/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils.h +++ b/src/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils.h @@ -56,13 +56,6 @@ #ifdef GMX_SIMD_REFERENCE_PLAIN_C -/* Set the stride for the lookup of the two LJ parameters from their - * (padded) array. - * Note that currently only arrays with stride 2 and 4 are available. - * Since the reference code does not require alignment, we can always use 2. - */ -static const int nbfp_stride = 2; - /* Align a stack-based thread-local working array. */ static gmx_inline int * prepare_table_load_buffer(const int *array) -- 2.22.0