diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2022-11-23 12:04:04 -0800 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2023-01-19 19:18:51 -0800 |
commit | 15e4fc5daeeec5eeb0c1ccb0ce6f76b5b284e2c7 (patch) | |
tree | fe688ac610b02ddb8826630a2e32d3d84bbc7f31 /src | |
parent | da01832718043bf0456caec1ce720fea2374efe1 (diff) |
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.
Pick-to: 6.4
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index dbf73441f..aaf3b81ba 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -120,10 +120,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}) @@ -169,7 +165,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 |