qiurui
/
qt3d
mirror of https://github.com/qt/qt3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

3DCore: rip away the configure option and static choice of SIMD 

Instead, simply use whatever is available from the compiler.

This also does away with the separation between Matrix4x4_SSE and
Matrix4x4_AVX2. The two classes store the data the same way and are
source-compatible; they just operate differently. This also allows for
an AVX2-enabled Qt3DRenderer to link to and run with a non-AVX Qt3DCore.

Change-Id: I76216ced393445a4ae2dfffd172a512266b2414d
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
This commit is contained in:
Thiago Macieira 2022-11-23 12:37:00 -08:00
parent 15e4fc5dae
commit 00cb8afafb
29 changed files with 94 additions and 931 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config_help.txt
View File

@ -3,7 +3,6 @@ Qt3D options:
-assimp .............. Select used assimp library [system/qt/no] -assimp .............. Select used assimp library [system/qt/no]
-qt3d-profile-jobs ... Enable jobs profiling [no] -qt3d-profile-jobs ... Enable jobs profiling [no]
-qt3d-profile-gl ..... Enable OpenGL profiling [no] -qt3d-profile-gl ..... Enable OpenGL profiling [no]
-qt3d-simd ........... Select level of SIMD support [no/sse2/avx2]
-qt3d-render ......... Enable the Qt3D Render aspect [yes] -qt3d-render ......... Enable the Qt3D Render aspect [yes]
-qt3d-input .......... Enable the Qt3D Input aspect [yes] -qt3d-input .......... Enable the Qt3D Input aspect [yes]
-qt3d-logic .......... Enable the Qt3D Logic aspect [yes] -qt3d-logic .......... Enable the Qt3D Logic aspect [yes]

82
src/core/CMakeLists.txt
View File

