Merge branch 'origin/release-2020' into merge-release-2020-into-master

[alexxy/gromacs.git] / src / gromacs / hardware / printhardware.cpp

diff --git a/src/gromacs/hardware/printhardware.cpp b/src/gromacs/hardware/printhardware.cpp
index 616b7b9e09d474bdd053358c63988e9bbbf4c1c1..0720a12bbe9398a344acffd7eb8f6d24ad491268 100644 (file)
--- a/src/gromacs/hardware/printhardware.cpp
+++ b/src/gromacs/hardware/printhardware.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015,2016 by the GROMACS development team.
+ * Copyright (c) 2012,2013,2014,2015,2016, The GROMACS development team.
  * Copyright (c) 2017,2018,2019,2020, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
@@ -60,6 +60,8 @@
 #include "gromacs/utility/stringutil.h"
 #include "gromacs/utility/sysinfo.h"
 
+#include "architecture.h"
+
 //! Constant used to help minimize preprocessed code
 static constexpr bool bGPUBinary = (GMX_GPU != 0);
 
@@ -387,6 +389,9 @@ void gmx_print_detected_hardware(FILE*                fplog,
         gmx::simdCheck(static_cast<gmx::SimdType>(hwinfo->simd_suggest_min), fplog, warnToStdErr);
     }
 
-    /* For RDTSCP we only check on our local node and skip the MPI reduction */
-    check_use_of_rdtscp_on_this_cpu(mdlog, cpuInfo);
+    /* For RDTSCP we only check on our local node and skip the MPI reduction, only on x86 */
+    if (gmx::c_architecture == gmx::Architecture::X86)
+    {
+        check_use_of_rdtscp_on_this_cpu(mdlog, cpuInfo);
+    }
 }