Merge pull request #38272 from vbashkirtsev/master

test/test_arch.cc: search "pni" in CPU flags also when detecting SSE3

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2021-01-10 00:25:06 +08:00 committed by GitHub
commit 0da007a2f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View File

@ -1,7 +1,9 @@
#!/usr/bin/env bash
set -ex
git submodule update --init --recursive
if [ -d .git ]; then
git submodule update --init --recursive
fi
: ${BUILD_DIR:=build}
: ${CEPH_GIT_DIR:=..}

View File

@ -69,7 +69,7 @@ TEST(Arch, all)
expected = strstr(flags, " sse4_1 ") ? 1 : 0;
EXPECT_EQ(expected, ceph_arch_intel_sse41);
expected = (strstr(flags, " sse3 ") || strstr(flags, " ssse3 ")) ? 1 : 0;
expected = (strstr(flags, " sse3 ") || strstr(flags, " ssse3 ") || strstr(flags, " pni ")) ? 1 : 0;
EXPECT_EQ(expected, ceph_arch_intel_sse3);
expected = strstr(flags, " ssse3 ") ? 1 : 0;