mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SSE2 cpuid checks

Browse Source 
As per afb62b0e96 swing the actual
check into a separate file and make only that file be compiled
with the specific flag.

Change-Id: If848a041fc3a26cfaa79f945d63f6c43f8cf3772
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103497
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
Dr. David Alan Gilbert
2020-09-27 03:14:51 +01:00
committed by Tomaž Vajngerl
parent dc4ba0a287
commit 15a5a56326
4 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/CppunitTest_tools_test.mk
View File

@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,tools_test, \
tools/qa/cppunit/test_GenericTypeSerializer \
tools/qa/cppunit/test_cpuid \
tools/qa/cppunit/test_cpu_runtime_detection_AVX2 \
tools/qa/cppunit/test_cpu_runtime_detection_SSE2 \
tools/qa/cppunit/test_cpu_runtime_detection_SSSE3 \
))
@@ -41,7 +42,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,tools_test,\
))
$(eval $(call gb_CppunitTest_add_exception_objects,tools_test,\
tools/qa/cppunit/test_cpu_runtime_detection_SSE2, $(CXXFLAGS_INTRINSICS_SSE2) \
tools/qa/cppunit/test_cpu_runtime_detection_SSE2_check, $(CXXFLAGS_INTRINSICS_SSE2) \
))
$(eval $(call gb_CppunitTest_add_exception_objects,tools_test,\

20
tools/qa/cppunit/test_cpu_runtime_detection_SSE2.cxx
View File

@@ -9,7 +9,7 @@
#include <tools/simdsupport.hxx>
#ifdef LO_SSE2_AVAILABLE
#include "test_cpu_runtime_detection_x86_checks.hxx"
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
@@ -23,7 +23,6 @@ namespace
class CpuRuntimeDetection_SSE2 : public CppUnit::TestFixture
{
public:
void checkSSE2();
void testCpuRuntimeDetection();
CPPUNIT_TEST_SUITE(CpuRuntimeDetection_SSE2);
@@ -33,26 +32,13 @@ public:
void CpuRuntimeDetection_SSE2::testCpuRuntimeDetection()
{
// can only run if this function if CPU supports SSE2
// can only run this function if CPU supports SSE2
if (cpuid::isCpuInstructionSetSupported(cpuid::InstructionSetFlags::SSE2))
checkSSE2();
}
void CpuRuntimeDetection_SSE2::checkSSE2()
{
// Try some SSE2 intrinsics calculation
__m128i a = _mm_set1_epi32(15);
__m128i b = _mm_set1_epi32(15);
__m128i c = _mm_xor_si128(a, b);
// Check zero
CPPUNIT_ASSERT_EQUAL(0xFFFF, _mm_movemask_epi8(_mm_cmpeq_epi32(c, _mm_setzero_si128())));
CpuRuntimeDetectionX86Checks::checkSSE2();
}
CPPUNIT_TEST_SUITE_REGISTRATION(CpuRuntimeDetection_SSE2);
} // end anonymous namespace
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

35
tools/qa/cppunit/test_cpu_runtime_detection_SSE2_check.cxx Normal file
View File

@@ -0,0 +1,35 @@
/* -*- 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 <tools/cpuid.hxx>
#include "test_cpu_runtime_detection_x86_checks.hxx"
void CpuRuntimeDetectionX86Checks::checkSSE2()
{
#ifdef LO_SSE2_AVAILABLE
// Try some SSE2 intrinsics calculation
__m128i a = _mm_set1_epi32(15);
__m128i b = _mm_set1_epi32(15);
__m128i c = _mm_xor_si128(a, b);
// Check zero
CPPUNIT_ASSERT_EQUAL(0xFFFF, _mm_movemask_epi8(_mm_cmpeq_epi32(c, _mm_setzero_si128())));
#endif
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

1
tools/qa/cppunit/test_cpu_runtime_detection_x86_checks.hxx
View File

@@ -14,6 +14,7 @@ class CpuRuntimeDetectionX86Checks
{
public:
static void checkAVX2();
static void checkSSE2();
static void checkSSSE3();
};