biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
abfc37d
)
Word SIMD report better
author
Mark Abraham
<mark.j.abraham@gmail.com>
Fri, 10 Sep 2021 07:30:46 +0000
(07:30 +0000)
committer
Andrey Alekseenko
<al42and@gmail.com>
Fri, 10 Sep 2021 07:30:46 +0000
(07:30 +0000)
Fixes #4135
src/gromacs/simd/support.cpp
patch
|
blob
|
history
diff --git
a/src/gromacs/simd/support.cpp
b/src/gromacs/simd/support.cpp
index 0d1f9fd850a50b3bcd42f27b5995bdce5e153ca4..146a28c8a31b8dea772cfd8a604be7d801f87a58 100644
(file)
--- a/
src/gromacs/simd/support.cpp
+++ b/
src/gromacs/simd/support.cpp
@@
-1,7
+1,7
@@
/*
* This file is part of the GROMACS molecular simulation package.
*
/*
* This file is part of the GROMACS molecular simulation package.
*
- * Copyright (c) 2015,2016,2017,2018,2019,2020, by the GROMACS development team, led by
+ * Copyright (c) 2015,2016,2017,2018,2019,2020,
2021,
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
* top-level source directory and at http://www.gromacs.org.
* Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
* and including many others, as listed in the AUTHORS file in the
* top-level source directory and at http://www.gromacs.org.
@@
-272,7
+272,7
@@
bool simdCheck(gmx::SimdType wanted, FILE* log, bool warnToStdErr)
if (compiled == SimdType::X86_Avx2 && wanted == SimdType::X86_Avx512)
{
logMsg = wrapper.wrapToString(formatString(
if (compiled == SimdType::X86_Avx2 && wanted == SimdType::X86_Avx512)
{
logMsg = wrapper.wrapToString(formatString(
- "Highest SIMD level
reques
ted by all nodes in run: %s\n"
+ "Highest SIMD level
suppor
ted by all nodes in run: %s\n"
"SIMD instructions selected at compile time: %s\n"
"This program was compiled for different hardware than you are running on, "
"which could influence performance. This build might have been configured on "
"SIMD instructions selected at compile time: %s\n"
"This program was compiled for different hardware than you are running on, "
"which could influence performance. This build might have been configured on "
@@
-287,9
+287,9
@@
bool simdCheck(gmx::SimdType wanted, FILE* log, bool warnToStdErr)
&& identifyAvx512FmaUnits() == 1)
{
// The reason for explicitly checking the number of FMA units above is to avoid triggering
&& identifyAvx512FmaUnits() == 1)
{
// The reason for explicitly checking the number of FMA units above is to avoid triggering
- // this conditional if the AVX2 SIMD was
reques
ted by some other node in a heterogeneous MPI run.
+ // this conditional if the AVX2 SIMD was
suppor
ted by some other node in a heterogeneous MPI run.
logMsg = wrapper.wrapToString(formatString(
logMsg = wrapper.wrapToString(formatString(
- "Highest SIMD level
reques
ted by all nodes in run: %s\n"
+ "Highest SIMD level
suppor
ted by all nodes in run: %s\n"
"SIMD instructions selected at compile time: %s\n"
"This program was compiled for different hardware than you are running on, "
"which could influence performance."
"SIMD instructions selected at compile time: %s\n"
"This program was compiled for different hardware than you are running on, "
"which could influence performance."
@@
-313,9
+313,9
@@
bool simdCheck(gmx::SimdType wanted, FILE* log, bool warnToStdErr)
// the supported one, but AVX128Fma is an exception: AMD CPUs will (strongly) prefer
// AVX128Fma, but they will work fine with AVX too. Thus, make an exception for this.
logMsg = wrapper.wrapToString(
// the supported one, but AVX128Fma is an exception: AMD CPUs will (strongly) prefer
// AVX128Fma, but they will work fine with AVX too. Thus, make an exception for this.
logMsg = wrapper.wrapToString(
- formatString("Highest SIMD level
reques
ted by all nodes in run: %s\n"
+ formatString("Highest SIMD level
suppor
ted by all nodes in run: %s\n"
"SIMD instructions selected at compile time: %s\n"
"SIMD instructions selected at compile time: %s\n"
- "Compiled SIMD newer than
reques
ted; program might crash.",
+ "Compiled SIMD newer than
suppor
ted; program might crash.",
simdString(wanted).c_str(), simdString(compiled).c_str()));
warnMsg = logMsg;
}
simdString(wanted).c_str(), simdString(compiled).c_str()));
warnMsg = logMsg;
}
@@
-323,7
+323,7
@@
bool simdCheck(gmx::SimdType wanted, FILE* log, bool warnToStdErr)
{
// This warning will also occur if compiled is X86_Avx and wanted is X86_Avx128Fma
logMsg = wrapper.wrapToString(formatString(
{
// This warning will also occur if compiled is X86_Avx and wanted is X86_Avx128Fma
logMsg = wrapper.wrapToString(formatString(
- "Highest SIMD level
reques
ted by all nodes in run: %s\n"
+ "Highest SIMD level
suppor
ted by all nodes in run: %s\n"
"SIMD instructions selected at compile time: %s\n"
"This program was compiled for different hardware than you are running on, "
"which could influence performance.",
"SIMD instructions selected at compile time: %s\n"
"This program was compiled for different hardware than you are running on, "
"which could influence performance.",
@@
-336,7
+336,7
@@
bool simdCheck(gmx::SimdType wanted, FILE* log, bool warnToStdErr)
else if ((compiled == SimdType::Arm_Sve) && (svcntb() != GMX_SIMD_ARM_SVE_LENGTH_VALUE / 8))
{
logMsg = wrapper.wrapToString(formatString(
else if ((compiled == SimdType::Arm_Sve) && (svcntb() != GMX_SIMD_ARM_SVE_LENGTH_VALUE / 8))
{
logMsg = wrapper.wrapToString(formatString(
- "Longest SVE length
reques
ted by all nodes in run: %d\n"
+ "Longest SVE length
suppor
ted by all nodes in run: %d\n"
"SVE length selected at compile time: %ld\n"
"This program was compiled for different hardware than you are running on, "
"which will lead to incorrect behavior.\n"
"SVE length selected at compile time: %ld\n"
"This program was compiled for different hardware than you are running on, "
"which will lead to incorrect behavior.\n"