From 2b253dd1d907eabe9272481c11a982230823e98d Mon Sep 17 00:00:00 2001 From: Roland Schulz Date: Mon, 25 Aug 2014 12:37:25 -0400 Subject: [PATCH] Slight simplifcation of 2xnn Change-Id: Ibca1e9bb2d3a3657fa684050d0080280ac7269d8 --- .../simd_2xnn/nbnxn_kernel_simd_2xnn_common.h | 2 +- .../simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h index 228fa8b258..a87ca0eb16 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h @@ -49,7 +49,7 @@ #define UNROLLJ (GMX_SIMD_REAL_WIDTH/GMX_SIMD_J_UNROLL_SIZE) /* The stride of all the atom data arrays is equal to half the SIMD width */ -#define STRIDE (GMX_SIMD_REAL_WIDTH/GMX_SIMD_J_UNROLL_SIZE) +#define STRIDE UNROLLJ #include "../nbnxn_kernel_simd_utils.h" diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h index c051d7e763..2f45b53baf 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_inner.h @@ -247,17 +247,9 @@ /* Atom indices (of the first atom in the cluster) */ aj = cj*UNROLLJ; #if defined CALC_LJ && (defined LJ_COMB_GEOM || defined LJ_COMB_LB || defined LJ_EWALD_GEOM) -#if UNROLLJ == STRIDE aj2 = aj*2; -#else - aj2 = (cj>>1)*2*STRIDE + (cj & 1)*UNROLLJ; -#endif #endif -#if UNROLLJ == STRIDE ajx = aj*DIM; -#else - ajx = (cj>>1)*DIM*STRIDE + (cj & 1)*UNROLLJ; -#endif ajy = ajx + STRIDE; ajz = ajy + STRIDE; -- 2.22.0