@ -9,6 +9,7 @@
qt_internal_add_module(3DCore qt_internal_add_module(3DCore
SOURCES SOURCES
aligned_malloc_p.h
aspect/qcoreaspect.cpp aspect/qcoreaspect.h aspect/qcoreaspect_p.h aspect/qcoreaspect.cpp aspect/qcoreaspect.h aspect/qcoreaspect_p.h
aspect/qcoresettings.cpp aspect/qcoresettings.h aspect/qcoresettings_p.h aspect/qcoresettings.cpp aspect/qcoresettings.h aspect/qcoresettings_p.h
aspect/coresettings.cpp aspect/coresettings_p.h aspect/coresettings.cpp aspect/coresettings_p.h
@ -53,6 +54,7 @@ qt_internal_add_module(3DCore
qurlhelper.cpp qurlhelper_p.h qurlhelper.cpp qurlhelper_p.h
resources/qhandle_p.h resources/qhandle_p.h
resources/qloadgltf_p.h resources/qloadgltf_p.h
resources/qresourcemanager.cpp resources/qresourcemanager_p.h
services/nullservices_p.h services/nullservices_p.h
services/qabstractframeadvanceservice.cpp services/qabstractframeadvanceservice_p.h services/qabstractframeadvanceservice.cpp services/qabstractframeadvanceservice_p.h
services/qabstractframeadvanceservice_p_p.h services/qabstractframeadvanceservice_p_p.h
@ -110,77 +112,17 @@ qt_internal_extend_target(3DCore CONDITION gcov
"-ftest-coverage" "-ftest-coverage"
) )
function(qt3d_add_simd_part target) qt_internal_extend_target(3DCore CONDITION
qt_parse_all_arguments(arg "qt3d_add_simd_part" "" "" CONDITION ( TEST_architecture_arch STREQUAL i386 ) OR
"NAME;SIMD;${__default_private_args};COMPILE_FLAGS" ${ARGN}) ( TEST_architecture_arch STREQUAL x86_64 ) OR
if ("x${arg_SIMD}" STREQUAL x) ( CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" ) OR
message(FATAL_ERROR "qt3d_add_simd_part needs a SIMD type to be set.") ( CMAKE_OSX_ARCHITECTURES MATCHES "x86_64h" ) OR
endif() ( CMAKE_OSX_ARCHITECTURES MATCHES "i386" )
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")
endif()
qt_evaluate_config_expression(result ${condition})
if(${result})
if(QT_CMAKE_DEBUG_EXTEND_TARGET)
message("qt3d_add_simd_part(${target} SIMD ${arg_SIMD} ...): Evaluated")
endif()
string(TOUPPER "QT_CFLAGS_${arg_SIMD}" simd_flags)
foreach(source IN LISTS arg_SOURCES)
set_property(SOURCE "${source}" APPEND
PROPERTY COMPILE_OPTIONS
${${simd_flags}}
${arg_COMPILE_FLAGS}
)
endforeach()
set_source_files_properties(${arg_SOURCES} PROPERTIES SKIP_PRECOMPILE_HEADERS TRUE)
target_sources(${target} PRIVATE ${arg_SOURCES})
target_compile_options("${target}Private" INTERFACE ${${simd_flags}} ${arg_COMPILE_FLAGS})
target_compile_definitions("${target}Private" INTERFACE ${simd_flags})
else()
if(QT_CMAKE_DEBUG_EXTEND_TARGET)
message("qt3d_add_simd_part(${target} SIMD ${arg_SIMD} ...): Skipped")
endif()
endif()
endfunction()
if(QT_FEATURE_qt3d_simd_sse2)
qt3d_add_simd_part(3DCore SIMD sse2
SOURCES
transforms/matrix4x4_sse.cpp transforms/matrix4x4_sse_p.h
)
endif()
if(QT_FEATURE_qt3d_simd_sse2 AND NOT QT_FEATURE_qt3d_simd_avx2)
qt3d_add_simd_part(3DCore SIMD sse2
SOURCES
transforms/vector3d_sse.cpp transforms/vector3d_sse_p.h
transforms/vector4d_sse.cpp transforms/vector4d_sse_p.h
aligned_malloc_p.h
resources/qresourcemanager.cpp resources/qresourcemanager_p.h
)
endif()
if(QT_FEATURE_qt3d_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
transforms/vector4d_sse.cpp transforms/vector4d_sse_p.h
aligned_malloc_p.h
resources/qresourcemanager.cpp resources/qresourcemanager_p.h
)
endif()
qt_internal_extend_target(3DCore
CONDITION
NOT QT_FEATURE_qt3d_simd_sse2 AND NOT QT_FEATURE_qt3d_simd_avx2
SOURCES SOURCES
aligned_malloc_p.h transforms/matrix4x4_avx2_p.h
resources/qresourcemanager.cpp resources/qresourcemanager_p.h transforms/matrix4x4_sse.cpp transforms/matrix4x4_sse_p.h
transforms/vector3d_sse.cpp transforms/vector3d_sse_p.h
transforms/vector4d_sse.cpp transforms/vector4d_sse_p.h
) )
qt_internal_add_docs(3DCore qt_internal_add_docs(3DCore

6
src/core/aligned_malloc_p.h
View File

@ -18,15 +18,15 @@
#include <QtCore/private/qsimd_p.h> #include <QtCore/private/qsimd_p.h>
#include <Qt3DCore/private/qt3dcore-config_p.h> #include <Qt3DCore/private/qt3dcore-config_p.h>
#if QT_CONFIG(qt3d_simd_avx2) && defined(__AVX2__) && defined(QT_COMPILER_SUPPORTS_AVX2) #if defined(__AVX2__)
# define QT3D_ALIGNED_MALLOC(s) _mm_malloc(s, 32) # define QT3D_ALIGNED_MALLOC(s) _mm_malloc(s, 32)
#elif QT_CONFIG(qt3d_simd_sse2) && defined(__SSE2__) && defined(QT_COMPILER_SUPPORTS_SSE2) #elif defined(__SSE2__)
# define QT3D_ALIGNED_MALLOC(s) _mm_malloc(s, 16) # define QT3D_ALIGNED_MALLOC(s) _mm_malloc(s, 16)
#else #else
#define QT3D_ALIGNED_MALLOC(s) malloc(s) #define QT3D_ALIGNED_MALLOC(s) malloc(s)
#endif #endif
#if (QT_CONFIG(qt3d_simd_avx2) && defined(__AVX2__) && defined(QT_COMPILER_SUPPORTS_AVX2)) || (QT_CONFIG(qt3d_simd_sse2) && defined(__SSE2__) && defined(QT_COMPILER_SUPPORTS_SSE2)) #if defined(__SSE2__)
# define QT3D_ALIGNED_FREE(ptr) _mm_free(ptr) # define QT3D_ALIGNED_FREE(ptr) _mm_free(ptr)
#else #else
# define QT3D_ALIGNED_FREE(ptr) free(ptr) # define QT3D_ALIGNED_FREE(ptr) free(ptr)

17
src/core/configure.cmake
View File

@ -68,26 +68,9 @@ qt_feature("qt3d-animation" PUBLIC
PURPOSE "Use the 3D Animation Aspect library" PURPOSE "Use the 3D Animation Aspect library"
CONDITION QT_FEATURE_qt3d_render CONDITION QT_FEATURE_qt3d_render
) )
qt_feature("qt3d-simd-sse2" PRIVATE
LABEL "Use SSE2 instructions"
PURPOSE "Use SSE2 SIMD instructions to accelerate matrix operations"
AUTODETECT QT_FEATURE_sse2
ENABLE INPUT_qt3d_simd STREQUAL 'sse2' OR INPUT_qt3d_simd STREQUAL 'avx2'
DISABLE INPUT_qt3d_simd STREQUAL 'no' OR ( TEST_architecture_arch STREQUAL i386 )
)
qt_feature("qt3d-simd-avx2" PRIVATE
LABEL "Use AVX2 instructions"
PURPOSE "Use AVX2 SIMD instructions to accelerate matrix operations"
AUTODETECT TEST_arch_${TEST_architecture_arch}_subarch_avx2
CONDITION QT_FEATURE_avx2
ENABLE INPUT_qt3d_simd STREQUAL 'avx2'
DISABLE INPUT_qt3d_simd STREQUAL 'sse2' OR INPUT_qt3d_simd STREQUAL 'no' OR ( TEST_architecture_arch STREQUAL i386 )
)
qt_configure_add_summary_section(NAME "Qt 3D") qt_configure_add_summary_section(NAME "Qt 3D")
qt_configure_add_summary_entry(ARGS "qt3d-assimp") qt_configure_add_summary_entry(ARGS "qt3d-assimp")
qt_configure_add_summary_entry(ARGS "qt3d-system-assimp") qt_configure_add_summary_entry(ARGS "qt3d-system-assimp")
qt_configure_add_summary_entry(ARGS "qt3d-simd-sse2")
qt_configure_add_summary_entry(ARGS "qt3d-simd-avx2")
qt_configure_add_summary_section(NAME "Aspects") qt_configure_add_summary_section(NAME "Aspects")
qt_configure_add_summary_entry(ARGS "qt3d-render") qt_configure_add_summary_entry(ARGS "qt3d-render")
qt_configure_add_summary_entry(ARGS "qt3d-input") qt_configure_add_summary_entry(ARGS "qt3d-input")

8
src/core/resources/qresourcemanager.cpp
View File

@ -57,9 +57,9 @@ namespace Qt3DCore {
void *AlignedAllocator::allocate(uint size) void *AlignedAllocator::allocate(uint size)
{ {
#if QT_CONFIG(qt3d_simd_avx2) && defined(__AVX2__) && defined(QT_COMPILER_SUPPORTS_AVX2) #if defined(__AVX2__)
return _mm_malloc(size, 32); return _mm_malloc(size, 32);
#elif QT_CONFIG(qt3d_simd_sse2) && defined(__SSE2__) && defined(QT_COMPILER_SUPPORTS_SSE2) #elif defined(__SSE2__)
return _mm_malloc(size, 16); return _mm_malloc(size, 16);
#else #else
return malloc(size); return malloc(size);
@ -68,9 +68,7 @@ void *AlignedAllocator::allocate(uint size)
void AlignedAllocator::release(void *p) void AlignedAllocator::release(void *p)
{ {
#if QT_CONFIG(qt3d_simd_avx2) && defined(__AVX2__) && defined(QT_COMPILER_SUPPORTS_AVX2) #if defined(__SSE2__)
_mm_free(p);
#elif QT_CONFIG(qt3d_simd_sse2) && defined(__SSE2__) && defined(QT_COMPILER_SUPPORTS_SSE2)
_mm_free(p); _mm_free(p);
#else #else
free(p); free(p);

28
src/core/transforms/matrix4x4_avx2.cpp
View File

@ -1,28 +0,0 @@
// Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com>
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#include "matrix4x4_avx2_p.h"
#ifdef QT_COMPILER_SUPPORTS_AVX2
QT_BEGIN_NAMESPACE
namespace Qt3DCore {
QDebug operator<<(QDebug dbg, const Matrix4x4_AVX2 &m)
{
dbg.nospace() << "Matrix4x4_AVX2(" << Qt::endl
<< qSetFieldWidth(10)
<< m.m11() << m.m12() << m.m13() << m.m14() << Qt::endl
<< m.m21() << m.m22() << m.m23() << m.m24() << Qt::endl
<< m.m31() << m.m32() << m.m33() << m.m34() << Qt::endl
<< m.m41() << m.m42() << m.m43() << m.m44() << Qt::endl
<< qSetFieldWidth(0) << ')';
return dbg;
}
} // Qt3DCore
QT_END_NAMESPACE
#endif

74
src/core/transforms/matrix4x4_avx2_p.h
View File

@ -20,7 +20,7 @@
#include <private/qsimd_p.h> #include <private/qsimd_p.h>
#include <QMatrix4x4> #include <QMatrix4x4>
#ifdef QT_COMPILER_SUPPORTS_AVX2 #ifdef __AVX2__
// Some GCC versions don't have _mm256_set_m128 available // Some GCC versions don't have _mm256_set_m128 available
// Work around that // Work around that
@ -33,22 +33,22 @@ QT_BEGIN_NAMESPACE
namespace Qt3DCore { namespace Qt3DCore {
class Matrix4x4_AVX2 class Matrix4x4_SSE
{ {
public: public:
Q_ALWAYS_INLINE Matrix4x4_AVX2() { setToIdentity(); } Q_ALWAYS_INLINE Matrix4x4_SSE() { setToIdentity(); }
explicit Q_ALWAYS_INLINE Matrix4x4_AVX2(Qt::Initialization) {} explicit Q_ALWAYS_INLINE Matrix4x4_SSE(Qt::Initialization) {}
// Assumes data is 32 bytes aligned (and in column major order) // Assumes data is 32 bytes aligned (and in column major order)
explicit Q_ALWAYS_INLINE Matrix4x4_AVX2(float *data) explicit Q_ALWAYS_INLINE Matrix4x4_SSE(float *data)
{ {
m_col12 = _mm256_load_ps(data); m_col12 = _mm256_load_ps(data);
m_col34 = _mm256_load_ps(data + 8); m_col34 = _mm256_load_ps(data + 8);
} }
// QMatrix4x4::constData returns in column major order // QMatrix4x4::constData returns in column major order
explicit Q_ALWAYS_INLINE Matrix4x4_AVX2(const QMatrix4x4 &mat) explicit Q_ALWAYS_INLINE Matrix4x4_SSE(const QMatrix4x4 &mat)
{ {
// data may not be properly aligned, using unaligned loads // data may not be properly aligned, using unaligned loads
const float *data = mat.constData(); const float *data = mat.constData();
@ -57,7 +57,7 @@ public:
} }
// In (row major) but we store in column major order // In (row major) but we store in column major order
explicit Q_ALWAYS_INLINE Matrix4x4_AVX2(float m11, float m12, float m13, float m14, explicit Q_ALWAYS_INLINE Matrix4x4_SSE(float m11, float m12, float m13, float m14,
float m21, float m22, float m23, float m24, float m21, float m22, float m23, float m24,
float m31, float m32, float m33, float m34, float m31, float m32, float m33, float m34,
float m41, float m42, float m43, float m44) float m41, float m42, float m43, float m44)
@ -96,7 +96,7 @@ public:
// Using a static identity matrix and assigning it is 27 instructions // Using a static identity matrix and assigning it is 27 instructions
} }
Q_ALWAYS_INLINE Matrix4x4_AVX2 operator*(const Matrix4x4_AVX2 &other) const Q_ALWAYS_INLINE Matrix4x4_SSE operator*(const Matrix4x4_SSE &other) const
{ {
// Shuffling: (Latency 1) // Shuffling: (Latency 1)
// (8 bits -> first two pairs used to select from the first vector, second pairs from second vector) // (8 bits -> first two pairs used to select from the first vector, second pairs from second vector)
@ -182,58 +182,58 @@ public:
tmp2 = _mm256_add_ps(_mm256_mul_ps(_mm256_shuffle_ps(otherCol34, otherCol34, 0xaa), _mm256_broadcast_ps(&col3)), tmp2); tmp2 = _mm256_add_ps(_mm256_mul_ps(_mm256_shuffle_ps(otherCol34, otherCol34, 0xaa), _mm256_broadcast_ps(&col3)), tmp2);
tmp2 = _mm256_add_ps(_mm256_mul_ps(_mm256_shuffle_ps(otherCol34, otherCol34, 0xff), _mm256_broadcast_ps(&col4)), tmp2); tmp2 = _mm256_add_ps(_mm256_mul_ps(_mm256_shuffle_ps(otherCol34, otherCol34, 0xff), _mm256_broadcast_ps(&col4)), tmp2);
Matrix4x4_AVX2 c(Qt::Uninitialized); Matrix4x4_SSE c(Qt::Uninitialized);
c.m_col12 = tmp; c.m_col12 = tmp;
c.m_col34 = tmp2; c.m_col34 = tmp2;
return c; return c;
} }
Q_ALWAYS_INLINE Matrix4x4_AVX2 operator-(const Matrix4x4_AVX2 &other) const Q_ALWAYS_INLINE Matrix4x4_SSE operator-(const Matrix4x4_SSE &other) const
{ {
Matrix4x4_AVX2 c(Qt::Uninitialized); Matrix4x4_SSE c(Qt::Uninitialized);
c.m_col12 = _mm256_sub_ps(m_col12, other.m_col12); c.m_col12 = _mm256_sub_ps(m_col12, other.m_col12);
c.m_col34 = _mm256_sub_ps(m_col34, other.m_col34); c.m_col34 = _mm256_sub_ps(m_col34, other.m_col34);
return c; return c;
} }
Q_ALWAYS_INLINE Matrix4x4_AVX2 operator+(const Matrix4x4_AVX2 &other) const Q_ALWAYS_INLINE Matrix4x4_SSE operator+(const Matrix4x4_SSE &other) const
{ {
Matrix4x4_AVX2 c(Qt::Uninitialized); Matrix4x4_SSE c(Qt::Uninitialized);
c.m_col12 = _mm256_add_ps(m_col12, other.m_col12); c.m_col12 = _mm256_add_ps(m_col12, other.m_col12);
c.m_col34 = _mm256_add_ps(m_col34, other.m_col34); c.m_col34 = _mm256_add_ps(m_col34, other.m_col34);
return c; return c;
} }
Q_ALWAYS_INLINE Matrix4x4_AVX2 &operator*=(const Matrix4x4_AVX2 &other) Q_ALWAYS_INLINE Matrix4x4_SSE &operator*=(const Matrix4x4_SSE &other)
{ {
*this = *this * other; *this = *this * other;
return *this; return *this;
} }
Q_ALWAYS_INLINE Matrix4x4_AVX2 &operator-=(const Matrix4x4_AVX2 &other) Q_ALWAYS_INLINE Matrix4x4_SSE &operator-=(const Matrix4x4_SSE &other)
{ {
*this = *this - other; *this = *this - other;
return *this; return *this;
} }
Q_ALWAYS_INLINE Matrix4x4_AVX2 &operator+=(const Matrix4x4_AVX2 &other) Q_ALWAYS_INLINE Matrix4x4_SSE &operator+=(const Matrix4x4_SSE &other)
{ {
*this = *this + other; *this = *this + other;
return *this; return *this;
} }
Q_ALWAYS_INLINE Matrix4x4_AVX2 transposed() const Q_ALWAYS_INLINE Matrix4x4_SSE transposed() const
{ {
Matrix4x4_AVX2 c(Qt::Uninitialized); Matrix4x4_SSE c(Qt::Uninitialized);
const __m128 col1 = _mm256_extractf128_ps(m_col12, 0); const __m128 col1 = _mm256_extractf128_ps(m_col12, 0);
const __m128 col2 = _mm256_extractf128_ps(m_col12, 1); const __m128 col2 = _mm256_extractf128_ps(m_col12, 1);
const __m128 col3 = _mm256_extractf128_ps(m_col34, 0); const __m128 col3 = _mm256_extractf128_ps(m_col34, 0);
const __m128 col4 = _mm256_extractf128_ps(m_col34, 1); const __m128 col4 = _mm256_extractf128_ps(m_col34, 1);
// ~117 instructions // ~117 instructions
// Matrix4x4_AVX2 c = *this; // Matrix4x4_SSE c = *this;
// _MM_TRANSPOSE4_PS(c.m_col1, c.m_col2, c.m_col3, c.m_col4); // _MM_TRANSPOSE4_PS(c.m_col1, c.m_col2, c.m_col3, c.m_col4);
// ~131 instructions - AVX2 // ~131 instructions - AVX2
@ -279,14 +279,14 @@ public:
return c; return c;
} }
Q_ALWAYS_INLINE Matrix4x4_AVX2 inverted() const Q_ALWAYS_INLINE Matrix4x4_SSE inverted() const
{ {
// TO DO: Optimize // TO DO: Optimize
const QMatrix4x4 mat = toQMatrix4x4(); const QMatrix4x4 mat = toQMatrix4x4();
return Matrix4x4_AVX2(mat.inverted()); return Matrix4x4_SSE(mat.inverted());
} }
Q_ALWAYS_INLINE bool operator==(const Matrix4x4_AVX2 &other) const Q_ALWAYS_INLINE bool operator==(const Matrix4x4_SSE &other) const
{ {
// cmp returns (-1, -1, -1, -1, -1, -1, -1, -1) if the two m256 are equals // cmp returns (-1, -1, -1, -1, -1, -1, -1, -1) if the two m256 are equals
// movemask takes the most significant bits (8x 1 in this case) which equals 0xff // movemask takes the most significant bits (8x 1 in this case) which equals 0xff
@ -295,7 +295,7 @@ public:
} }
Q_ALWAYS_INLINE bool operator!=(const Matrix4x4_AVX2 &other) const Q_ALWAYS_INLINE bool operator!=(const Matrix4x4_SSE &other) const
{ {
return !(*this == other); return !(*this == other);
} }
@ -450,13 +450,13 @@ public:
Vector3D_SSE::dotProduct(row3, vector)); Vector3D_SSE::dotProduct(row3, vector));
} }
friend Vector4D operator*(const Vector4D &vector, const Matrix4x4_AVX2 &matrix); friend Vector4D operator*(const Vector4D &vector, const Matrix4x4_SSE &matrix);
friend Vector4D operator*(const Matrix4x4_AVX2 &matrix, const Vector4D &vector); friend Vector4D operator*(const Matrix4x4_SSE &matrix, const Vector4D &vector);
friend Vector3D operator*(const Vector3D &vector, const Matrix4x4_AVX2 &matrix); friend Vector3D operator*(const Vector3D &vector, const Matrix4x4_SSE &matrix);
friend Vector3D operator*(const Matrix4x4_AVX2 &matrix, const Vector3D &vector); friend Vector3D operator*(const Matrix4x4_SSE &matrix, const Vector3D &vector);
friend Q_3DCORE_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const Matrix4x4_AVX2 &m); friend Q_3DCORE_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const Matrix4x4_SSE &m);
private: private:
// column major order // column major order
@ -476,7 +476,7 @@ private:
__m256 m_col34; __m256 m_col34;
}; };
Q_ALWAYS_INLINE Vector4D operator*(const Vector4D &vector, const Matrix4x4_AVX2 &matrix) Q_ALWAYS_INLINE Vector4D operator*(const Vector4D &vector, const Matrix4x4_SSE &matrix)
{ {
const __m256 vecMultiplier = _mm256_broadcast_ps(&vector.m_xyzw); const __m256 vecMultiplier = _mm256_broadcast_ps(&vector.m_xyzw);
// a1 a2 a3 a4 b1 b2 b3 b4, c1 c2 c3 c4 d1 d2 d3 d4 // a1 a2 a3 a4 b1 b2 b3 b4, c1 c2 c3 c4 d1 d2 d3 d4
@ -495,13 +495,13 @@ Q_ALWAYS_INLINE Vector4D operator*(const Vector4D &vector, const Matrix4x4_AVX2
return v; return v;
} }
Q_ALWAYS_INLINE Vector4D operator*(const Matrix4x4_AVX2 &matrix, const Vector4D &vector) Q_ALWAYS_INLINE Vector4D operator*(const Matrix4x4_SSE &matrix, const Vector4D &vector)
{ {
const Matrix4x4_AVX2 transposed = matrix.transposed(); const Matrix4x4_SSE transposed = matrix.transposed();
return vector * transposed; return vector * transposed;
} }
Q_ALWAYS_INLINE Vector3D operator*(const Vector3D &vector, const Matrix4x4_AVX2 &matrix) Q_ALWAYS_INLINE Vector3D operator*(const Vector3D &vector, const Matrix4x4_SSE &matrix)
{ {
const __m128 vec4 = _mm_set_ps(1.0f, vector.z(), vector.y(), vector.x()); const __m128 vec4 = _mm_set_ps(1.0f, vector.z(), vector.y(), vector.x());
const __m256 vecMultiplier = _mm256_broadcast_ps(&vec4); const __m256 vecMultiplier = _mm256_broadcast_ps(&vec4);
@ -524,20 +524,20 @@ Q_ALWAYS_INLINE Vector3D operator*(const Vector3D &vector, const Matrix4x4_AVX2
return v; return v;
} }
Q_ALWAYS_INLINE Vector3D operator*(const Matrix4x4_AVX2 &matrix, const Vector3D &vector) Q_ALWAYS_INLINE Vector3D operator*(const Matrix4x4_SSE &matrix, const Vector3D &vector)
{ {
const Matrix4x4_AVX2 transposed = matrix.transposed(); const Matrix4x4_SSE transposed = matrix.transposed();
return vector * transposed; return vector * transposed;
} }
} // Qt3DCore } // Qt3DCore
Q_DECLARE_TYPEINFO(Qt3DCore::Matrix4x4_AVX2, Q_PRIMITIVE_TYPE); Q_DECLARE_TYPEINFO(Qt3DCore::Matrix4x4_SSE, Q_PRIMITIVE_TYPE);
QT_END_NAMESPACE QT_END_NAMESPACE
Q_DECLARE_METATYPE(Qt3DCore::Matrix4x4_AVX2) Q_DECLARE_METATYPE(Qt3DCore::Matrix4x4_SSE)
#endif // QT_COMPILER_SUPPORTS_AVX #endif // __AVX2__
#endif // QT3DCORE_MATRIX4X4_AVX2_P_H #endif // QT3DCORE_MATRIX4X4_AVX2_P_H

15
src/core/transforms/matrix4x4_p.h
View File

@ -16,20 +16,9 @@
// //
#include <private/qsimd_p.h> #include <private/qsimd_p.h>
#include <Qt3DCore/private/qt3dcore-config_p.h>
// Check if we can use the optimized version of QMatrix4x4
// We check if sse or avx config option was enabled as it could #if defined(__SSE2__)
// be disabled even though a given platform supports SSE2 or AVX2 instructions
#if QT_CONFIG(qt3d_simd_avx2) && defined(__AVX2__) && defined(QT_COMPILER_SUPPORTS_AVX2)
#include <Qt3DCore/private/matrix4x4_avx2_p.h>
QT_BEGIN_NAMESPACE
using Matrix4x4 = Qt3DCore::Matrix4x4_AVX2;
QT_END_NAMESPACE
#elif QT_CONFIG(qt3d_simd_sse2) && defined(__SSE2__) && defined(QT_COMPILER_SUPPORTS_SSE2)
#include <Qt3DCore/private/matrix4x4_sse_p.h> #include <Qt3DCore/private/matrix4x4_sse_p.h>

4
src/core/transforms/matrix4x4_sse.cpp
View File

@ -3,7 +3,7 @@
#include "matrix4x4_sse_p.h" #include "matrix4x4_sse_p.h"
#ifdef QT_COMPILER_SUPPORTS_SSE2 #ifdef __SSE2__
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -25,4 +25,4 @@ QDebug operator<<(QDebug dbg, const Matrix4x4_SSE &m)
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QT_COMPILER_SUPPORTS_SSE2 #endif // __SSE2__

6
src/core/transforms/matrix4x4_sse_p.h
View File

@ -20,7 +20,9 @@
#include <private/qsimd_p.h> #include <private/qsimd_p.h>
#include <QMatrix4x4> #include <QMatrix4x4>
#ifdef QT_COMPILER_SUPPORTS_SSE2 #if defined(__AVX2__)
#include "matrix4x4_avx2_p.h"
#elif defined(__SSE2__)
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -464,6 +466,6 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(Qt3DCore::Matrix4x4_SSE) Q_DECLARE_METATYPE(Qt3DCore::Matrix4x4_SSE)
#endif // QT_COMPILER_SUPPORTS_SSE2 #endif // __SSE2__
#endif // QT3DCORE_MATRIX4X4_SSE_P_H #endif // QT3DCORE_MATRIX4X4_SSE_P_H

6
src/core/transforms/vector3d_p.h
View File

@ -16,11 +16,9 @@
// //
#include <private/qsimd_p.h> #include <private/qsimd_p.h>
#include <Qt3DCore/private/qt3dcore-config_p.h>
// We check if sse config option was enabled as it could // Check if we can use the optimized version of QVector3D
// be disabled even though a given platform supports SSE2 instructions #if defined(__SSE2__)
#if QT_CONFIG(qt3d_simd_sse2) && (defined(__AVX2__) || defined(__SSE2__)) && defined(QT_COMPILER_SUPPORTS_SSE2)
#include <Qt3DCore/private/vector3d_sse_p.h> #include <Qt3DCore/private/vector3d_sse_p.h>

49
src/core/transforms/vector3d_sse.cpp
View File

@ -1,19 +1,15 @@
// Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). // Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#include "vector3d_sse_p.h"
#include <private/qsimd_p.h> #include <private/qsimd_p.h>
#if defined(__AVX2__) && defined(QT_COMPILER_SUPPORTS_AVX2)
#include "matrix4x4_avx2_p.h"
#else
#include "matrix4x4_sse_p.h" #include "matrix4x4_sse_p.h"
#endif
#include "vector3d_sse_p.h"
#include "vector4d_sse_p.h" #include "vector4d_sse_p.h"
#include <QDebug> #include <QDebug>
#ifdef QT_COMPILER_SUPPORTS_SSE2 #ifdef __SSE2__
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -30,41 +26,6 @@ Vector3D_SSE::Vector3D_SSE(const Vector4D_SSE &v)
m_xyzw = _mm_mul_ps(v.m_xyzw, _mm_set_ps(0.0f, 1.0f, 1.0f, 1.0f)); m_xyzw = _mm_mul_ps(v.m_xyzw, _mm_set_ps(0.0f, 1.0f, 1.0f, 1.0f));
} }
#if defined(__AVX2__) && defined(QT_COMPILER_SUPPORTS_AVX2)
Vector3D_SSE Vector3D_SSE::unproject(const Matrix4x4_AVX2 &modelView, const Matrix4x4_AVX2 &projection, const QRect &viewport) const
{
const Matrix4x4_AVX2 inverse = (projection * modelView).inverted();
Vector4D_SSE tmp(*this, 1.0f);
tmp.setX((tmp.x() - float(viewport.x())) / float(viewport.width()));
tmp.setY((tmp.y() - float(viewport.y())) / float(viewport.height()));
tmp = tmp * 2.0f - Vector4D_SSE(1.0f, 1.0f, 1.0f, 1.0f);
Vector4D_SSE obj = inverse * tmp;
if (qFuzzyIsNull(obj.w()))
obj.setW(1.0f);
obj /= obj.w();
return Vector3D_SSE(obj);
}
Vector3D_SSE Vector3D_SSE::project(const Matrix4x4_AVX2 &modelView, const Matrix4x4_AVX2 &projection, const QRect &viewport) const
{
Vector4D_SSE tmp(*this, 1.0f);
tmp = projection * modelView * tmp;
if (qFuzzyIsNull(tmp.w()))
tmp.setW(1.0f);
tmp /= tmp.w();
tmp = tmp * 0.5f + Vector4D_SSE(0.5f, 0.5f, 0.5f, 0.5f);
tmp.setX(tmp.x() * viewport.width() + viewport.x());
tmp.setY(tmp.y() * viewport.height() + viewport.y());
return Vector3D_SSE(tmp);
}
#else
Vector3D_SSE Vector3D_SSE::unproject(const Matrix4x4_SSE &modelView, const Matrix4x4_SSE &projection, const QRect &viewport) const Vector3D_SSE Vector3D_SSE::unproject(const Matrix4x4_SSE &modelView, const Matrix4x4_SSE &projection, const QRect &viewport) const
{ {
const Matrix4x4_SSE inverse = (projection * modelView).inverted(); const Matrix4x4_SSE inverse = (projection * modelView).inverted();
@ -96,10 +57,8 @@ Vector3D_SSE Vector3D_SSE::project(const Matrix4x4_SSE &modelView, const Matrix4
return Vector3D_SSE(tmp); return Vector3D_SSE(tmp);
} }
#endif
} // Qt3DCore } // Qt3DCore
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QT_COMPILER_SUPPORTS_SSE2 #endif // __SSE2__

17
src/core/transforms/vector3d_sse_p.h
View File

@ -22,14 +22,13 @@
#include <QDebug> #include <QDebug>
#include <math.h> #include <math.h>
#ifdef QT_COMPILER_SUPPORTS_SSE2 #ifdef __SSE2__
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace Qt3DCore { namespace Qt3DCore {
class Matrix4x4_SSE; class Matrix4x4_SSE;
class Matrix4x4_AVX2;
class Vector4D_SSE; class Vector4D_SSE;
class Vector3D_SSE class Vector3D_SSE
@ -142,13 +141,8 @@ public:
return ((_mm_movemask_ps(_mm_cmpeq_ps(m_xyzw, _mm_set_ps1(0.0f))) & 0x7) == 0x7); return ((_mm_movemask_ps(_mm_cmpeq_ps(m_xyzw, _mm_set_ps1(0.0f))) & 0x7) == 0x7);
} }
#if defined(__AVX2__) && defined(QT_COMPILER_SUPPORTS_AVX2)
Q_3DCORE_PRIVATE_EXPORT Vector3D_SSE unproject(const Matrix4x4_AVX2 &modelView, const Matrix4x4_AVX2 &projection, const QRect &viewport) const;
Q_3DCORE_PRIVATE_EXPORT Vector3D_SSE project(const Matrix4x4_AVX2 &modelView, const Matrix4x4_AVX2 &projection, const QRect &viewport) const;
#else
Q_3DCORE_PRIVATE_EXPORT Vector3D_SSE unproject(const Matrix4x4_SSE &modelView, const Matrix4x4_SSE &projection, const QRect &viewport) const; Q_3DCORE_PRIVATE_EXPORT Vector3D_SSE unproject(const Matrix4x4_SSE &modelView, const Matrix4x4_SSE &projection, const QRect &viewport) const;
Q_3DCORE_PRIVATE_EXPORT Vector3D_SSE project(const Matrix4x4_SSE &modelView, const Matrix4x4_SSE &projection, const QRect &viewport) const; Q_3DCORE_PRIVATE_EXPORT Vector3D_SSE project(const Matrix4x4_SSE &modelView, const Matrix4x4_SSE &projection, const QRect &viewport) const;
#endif
Q_ALWAYS_INLINE float x() const { return _mm_cvtss_f32(m_xyzw); } Q_ALWAYS_INLINE float x() const { return _mm_cvtss_f32(m_xyzw); }
@ -309,13 +303,6 @@ public:
} }
friend class Vector4D_SSE; friend class Vector4D_SSE;
#if defined(__AVX2__) && defined(QT_COMPILER_SUPPORTS_AVX2)
friend class Matrix4x4_AVX2;
friend Vector3D_SSE operator*(const Vector3D_SSE &vector, const Matrix4x4_AVX2 &matrix);
friend Vector3D_SSE operator*(const Matrix4x4_AVX2 &matrix, const Vector3D_SSE &vector);
#endif
friend class Matrix4x4_SSE; friend class Matrix4x4_SSE;
friend Vector3D_SSE operator*(const Vector3D_SSE &vector, const Matrix4x4_SSE &matrix); friend Vector3D_SSE operator*(const Vector3D_SSE &vector, const Matrix4x4_SSE &matrix);
friend Vector3D_SSE operator*(const Matrix4x4_SSE &matrix, const Vector3D_SSE &vector); friend Vector3D_SSE operator*(const Matrix4x4_SSE &matrix, const Vector3D_SSE &vector);
@ -358,6 +345,6 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(Qt3DCore::Vector3D_SSE) Q_DECLARE_METATYPE(Qt3DCore::Vector3D_SSE)
#endif // QT_COMPILER_SUPPORTS_SSE2 #endif // __SSE2__
#endif // QT3DCORE_VECTOR3D_SSE_P_H #endif // QT3DCORE_VECTOR3D_SSE_P_H

