Allow selecting armv7 as target architecture in qmlcachegen

Change-Id: I36e8f95e83ea3de6553145efc762e3bc46f60071
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

5 files changed, 50 insertions, 10 deletions

diff --git a/src/qml/jit/qv4isel_masm.cpp b/src/qml/jit/qv4isel_masm.cpp
index 58fafc4cd5..b1134d2bec 100644
--- a/src/qml/jit/qv4isel_masm.cpp
+++ b/src/qml/jit/qv4isel_masm.cpp
@@ -1667,9 +1667,32 @@ namespace QV4 { namespace JIT {
 template class Q_QML_EXPORT InstructionSelection<>;
 template class Q_QML_EXPORT ISelFactory<>;
 #if defined(V4_BOOTSTRAP) && CPU(X86_64)
-using ARMv7CrossAssembler = QV4::JIT::Assembler<AssemblerTargetConfiguration<JSC::MacroAssemblerARMv7, NoOperatingSystemSpecialization>>;
-template class Q_QML_EXPORT InstructionSelection<ARMv7CrossAssembler>;
-template class Q_QML_EXPORT ISelFactory<ARMv7CrossAssembler>;
+
+Q_QML_EXPORT QV4::EvalISelFactory *createISelForArchitecture(const QString &architecture)
+{
+    using ARMv7CrossAssembler = QV4::JIT::Assembler<AssemblerTargetConfiguration<JSC::MacroAssemblerARMv7, NoOperatingSystemSpecialization>>;
+
+    if (architecture == QLatin1String("armv7"))
+        return new ISelFactory<ARMv7CrossAssembler>;
+
+    QString hostArch;
+#if CPU(ARM_THUMB2)
+    hostArch = QStringLiteral("armv7");
+#elif CPU(ARM64)
+    hostArch = QStringLiteral("armv8");
+#elif CPU(MIPS)
+    hostArch = QStringLiteral("mips");
+#elif CPU(X86)
+    hostArch = QStringLiteral("x86");
+#elif CPU(X86_64)
+    hostArch = QStringLiteral("x86_64");
+#endif
+    if (!hostArch.isEmpty() && architecture == hostArch)
+        return new ISelFactory<>;
+
+    return nullptr;
+}
+
 #endif
 } }
 QT_END_NAMESPACE
diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri
index 919524d1ed..955cf585e4 100644
--- a/src/qml/jsruntime/jsruntime.pri
+++ b/src/qml/jsruntime/jsruntime.pri
@@ -35,7 +35,6 @@ SOURCES += \
     $$PWD/qv4regexp.cpp \
     $$PWD/qv4serialize.cpp \
     $$PWD/qv4script.cpp \
-    $$PWD/qv4executableallocator.cpp \
     $$PWD/qv4sequenceobject.cpp \
     $$PWD/qv4include.cpp \
     $$PWD/qv4qobjectwrapper.cpp \
@@ -113,7 +112,8 @@ HEADERS += \
 SOURCES += \
     $$PWD/qv4runtime.cpp \
     $$PWD/qv4string.cpp \
-    $$PWD/qv4value.cpp
+    $$PWD/qv4value.cpp \
+    $$PWD/qv4executableallocator.cpp
 
 valgrind {
     DEFINES += V4_USE_VALGRIND
diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf
index f151218811..fed9f0d2f3 100644
--- a/tools/qmlcachegen/qmlcache.prf
+++ b/tools/qmlcachegen/qmlcache.prf
@@ -1,8 +1,11 @@
 qtPrepareTool(QML_CACHEGEN, qmlcachegen)
 
+!isEmpty(QT_TARGET_ARCH):QML_CACHEGEN_ARCH=$$QT_TARGET_ARCH
+else:QML_CACHEGEN_ARCH=$$QT_ARCH
+
 qmlcachegen.input = QML_FILES
 qmlcachegen.output = ${QMAKE_FILE_IN}c
-qmlcachegen.commands = $$QML_CACHEGEN ${QMAKE_FILE_IN}
+qmlcachegen.commands = $$QML_CACHEGEN --target-architecture=$$QML_CACHEGEN_ARCH ${QMAKE_FILE_IN}
 qmlcachegen.name = Generate QML Cache ${QMAKE_FILE_IN}
 qmlcachegen.variable_out = AUX_QML_FILES
 
diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp
index 21ff882c2f..4b902eda0f 100644
--- a/tools/qmlcachegen/qmlcachegen.cpp
+++ b/tools/qmlcachegen/qmlcachegen.cpp
@@ -39,6 +39,11 @@
 
 QT_BEGIN_NAMESPACE
 extern Q_CORE_EXPORT QBasicAtomicInt qt_qhash_seed;
+
+namespace QV4 { namespace JIT {
+Q_QML_EXPORT QV4::EvalISelFactory *createISelForArchitecture(const QString &architecture);
+} }
+
 QT_END_NAMESPACE
 
 struct Error
@@ -261,6 +266,9 @@ int main(int argc, char **argv)
     parser.addHelpOption();
     parser.addVersionOption();
 
+    QCommandLineOption targetArchitectureOption(QStringLiteral("target-architecture"), QCoreApplication::translate("main", "Target architecture"), QCoreApplication::translate("main", "architecture"));
+    parser.addOption(targetArchitectureOption);
+
     parser.addPositionalArgument(QStringLiteral("[qml file]"),
             QStringLiteral("QML source file to generate cache for."));
 
@@ -273,17 +281,23 @@ int main(int argc, char **argv)
     }
     const QString inputFile = sources.first();
 
-    QV4::Moth::ISelFactory interpreterISelFactory;
+    QScopedPointer<QV4::EvalISelFactory> isel;
+    const QString targetArchitecture = parser.value(targetArchitectureOption);
+
+    isel.reset(QV4::JIT::createISelForArchitecture(targetArchitecture));
+
+    if (!isel)
+        isel.reset(new QV4::Moth::ISelFactory);
 
     Error error;
 
     if (inputFile.endsWith(QLatin1String(".qml"))) {
-        if (!compileQmlFile(inputFile, &interpreterISelFactory, &error)) {
+        if (!compileQmlFile(inputFile, isel.data(), &error)) {
             error.augment(QLatin1String("Error compiling qml file: ")).print();
             return EXIT_FAILURE;
         }
     } else if (inputFile.endsWith(QLatin1String(".js"))) {
-        if (!compileJSFile(inputFile, &interpreterISelFactory, &error)) {
+        if (!compileJSFile(inputFile, isel.data(), &error)) {
             error.augment(QLatin1String("Error compiling qml file: ")).print();
             return EXIT_FAILURE;
         }
diff --git a/tools/qmlcachegen/qmlcachegen.pro b/tools/qmlcachegen/qmlcachegen.pro
index 48e08b0946..81783d0396 100644
--- a/tools/qmlcachegen/qmlcachegen.pro
+++ b/tools/qmlcachegen/qmlcachegen.pro
@@ -13,7 +13,7 @@ BUILD_INTEGRATION = qmlcache.prf
     qmake_integration.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
     qmake_integration.name = COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
     qmake_integration.CONFIG = no_clean no_link
-    !contains(TEMPLATE, vc.*): qmake_integration.variable_out = PRE_TARGETDEPS
+    !contains(TEMPLATE, vc.*): qmake_integration.variable_out = GENERATED_FILES
     QMAKE_EXTRA_COMPILERS += qmake_integration
 }