diff options
author | Dr. David Alan Gilbert <dave@treblig.org> | 2020-09-20 16:36:57 +0100 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-09-22 08:32:58 +0200 |
commit | afb62b0e96e9bf91ec99857cc16ddb094bcaa3be (patch) | |
tree | 33f75e5b297cd84978943d916c6d1d795fc82cec /tools/CppunitTest_tools_test.mk | |
parent | b51fa6d7e4d6a64f822122eac1fa7ad1dec3574b (diff) |
Fix AVX2 cpuid checks
At the moment test_cpu_runtime_detection_AVX2.cxx is compiled with
-mavx2 to allow it to use the intrinsics; however the compiler jumps
at the chance to use newer instructions outside the actual test;
in my case using AVX in the string manipulation in addTestsToSuite
when my CPU doesn't actually have AVX.
Swing the actual check into a separate file and only compile that
with the extra flag.
We probably need the same change for the SSE* checks as well.
Change-Id: I1683231932fff264a87c96ac95ac1d24b921163a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103075
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'tools/CppunitTest_tools_test.mk')
-rw-r--r-- | tools/CppunitTest_tools_test.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk index aa5ac4606d02..48c667425ce4 100644 --- a/tools/CppunitTest_tools_test.mk +++ b/tools/CppunitTest_tools_test.mk @@ -32,10 +32,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,tools_test, \ tools/qa/cppunit/test_xmlwalker \ tools/qa/cppunit/test_GenericTypeSerializer \ tools/qa/cppunit/test_cpuid \ + tools/qa/cppunit/test_cpu_runtime_detection_AVX2 \ )) $(eval $(call gb_CppunitTest_add_exception_objects,tools_test,\ - tools/qa/cppunit/test_cpu_runtime_detection_AVX2, $(CXXFLAGS_INTRINSICS_AVX2) \ + tools/qa/cppunit/test_cpu_runtime_detection_AVX2_check, $(CXXFLAGS_INTRINSICS_AVX2) \ )) $(eval $(call gb_CppunitTest_add_exception_objects,tools_test,\ |