summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2022-11-23 12:04:04 -0800
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-01-20 06:47:26 +0000
commit6bfc66ecf82975664052fdcb5754f3579ede1f54 (patch)
treeeb067000731b308b410b0b235669e1cf9e888764
parentfbd7eb3806c59fd4e7edbfdd1be5cfe118217e20 (diff)
downloadqt3d-6bfc66ecf82975664052fdcb5754f3579ede1f54.tar.gz
Qt3DCore: update AVX2 code to mean x86-64-v3
qsimd_p.h doesn't like when you compile with just -mavx2. I guess no one is using these flags except me, and I already set the full arch in CFLAGS. Qt 6.4 calls x86-64-v3 "arch haswell". Will be fixed in 6.5. Drive-by remove the AVX512 bits that weren't in use. Change-Id: I76216ced393445a4ae2dfffd172a4f5684351514 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 15e4fc5daeeec5eeb0c1ccb0ce6f76b5b284e2c7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/core/CMakeLists.txt6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index d17d55095..453fcba78 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -116,10 +116,6 @@ function(qt3d_add_simd_part target)
set(condition "QT_FEATURE_${arg_SIMD}")
if("${arg_SIMD}" STREQUAL arch_haswell)
set(condition "TEST_subarch_avx2 AND TEST_subarch_bmi AND TEST_subarch_bmi2 AND TEST_subarch_f16c AND TEST_subarch_fma AND TEST_subarch_lzcnt AND TEST_subarch_popcnt")
- elseif("${arg_SIMD}" STREQUAL avx512common)
- set(condition "TEST_subarch_avx512cd")
- elseif("${arg_SIMD}" STREQUAL avx512core)
- set(condition "TEST_subarch_avx512cd AND TEST_subarch_avx512bw AND TEST_subarch_avx512dq AND TEST_subarch_avx512vl")
endif()
qt_evaluate_config_expression(result ${condition})
@@ -166,7 +162,7 @@ if(QT_FEATURE_qt3d_simd_sse2 AND NOT QT_FEATURE_qt3d_simd_avx2)
endif()
if(QT_FEATURE_qt3d_simd_avx2)
- qt3d_add_simd_part(3DCore SIMD avx2
+ qt3d_add_simd_part(3DCore SIMD arch_haswell
SOURCES
transforms/matrix4x4_avx2.cpp transforms/matrix4x4_avx2_p.h
transforms/vector3d_sse.cpp transforms/vector3d_sse_p.h