6
src/core/transforms/vector4d_p.h
View File

@ -16,11 +16,9 @@
// //
#include <private/qsimd_p.h> #include <private/qsimd_p.h>
#include <Qt3DCore/private/qt3dcore-config_p.h>
// We check if sse config option was enabled as it could // Check if we can use the optimized version of QVector3D
// be disabled even though a given platform supports SSE2 instructions #if defined(__SSE2__)
#if QT_CONFIG(qt3d_simd_sse2) && (defined(__AVX2__) || defined(__SSE2__)) && defined(QT_COMPILER_SUPPORTS_SSE2)
#include <Qt3DCore/private/vector4d_sse_p.h> #include <Qt3DCore/private/vector4d_sse_p.h>

4
src/core/transforms/vector4d_sse.cpp
View File

@ -4,7 +4,7 @@
#include "vector4d_sse_p.h" #include "vector4d_sse_p.h"
#include <QDebug> #include <QDebug>
#ifdef QT_COMPILER_SUPPORTS_SSE2 #ifdef __SSE2__
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -20,4 +20,4 @@ QDebug operator<<(QDebug dbg, const Vector4D_SSE &v)
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QT_COMPILER_SUPPORTS_SSE2 #endif // __SSE2__

12
src/core/transforms/vector4d_sse_p.h
View File

