whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make QT_CPU_FEATURES a map of features based on architecture 

For now there's only one architecture per host/target, but
this will change once we start detecting the CPU features
for both device and simulator on iOS.

For convenience we set QT_CPU_FEATURES to the resolved
value of the current architecture, so that simd.prf still
can use QT_CPU_FEATURES directly.

Change-Id: I28e8b339a5c30a630e276165254dba09a3da6940
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
bb10
Tor Arne Vestbø 2013-04-10 17:43:51 +02:00 committed by The Qt Project
parent 5f9d58848a
commit 78f3c1fb8e
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -6501,9 +6501,9 @@ fi
cat >>"$QTMODULE.tmp" <<EOF
host_build {
QT_CPU_FEATURES = $CFG_HOST_CPUFEATURES
QT_CPU_FEATURES.$CFG_HOST_ARCH = $CFG_HOST_CPUFEATURES
} else {
QT_CPU_FEATURES = $CFG_CPUFEATURES
QT_CPU_FEATURES.$CFG_ARCH = $CFG_CPUFEATURES
}
EOF

3
mkspecs/features/simd.prf
View File

@ -12,6 +12,9 @@
# Get the SIMD flags
load(qt_build_config)
# Set QT_CPU_FEATURES for convenience
QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH)
#
# Set up compilers for SIMD (SSE/AVX, NEON etc)
#

6
tools/configure/configureapp.cpp
View File

@ -2872,9 +2872,11 @@ void Configure::generateCachefile()
moduleStream << endl;
moduleStream << "host_build {" << endl;
moduleStream << " QT_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl;
moduleStream << " QT_CPU_FEATURES." << dictionary["QT_HOST_ARCH"] <<
" = " << dictionary["QT_HOST_CPU_FEATURES"] << endl;
moduleStream << "} else {" << endl;
moduleStream << " QT_CPU_FEATURES = " << dictionary["QT_CPU_FEATURES"] << endl;
moduleStream << " QT_CPU_FEATURES." << dictionary["QT_ARCH"] <<
" = " << dictionary["QT_CPU_FEATURES"] << endl;
moduleStream << "}" << endl;
if (dictionary["QT_EDITION"] != "QT_EDITION_OPENSOURCE")