diff options
author | Dr. David Alan Gilbert <dave@treblig.org> | 2020-09-27 03:08:54 +0100 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-09-28 13:21:46 +0200 |
commit | dc4ba0a287d0aebb8d99716025a316f113fee98d (patch) | |
tree | b687802bd2fcbd7fb7add23350783de65d4dfe8e /tools/qa | |
parent | f353fa15b547cbeb70e2be1ed2d3d89a84ebad33 (diff) |
Fix SSSE3 cpuid checks
As per afb62b0e96e9bf91ec99857cc16ddb094bcaa3be swing the actual
check into a separate file and make only that file be compiled
with the specific flag.
Change-Id: I7f75453f21271f38e0099bdf6b40f9138d8b4cff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103496
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'tools/qa')
3 files changed, 41 insertions, 17 deletions
diff --git a/tools/qa/cppunit/test_cpu_runtime_detection_SSSE3.cxx b/tools/qa/cppunit/test_cpu_runtime_detection_SSSE3.cxx index 9e63e59c7835..290d073745da 100644 --- a/tools/qa/cppunit/test_cpu_runtime_detection_SSSE3.cxx +++ b/tools/qa/cppunit/test_cpu_runtime_detection_SSSE3.cxx @@ -9,7 +9,7 @@ #include <tools/simdsupport.hxx> -#ifdef LO_SSSE3_AVAILABLE +#include "test_cpu_runtime_detection_x86_checks.hxx" #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> @@ -23,7 +23,6 @@ namespace class CpuRuntimeDetection_SSSE3 : public CppUnit::TestFixture { public: - void checkSSSE3(); void testCpuRuntimeDetection(); CPPUNIT_TEST_SUITE(CpuRuntimeDetection_SSSE3); @@ -33,26 +32,13 @@ public: void CpuRuntimeDetection_SSSE3::testCpuRuntimeDetection() { - // can only run if this function if CPU supports SSSE3 + // can only run this function if CPU supports SSSE3 if (cpuid::isCpuInstructionSetSupported(cpuid::InstructionSetFlags::SSSE3)) - checkSSSE3(); -} - -void CpuRuntimeDetection_SSSE3::checkSSSE3() -{ - // Try some SSSE3 intrinsics calculation - __m128i a = _mm_set1_epi32(3); - __m128i b = _mm_set1_epi32(3); - __m128i c = _mm_maddubs_epi16(a, b); - - // Check result is 9 - CPPUNIT_ASSERT_EQUAL(0xFFFF, _mm_movemask_epi8(_mm_cmpeq_epi32(c, _mm_set1_epi32(9)))); + CpuRuntimeDetectionX86Checks::checkSSSE3(); } CPPUNIT_TEST_SUITE_REGISTRATION(CpuRuntimeDetection_SSSE3); } // end anonymous namespace -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/qa/cppunit/test_cpu_runtime_detection_SSSE3_check.cxx b/tools/qa/cppunit/test_cpu_runtime_detection_SSSE3_check.cxx new file mode 100644 index 000000000000..5fd46e62c185 --- /dev/null +++ b/tools/qa/cppunit/test_cpu_runtime_detection_SSSE3_check.cxx @@ -0,0 +1,37 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <sal/types.h> +#include <tools/simdsupport.hxx> + +#include <cppunit/TestAssert.h> +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/plugin/TestPlugIn.h> + +#include "test_cpu_runtime_detection_x86_checks.hxx" + +/* WARNING: This file is compiled with SSSE3 support, don't call + * any function without checking cpuid to check the CPU can actually + * handle it. + */ +void CpuRuntimeDetectionX86Checks::checkSSSE3() +{ +#ifdef LO_SSSE3_AVAILABLE + // Try some SSSE3 intrinsics calculation + __m128i a = _mm_set1_epi32(3); + __m128i b = _mm_set1_epi32(3); + __m128i c = _mm_maddubs_epi16(a, b); + + // Check result is 9 + CPPUNIT_ASSERT_EQUAL(0xFFFF, _mm_movemask_epi8(_mm_cmpeq_epi32(c, _mm_set1_epi32(9)))); +#endif +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/qa/cppunit/test_cpu_runtime_detection_x86_checks.hxx b/tools/qa/cppunit/test_cpu_runtime_detection_x86_checks.hxx index 94396bf6285d..8321216c05b1 100644 --- a/tools/qa/cppunit/test_cpu_runtime_detection_x86_checks.hxx +++ b/tools/qa/cppunit/test_cpu_runtime_detection_x86_checks.hxx @@ -14,6 +14,7 @@ class CpuRuntimeDetectionX86Checks { public: static void checkAVX2(); + static void checkSSSE3(); }; #endif |