@ -18,14 +18,13 @@
#include <Qt3DCore/private/vector3d_p.h> #include <Qt3DCore/private/vector3d_p.h>
#include <QtGui/qvector4d.h> #include <QtGui/qvector4d.h>
#ifdef QT_COMPILER_SUPPORTS_SSE2 #ifdef __SSE2__
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace Qt3DCore { namespace Qt3DCore {
class Matrix4x4_SSE; class Matrix4x4_SSE;
class Matrix4x4_AVX2;
class Vector4D_SSE class Vector4D_SSE
{ {
@ -306,13 +305,6 @@ public:
} }
friend class Matrix4x4_SSE; friend class Matrix4x4_SSE;
#ifdef __AVX2__
friend class Matrix4x4_AVX2;
friend Vector4D_SSE operator*(const Vector4D_SSE &vector, const Matrix4x4_AVX2 &matrix);
friend Vector4D_SSE operator*(const Matrix4x4_AVX2 &matrix, const Vector4D_SSE &vector);
#endif
friend class Vector3D_SSE; friend class Vector3D_SSE;
friend Vector4D_SSE operator*(const Vector4D_SSE &vector, const Matrix4x4_SSE &matrix); friend Vector4D_SSE operator*(const Vector4D_SSE &vector, const Matrix4x4_SSE &matrix);
friend Vector4D_SSE operator*(const Matrix4x4_SSE &matrix, const Vector4D_SSE &vector); friend Vector4D_SSE operator*(const Matrix4x4_SSE &matrix, const Vector4D_SSE &vector);
@ -356,6 +348,6 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(Qt3DCore::Vector4D_SSE) Q_DECLARE_METATYPE(Qt3DCore::Vector4D_SSE)
#endif // QT_COMPILER_SUPPORTS_SSE2 #endif // __SSE2__
#endif // QT3DCORE_VECTOR4D_SSE_P_H #endif // QT3DCORE_VECTOR4D_SSE_P_H

2
src/render/backend/uniform_p.h
View File

@ -111,7 +111,7 @@ public:
} }
// We don t want the QMatrix4x4 builder to use sizeof since QMatrix4x4 contains a type flag // We don t want the QMatrix4x4 builder to use sizeof since QMatrix4x4 contains a type flag
#if defined(__SSE2__) || defined(__AVX2__) #if defined(__SSE2__)
UniformValue(const Matrix4x4 &mat44) UniformValue(const Matrix4x4 &mat44)
: m_data(sizeof(Matrix4x4) / sizeof(float)) : m_data(sizeof(Matrix4x4) / sizeof(float))
{ {

6
tests/auto/core/CMakeLists.txt
View File

@ -29,11 +29,9 @@ if(QT_FEATURE_private_tests)
add_subdirectory(aspectcommanddebugger) add_subdirectory(aspectcommanddebugger)
add_subdirectory(qscheduler) add_subdirectory(qscheduler)
endif() endif()
if(QT_FEATURE_private_tests AND QT_FEATURE_qt3d_simd_sse2) if(QT_FEATURE_private_tests AND NOT (CMAKE_OSX_ARCHITECTURES MATCHES ";") AND
(TEST_architecture_arch STREQUAL i386 OR TEST_architecture_arch STREQUAL x86_64))
add_subdirectory(vector4d_sse) add_subdirectory(vector4d_sse)
add_subdirectory(vector3d_sse) add_subdirectory(vector3d_sse)
add_subdirectory(matrix4x4_sse) add_subdirectory(matrix4x4_sse)
endif() endif()
if(QT_FEATURE_private_tests AND QT_FEATURE_qt3d_simd_avx2)
add_subdirectory(matrix4x4_avx2)
endif()

18
tests/auto/core/matrix4x4_avx2/CMakeLists.txt
View File

@ -1,18 +0,0 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from matrix4x4_avx2.pro.
#####################################################################
## tst_matrix4x4_avx2 Test:
#####################################################################
qt_internal_add_test(tst_matrix4x4_avx2
SOURCES
tst_matrix4x4_avx2.cpp
LIBRARIES
Qt::3DCore
Qt::3DCorePrivate
Qt::3DRenderPrivate
Qt::Gui
)

8
tests/auto/core/matrix4x4_avx2/matrix4x4_avx2.pro
View File

@ -1,8 +0,0 @@
TARGET = tst_matrix4x4_avx2
CONFIG += testcase
QT += testlib 3dcore 3dcore-private 3drender-private
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_AVX2
SOURCES += tst_matrix4x4_avx2.cpp

507
tests/auto/core/matrix4x4_avx2/tst_matrix4x4_avx2.cpp
View File

@ -1,507 +0,0 @@
// Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com>
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include <QtTest/QtTest>
#include <Qt3DCore/private/matrix4x4_avx2_p.h>
#include <Qt3DCore/private/aligned_malloc_p.h>
using namespace Qt3DCore;
class tst_Matrix4x4_AVX2: public QObject
{
Q_OBJECT
public:
void *operator new(size_t, void *ptr) { return ptr; }
void operator delete(void *, void *) {}
QT3D_ALIGNED_MALLOC_AND_FREE()
private Q_SLOTS:
void defaultConstruction()
{
// GIVEN
Matrix4x4_AVX2 mat4;
// THEN
QCOMPARE(mat4.m11(), 1.0f);
QCOMPARE(mat4.m12(), 0.0f);
QCOMPARE(mat4.m13(), 0.0f);
QCOMPARE(mat4.m14(), 0.0f);
QCOMPARE(mat4.m21(), 0.0f);
QCOMPARE(mat4.m22(), 1.0f);
QCOMPARE(mat4.m23(), 0.0f);
QCOMPARE(mat4.m24(), 0.0f);
QCOMPARE(mat4.m31(), 0.0f);
QCOMPARE(mat4.m32(), 0.0f);
QCOMPARE(mat4.m33(), 1.0f);
QCOMPARE(mat4.m34(), 0.0f);
QCOMPARE(mat4.m41(), 0.0f);
QCOMPARE(mat4.m42(), 0.0f);
QCOMPARE(mat4.m43(), 0.0f);
QCOMPARE(mat4.m44(), 1.0f);
}
void checkExplicitConstruction()
{
// GIVEN
Matrix4x4_AVX2 mat4(11.0f, 12.0f, 13.0f, 14.0f,
21.0f, 22.0f, 23.0f, 24.0f,
31.0f, 32.0f, 33.0f, 34.0f,
41.0f, 42.0f, 43.0f, 44.0f);
// THEN
QCOMPARE(mat4.m11(), 11.0f);
QCOMPARE(mat4.m12(), 12.0f);
QCOMPARE(mat4.m13(), 13.0f);
QCOMPARE(mat4.m14(), 14.0f);
QCOMPARE(mat4.m21(), 21.0f);
QCOMPARE(mat4.m22(), 22.0f);
QCOMPARE(mat4.m23(), 23.0f);
QCOMPARE(mat4.m24(), 24.0f);
QCOMPARE(mat4.m31(), 31.0f);
QCOMPARE(mat4.m32(), 32.0f);
QCOMPARE(mat4.m33(), 33.0f);
QCOMPARE(mat4.m34(), 34.0f);
QCOMPARE(mat4.m41(), 41.0f);
QCOMPARE(mat4.m42(), 42.0f);
QCOMPARE(mat4.m43(), 43.0f);
QCOMPARE(mat4.m44(), 44.0f);
}
void checkTransposed()
{
// GIVEN
Matrix4x4_AVX2 mat4(11.0f, 12.0f, 13.0f, 14.0f,
21.0f, 22.0f, 23.0f, 24.0f,
31.0f, 32.0f, 33.0f, 34.0f,
41.0f, 42.0f, 43.0f, 44.0f);
// WHEN
mat4 = mat4.transposed();
// THEN
QCOMPARE(mat4.m11(), 11.0f);
QCOMPARE(mat4.m12(), 21.0f);
QCOMPARE(mat4.m13(), 31.0f);
QCOMPARE(mat4.m14(), 41.0f);
QCOMPARE(mat4.m21(), 12.0f);
QCOMPARE(mat4.m22(), 22.0f);
QCOMPARE(mat4.m23(), 32.0f);
QCOMPARE(mat4.m24(), 42.0f);
QCOMPARE(mat4.m31(), 13.0f);
QCOMPARE(mat4.m32(), 23.0f);
QCOMPARE(mat4.m33(), 33.0f);
QCOMPARE(mat4.m34(), 43.0f);
QCOMPARE(mat4.m41(), 14.0f);
QCOMPARE(mat4.m42(), 24.0f);
QCOMPARE(mat4.m43(), 34.0f);
QCOMPARE(mat4.m44(), 44.0f);
}
void checkMultiplication()
{
{
// GIVEN
QMatrix4x4 mat1;
QMatrix4x4 mat2;
mat1.rotate(45.0f, QVector3D(1.0f, 0.0f, 0.0f));
mat2.translate(5.0f, 12.0f, 11.0f);
const Matrix4x4_AVX2 mat1fast(mat1);
const Matrix4x4_AVX2 mat2fast(mat2);
// WHEN
const Matrix4x4_AVX2 ret = mat1fast * mat2fast;
// THEN
QCOMPARE(ret.toQMatrix4x4(), mat1 * mat2);
}
{
// GIVEN
QMatrix4x4 mat1;
QMatrix4x4 mat2;
mat1.rotate(45.0f, QVector3D(1.0f, 0.0f, 0.0f));
mat2.translate(5.0f, 12.0f, 11.0f);
const Matrix4x4_AVX2 mat1fast(mat1);
const Matrix4x4_AVX2 mat2fast(mat2);
// WHEN
const Matrix4x4_AVX2 ret = mat2fast * mat1fast;
// THEN
QCOMPARE(ret.toQMatrix4x4(), mat2 * mat1);
}
}
void checkAddition()
{
{
// GIVEN
QMatrix4x4 mat1;
QMatrix4x4 mat2;
mat1.rotate(45.0f, QVector3D(1.0f, 0.0f, 0.0f));
mat2.translate(5.0f, 12.0f, 11.0f);
const Matrix4x4_AVX2 mat1fast(mat1);
const Matrix4x4_AVX2 mat2fast(mat2);
// WHEN
const Matrix4x4_AVX2 ret = mat1fast + mat2fast;
// THEN
QCOMPARE(ret.toQMatrix4x4(), mat1 + mat2);
}
{
// GIVEN
QMatrix4x4 mat1;
QMatrix4x4 mat2;
mat1.rotate(45.0f, QVector3D(1.0f, 0.0f, 0.0f));
mat2.translate(5.0f, 12.0f, 11.0f);
const Matrix4x4_AVX2 mat1fast(mat1);
const Matrix4x4_AVX2 mat2fast(mat2);
// WHEN
const Matrix4x4_AVX2 ret = mat2fast + mat1fast;
// THEN
QCOMPARE(ret.toQMatrix4x4(), mat2 + mat1);
}
}
void checkSubstraction()
{
{
// GIVEN
QMatrix4x4 mat1;
QMatrix4x4 mat2;
mat1.rotate(45.0f, QVector3D(1.0f, 0.0f, 0.0f));
mat2.translate(5.0f, 12.0f, 11.0f);
const Matrix4x4_AVX2 mat1fast(mat1);
const Matrix4x4_AVX2 mat2fast(mat2);
// WHEN
const Matrix4x4_AVX2 ret = mat1fast - mat2fast;
// THEN
QCOMPARE(ret.toQMatrix4x4(), mat1 - mat2);
}
{
// GIVEN
QMatrix4x4 mat1;
QMatrix4x4 mat2;
mat1.rotate(45.0f, QVector3D(1.0f, 0.0f, 0.0f));
mat2.translate(5.0f, 12.0f, 11.0f);
const Matrix4x4_AVX2 mat1fast(mat1);
const Matrix4x4_AVX2 mat2fast(mat2);
// WHEN
const Matrix4x4_AVX2 ret = mat2fast - mat1fast;
// THEN
QCOMPARE(ret.toQMatrix4x4(), mat2 - mat1);
}
}
void checkEquality()
{
{
// GIVEN
Matrix4x4_AVX2 c1;
Matrix4x4_AVX2 c2;
// THEN
QVERIFY(c1 == c2);
}
{
QMatrix4x4 tmp;
tmp.translate(5.0f, 8.0f, 14.0f);
// GIVEN
Matrix4x4_AVX2 c1(tmp);
Matrix4x4_AVX2 c2(tmp);
// THEN
QVERIFY(c1 == c2);
}
{
QMatrix4x4 tmp;
tmp.translate(5.0f, 8.0f, 14.0f);
// GIVEN
Matrix4x4_AVX2 c1;
Matrix4x4_AVX2 c2(tmp);
// THEN
QVERIFY(!(c1 == c2));
}
}
void checkInequality()
{
{
// GIVEN
Matrix4x4_AVX2 c1;
Matrix4x4_AVX2 c2;
// THEN
QVERIFY(!(c1 != c2));
}
{
// GIVEN
QMatrix4x4 tmp;
tmp.translate(5.0f, 8.0f, 14.0f);
Matrix4x4_AVX2 c1(tmp);
tmp.translate(3.0f, 9.0f, -4.0f);
Matrix4x4_AVX2 c2(tmp);
// THEN
QVERIFY(c1 != c2);
}
}
void checkMatrixVector4DMultiplication()
{
// GIVEN
QMatrix4x4 tmpMat;
QVector4D tmpVec4(1.0f, 2.0f, 3.0f, 4.0f);
tmpMat.translate(5.0f, 8.0f, 14.0f);
Matrix4x4_AVX2 mat(tmpMat);
Vector4D vec4(tmpVec4);
// WHEN
const Vector4D resultingVec = mat * vec4;
// THEN
QCOMPARE(resultingVec.toQVector4D(), tmpMat * tmpVec4);
}
void checkVector4DMatrixMultiplication()
{
// GIVEN
QMatrix4x4 tmpMat;
QVector4D tmpVec4(1.0f, 2.0f, 3.0f, 4.0f);
tmpMat.translate(5.0f, 8.0f, 14.0f);
Matrix4x4_AVX2 mat(tmpMat);
Vector4D vec4(tmpVec4);
// WHEN
const Vector4D resultingVec = vec4 * mat;
// THEN
QCOMPARE(resultingVec.toQVector4D(), tmpVec4 * tmpMat);
}
void checkMatrixVector3DMultiplication()
{
// GIVEN
QMatrix4x4 tmpMat;
QVector3D tmpVec3(1.0f, 2.0f, 3.0f);
tmpMat.translate(5.0f, 8.0f, 14.0f);
Matrix4x4_AVX2 mat(tmpMat);
Vector3D vec3(tmpVec3);
// WHEN
const Vector3D resultingVec = mat * vec3;
// THEN
QCOMPARE(resultingVec.toQVector3D(), tmpMat * tmpVec3);
}
void checkVector3DMatrixMultiplication()
{
// GIVEN
QMatrix4x4 tmpMat;
QVector3D tmpVec3(1.0f, 2.0f, 3.0f);
tmpMat.translate(5.0f, 8.0f, 14.0f);
Matrix4x4_AVX2 mat(tmpMat);
Vector3D vec3(tmpVec3);
// WHEN
const Vector3D resultingVec = vec3 * mat;
// THEN
QCOMPARE(resultingVec.toQVector3D(), tmpVec3 * tmpMat);
}
void checkRows()
{
// GIVEN
const Matrix4x4_AVX2 mat4(11.0f, 12.0f, 13.0f, 14.0f,
21.0f, 22.0f, 23.0f, 24.0f,
31.0f, 32.0f, 33.0f, 34.0f,
41.0f, 42.0f, 43.0f, 44.0f);
{
// WHEN
const Vector4D row = mat4.row(0);
// THEN
QCOMPARE(row.x(), 11.0f);
QCOMPARE(row.y(), 12.0f);
QCOMPARE(row.z(), 13.0f);
QCOMPARE(row.w(), 14.0f);
}
{
// WHEN
const Vector4D row = mat4.row(1);
// THEN
QCOMPARE(row.x(), 21.0f);
QCOMPARE(row.y(), 22.0f);
QCOMPARE(row.z(), 23.0f);
QCOMPARE(row.w(), 24.0f);
}
{
// WHEN
const Vector4D row = mat4.row(2);
// THEN
QCOMPARE(row.x(), 31.0f);
QCOMPARE(row.y(), 32.0f);
QCOMPARE(row.z(), 33.0f);
QCOMPARE(row.w(), 34.0f);
}
{
// WHEN
const Vector4D row = mat4.row(3);
// THEN
QCOMPARE(row.x(), 41.0f);
QCOMPARE(row.y(), 42.0f);
QCOMPARE(row.z(), 43.0f);
QCOMPARE(row.w(), 44.0f);
}
}
void checkColumns()
{
// GIVEN
const Matrix4x4_AVX2 mat4(11.0f, 12.0f, 13.0f, 14.0f,
21.0f, 22.0f, 23.0f, 24.0f,
31.0f, 32.0f, 33.0f, 34.0f,
41.0f, 42.0f, 43.0f, 44.0f);
{
// WHEN
const Vector4D row = mat4.column(0);
// THEN
QCOMPARE(row.x(), 11.0f);
QCOMPARE(row.y(), 21.0f);
QCOMPARE(row.z(), 31.0f);
QCOMPARE(row.w(), 41.0f);
}
{
// WHEN
const Vector4D row = mat4.column(1);
// THEN
QCOMPARE(row.x(), 12.0f);
QCOMPARE(row.y(), 22.0f);
QCOMPARE(row.z(), 32.0f);
QCOMPARE(row.w(), 42.0f);
}
{
// WHEN
const Vector4D row = mat4.column(2);
// THEN
QCOMPARE(row.x(), 13.0f);
QCOMPARE(row.y(), 23.0f);
QCOMPARE(row.z(), 33.0f);
QCOMPARE(row.w(), 43.0f);
}
{
// WHEN
const Vector4D row = mat4.column(3);
// THEN
QCOMPARE(row.x(), 14.0f);
QCOMPARE(row.y(), 24.0f);
QCOMPARE(row.z(), 34.0f);
QCOMPARE(row.w(), 44.0f);
}
}
void checkVectorMapVector()
{
{
// GIVEN
QMatrix4x4 tmpMat;
QVector3D tmpVec3(1.0f, 0.0f, 0.0f);
tmpMat.rotate(90.f, 0.f, 1.f, 0.f);
Matrix4x4_AVX2 mat(tmpMat);
Vector3D vec3(tmpVec3);
// WHEN
const Vector3D resultingVec = mat.mapVector(vec3);
// THEN
QCOMPARE(resultingVec.toQVector3D(), tmpMat.mapVector(tmpVec3));
}
{
// GIVEN
QMatrix4x4 tmpMat;
QVector3D tmpVec3(0.0f, 0.0f, -1.0f);
tmpMat.rotate(90.f, 0.f, 1.f, 0.f);
Matrix4x4_AVX2 mat(tmpMat);
Vector3D vec3(tmpVec3);
// WHEN
const Vector3D resultingVec = mat.mapVector(vec3);
// THEN
QCOMPARE(resultingVec.toQVector3D(), tmpMat.mapVector(tmpVec3));
}
{
// GIVEN
QMatrix4x4 tmpMat;
QVector3D tmpVec3(3.0f, -3.0f, -1.0f);
tmpMat.rotate(90.f, 0.33f, 0.33f, 0.33f);
Matrix4x4_AVX2 mat(tmpMat);
Vector3D vec3(tmpVec3);
// WHEN
const Vector3D resultingVec = mat.mapVector(vec3);
// THEN
QCOMPARE(resultingVec.toQVector3D(), tmpMat.mapVector(tmpVec3));
}
}
};
QTEST_MAIN(tst_Matrix4x4_AVX2)
#include "tst_matrix4x4_avx2.moc"

2
tests/auto/core/matrix4x4_sse/tst_matrix4x4_sse.cpp
View File

@ -11,6 +11,7 @@ class tst_Matrix4x4_SSE: public QObject
{ {
Q_OBJECT Q_OBJECT
#ifdef __SSE2__
private Q_SLOTS: private Q_SLOTS:
void defaultConstruction() void defaultConstruction()
@ -496,6 +497,7 @@ private Q_SLOTS:
QCOMPARE(resultingVec.toQVector3D(), tmpMat.mapVector(tmpVec3)); QCOMPARE(resultingVec.toQVector3D(), tmpMat.mapVector(tmpVec3));
} }
} }
#endif // __SSE2__
}; };
QTEST_MAIN(tst_Matrix4x4_SSE) QTEST_MAIN(tst_Matrix4x4_SSE)

