# Test on ARM v7
# Test ARM_NEON SIMD
-gcc-4.8 simd=ARM_NEON no-hwloc release-with-assert
+gcc-5 simd=ARM_NEON no-hwloc release-with-assert
# Test on ARM v8
# Test ARM_NEON_ASIMD SIMD
gcc-7 mpi no-openmp fftpack mdrun-only
# Test MPMD PME with thread-MPI
-# Test newest icc at time of release
-# Test icc without SIMD in double precision in release mode
-# TODO enable simd=avx_256 in this config, and change the above description once #2335 is resolved
-icc-18 npme=1 nranks=2 no-openmp double fftpack release simd=none
+# Test oldest supported icc
+# Test icc with AVX256 in double precision in release mode
+icc-17 simd=avx_256 npme=1 nranks=2 no-openmp double fftpack release
-# Test CUDA build on a slave with no CUDA devices
+# Test CUDA build on a agent with no CUDA devices
# Test without TNG support
-gcc-4.9 gpu cuda-7.0 openmp no-tng release-with-assert
+gcc-4.9 gpuhw=none cuda-10.0 openmp no-tng release-with-assert
# Test non-default GMX_PREFER_STATIC_LIBS behavior
# TODO enable this
-# msvc-2015 double no-threadmpi no-prefer-static-libs release-with-assert
+# msvc-2017 double no-threadmpi no-prefer-static-libs release-with-assert
-# Test behaviour when dlopen is not present
-# TODO enable this
-# icc-18 no-dlopen no-threadmpi double mkl release-with-assert
+# Test with SSE2 + double
+# Test newest icc at time of release
+icc-19 simd=sse2 double mkl release-with-assert
# Test SSE4.1 SIMD
# Test single-rank GPU
# Test clang + OpenMP + CUDA
-clang-4 simd=sse4.1 openmp nranks=1 gpu cuda-8.0 clang_cuda
+clang-4 simd=sse4.1 openmp nranks=1 gpuhw=nvidia cuda-8.0 clang_cuda
# Test MPMD PME with library MPI
# Test clang + OpenMP
# Test SSE2 SIMD
# Test CMAKE_BUILD_TYPE=Release
-gcc-4.8 gpu npme=1 nranks=2 cuda-7.5 simd=sse2 release
+# Test OpenCL
+# Test bundled clFFT (developed by AMD) on NVIDIA OpenCL
+gcc-6 npme=1 nranks=2 opencl-1.2 gpuhw=nvidia simd=sse2 release
# Test non-default use of mdrun -gpu_id
# Test GPU-sharing among 4 PP ranks
-gcc-5 gpu nranks=4 gpu_id=1 cuda-8.0 release-with-assert
+# Test no hwloc build, tests internal CPU topology detection (mainly for x86)
+gcc-5 gpuhw=nvidia nranks=4 gpu_id=1 cuda-8.0 no-hwloc release-with-assert
-# Test oldest supported icc
# Test icc on Windows
# Test icc with SIMD in mixed precision in release mode
-icc-16 msvc-2015 fftpack simd=avx2_256 release
+icc-18 msvc-2017 fftpack simd=avx2_256 release
+
+# Test ARM HPC compier toolchain with gcc-7
+#gcc-7 armhpc-18.2 openmp simd=ARM_NEON_ASIMD release
+
+# Test ARM HPC compier toolchain with armclang
+armclang-18.4 armhpc-18.4 openmp simd=ARM_NEON_ASIMD release-with-assert
# TODO
# Add SIMD + OpenMP + CUDA asan build
# Add OpenMP + CUDA + device sharing TSAN build
-# Re-enable Phi build (FIXME: do we still care?)
-# Test without hwloc support
-# Test with NVML support
# Test statically linked hwloc support (if/when it can work well)
# Test 3D DD (2D is partially covered in regressiontests)
# Test own-fftw build (from local copy of the file)
# Test mdrun -tunepme (e.g. with relaxed tolerances, for now)
# Consider testing of other CMake option paths
+# Test behaviour when dlopen is not present