2
tests/auto/core/vector3d_sse/tst_vector3d_sse.cpp
View File

@ -9,6 +9,7 @@ using namespace Qt3DCore;
class tst_Vector3D_SSE: public QObject class tst_Vector3D_SSE: public QObject
{ {
Q_OBJECT Q_OBJECT
#ifdef __SSE2__
private Q_SLOTS: private Q_SLOTS:
void defaultConstruction() void defaultConstruction()
{ {
@ -787,6 +788,7 @@ private Q_SLOTS:
QVERIFY(!v0.isNull()); QVERIFY(!v0.isNull());
} }
} }
#endif // __SSE2__
}; };
QTEST_APPLESS_MAIN(tst_Vector3D_SSE) QTEST_APPLESS_MAIN(tst_Vector3D_SSE)

2
tests/auto/core/vector4d_sse/tst_vector4d_sse.cpp
View File

@ -10,6 +10,7 @@ using namespace Qt3DCore;
class tst_Vector4D_SSE: public QObject class tst_Vector4D_SSE: public QObject
{ {
Q_OBJECT Q_OBJECT
#ifdef __SSE2__
private Q_SLOTS: private Q_SLOTS:
void defaultConstruction() void defaultConstruction()
{ {
@ -890,6 +891,7 @@ private Q_SLOTS:
QVERIFY(!v0.isNull()); QVERIFY(!v0.isNull());
} }
} }
#endif
}; };
QTEST_APPLESS_MAIN(tst_Vector4D_SSE) QTEST_APPLESS_MAIN(tst_Vector4D_SSE)

8
tests/auto/render/CMakeLists.txt
View File

@ -108,8 +108,6 @@ if(QT_FEATURE_private_tests)
add_subdirectory(uniform) add_subdirectory(uniform)
add_subdirectory(vsyncframeadvanceservice) add_subdirectory(vsyncframeadvanceservice)
add_subdirectory(waitfence) add_subdirectory(waitfence)
endif()
if(QT_FEATURE_private_tests AND NOT QT_FEATURE_qt3d_simd_avx2)
add_subdirectory(qray3d) add_subdirectory(qray3d)
add_subdirectory(raycasting) add_subdirectory(raycasting)
add_subdirectory(triangleboundingvolume) add_subdirectory(triangleboundingvolume)
@ -143,9 +141,7 @@ if(QT_FEATURE_private_tests AND QT_FEATURE_qt3d_input AND QT_FEATURE_qt3d_opengl
add_subdirectory(qscene2d) add_subdirectory(qscene2d)
add_subdirectory(scene2d) add_subdirectory(scene2d)
endif() endif()
if(QT_FEATURE_private_tests AND QT_FEATURE_qt3d_opengl_renderer AND QT_FEATURE_qt3d_simd_avx2) if(QT_FEATURE_private_tests AND NOT (CMAKE_OSX_ARCHITECTURES MATCHES ";") AND
add_subdirectory(alignedresourcesmanagers-avx) (TEST_architecture_arch STREQUAL i386 OR TEST_architecture_arch STREQUAL x86_64))
endif()
if(QT_FEATURE_private_tests AND QT_FEATURE_qt3d_opengl_renderer AND QT_FEATURE_qt3d_simd_sse2 AND NOT QT_FEATURE_qt3d_simd_avx2)
add_subdirectory(alignedresourcesmanagers-sse) add_subdirectory(alignedresourcesmanagers-sse)
endif() endif()

22
tests/auto/render/alignedresourcesmanagers-avx/CMakeLists.txt
View File

@ -1,22 +0,0 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from alignedresourcesmanagers-avx.pro.
#####################################################################
## tst_alignedresourcesmanagers-avx Test:
#####################################################################
qt_internal_add_test(tst_alignedresourcesmanagers-avx
SOURCES
tst_alignedresourcesmanagers-avx.cpp
LIBRARIES
Qt::3DCore
Qt::3DCorePrivate
Qt::3DRender
Qt::3DRenderPrivate
Qt::Gui
)
#### Keys ignored in scope 1:.:.:alignedresourcesmanagers-avx.pro:<TRUE>:
# TEMPLATE = "app"

9
tests/auto/render/alignedresourcesmanagers-avx/alignedresourcesmanagers-avx.pro
View File

@ -1,9 +0,0 @@
TARGET = tst_alignedresourcesmanagers-avx
CONFIG += testcase simd
TEMPLATE = app
SOURCES += tst_alignedresourcesmanagers-avx.cpp
QT += testlib 3dcore 3dcore-private 3drender 3drender-private
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_AVX2

98
tests/auto/render/alignedresourcesmanagers-avx/tst_alignedresourcesmanagers-avx.cpp
View File

@ -1,98 +0,0 @@
// Copyright (C) 2017 Paul Lemire <paul.lemire350@gmail.com>
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include <QtTest/QtTest>
#include <Qt3DCore/qnodeid.h>
#include <Qt3DCore/private/matrix4x4_avx2_p.h>
#include <Qt3DCore/private/qresourcemanager_p.h>
#include <Qt3DRender/private/cameralens_p.h>
using namespace Qt3DCore;
using HMatrix = Qt3DCore::QHandle<Matrix4x4_AVX2>;
using HCameraLens = Qt3DCore::QHandle<Qt3DRender::Render::CameraLens>;
class MatrixManager : public Qt3DCore::QResourceManager<
Matrix4x4_AVX2,
Qt3DCore::QNodeId,
Qt3DCore::NonLockingPolicy>
{
public:
MatrixManager() {}
};
class CameraLensManager : public Qt3DCore::QResourceManager<
Qt3DRender::Render::CameraLens,
Qt3DCore::QNodeId,
Qt3DCore::NonLockingPolicy>
{
public:
CameraLensManager() {}
};
class tst_AlignedResourcesManagersAVX: public QObject
{
Q_OBJECT
private Q_SLOTS:
void checkAllocationAndAlignmentMatrix4x4()
{
// GIVEN
MatrixManager manager;
// WHEN
for (uint i = 0; i < std::numeric_limits<ushort>::max(); ++i)
manager.getOrCreateResource(Qt3DCore::QNodeId::createId());
// THEN
// Shouldn't crash
const std::vector<HMatrix> &activeHandles = manager.activeHandles();
for (const HMatrix handle : activeHandles) {
// WHEN
Matrix4x4_AVX2 *mat = manager.data(handle);
// THEN
QCOMPARE(int((uintptr_t)mat % 32), 0);
}
// WHEN
for (uint i = 2; i < std::numeric_limits<ushort>::max(); ++i) {
Matrix4x4_AVX2 *mat1 = manager.data(activeHandles.at(i - 2));
Matrix4x4_AVX2 *mat2 = manager.data(activeHandles.at(i - 1));
Matrix4x4_AVX2 *mat3 = manager.data(activeHandles.at(i));
// WHEN
*mat3 = (*mat2 * *mat1);
// THEN
// Shouldn't crash
}
}
void checkAllocationAndAlignmentCameraLens()
{
// GIVEN
CameraLensManager manager;
// WHEN
for (uint i = 0; i < std::numeric_limits<ushort>::max(); ++i)
manager.getOrCreateResource(Qt3DCore::QNodeId::createId());
// THEN
// Shouldn't crash
const std::vector<HCameraLens> &activeHandles = manager.activeHandles();
for (const HCameraLens handle : activeHandles) {
// WHEN
Qt3DRender::Render::CameraLens *lens = manager.data(handle);
// THEN
QCOMPARE(int((uintptr_t)lens % 32), 0);
}
}
};
QTEST_MAIN(tst_AlignedResourcesManagersAVX)
#include "tst_alignedresourcesmanagers-avx.moc"

6
tests/auto/render/alignedresourcesmanagers-sse/tst_alignedresourcesmanagers-sse.cpp
View File

@ -35,6 +35,7 @@ class tst_AlignedResourcesManagersSSE: public QObject
{ {
Q_OBJECT Q_OBJECT
#ifdef __SSE2__
private Q_SLOTS: private Q_SLOTS:
void checkAllocationAndAlignmentMatrix4x4() void checkAllocationAndAlignmentMatrix4x4()
@ -88,9 +89,14 @@ private Q_SLOTS:
// WHEN // WHEN
Qt3DRender::Render::CameraLens *lens = manager.data(handle); Qt3DRender::Render::CameraLens *lens = manager.data(handle);
// THEN // THEN
# ifdef __AVX2__
QCOMPARE(int((uintptr_t)lens % 32), 0);
# else
QCOMPARE(int((uintptr_t)lens % 16), 0); QCOMPARE(int((uintptr_t)lens % 16), 0);
# endif
} }
} }
#endif // __SSE2__
}; };
QTEST_MAIN(tst_AlignedResourcesManagersSSE) QTEST_MAIN(tst_AlignedResourcesManagersSSE)