[vm] Test AOT on Android with the 64->32 bit cross-compiler.

We introduce a new architecture ARM_X64, which is the same as ARM except that
the host-targeting-host binaries are compiled for X64 instead of X86.

Issue #38709

Change-Id: I00a2b1cc71948adec9f66c7b2ee61e9e5ac53d2a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/120121
Commit-Queue: Samir Jindel <[email protected]>
Reviewed-by: Martin Kustermann <[email protected]>

Author: sjindel-google

pkg/smith/lib/configuration.dart

@@ -551,6 +551,7 @@ class Architecture extends NamedEnum {
   static const ia32 = Architecture._('ia32');
   static const x64 = Architecture._('x64');
   static const arm = Architecture._('arm');
+  static const arm_x64 = Architecture._('arm_x64');
   static const armv6 = Architecture._('armv6');
   static const armv5te = Architecture._('armv5te');
   static const arm64 = Architecture._('arm64');
@@ -569,6 +570,7 @@ class Architecture extends NamedEnum {
     arm,
     armv6,
     armv5te,
+    arm_x64,
     arm64,
     simarm,
     simarmv6,

pkg/test_runner/lib/src/compiler_configuration.dart

@@ -588,6 +588,8 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration
 
   bool get _isSimArm => _configuration.architecture == Architecture.simarm;
 
+  bool get _isArmX64 => _configuration.architecture == Architecture.arm_x64;
+
   bool get _isArm64 => _configuration.architecture == Architecture.arm64;
 
   bool get _isX64 => _configuration.architecture == Architecture.x64;
@@ -674,7 +676,7 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration
       if (_isAndroid) {
         if (_isArm || _isIA32) {
           exec = "$buildDir/clang_x86/gen_snapshot";
-        } else if (_isArm64 || _isX64) {
+        } else if (_isArm64 || _isX64 || _isArmX64) {
           exec = "$buildDir/clang_x64/gen_snapshot";
         } else {
           // Guaranteed by package:test_runner/src/configuration.dart's
@@ -710,7 +712,7 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration
   }
 
   static const String ndkPath = "third_party/android_tools/ndk";
-  String get abiTriple => _isArm
+  String get abiTriple => _isArm || _isArmX64
       ? "arm-linux-androideabi"
       : _isArm64 ? "aarch64-linux-android" : null;
   String get host =>

pkg/test_runner/lib/src/configuration.dart

@@ -408,9 +408,10 @@ class TestConfiguration {
         !(architecture == Architecture.ia32 ||
             architecture == Architecture.x64 ||
             architecture == Architecture.arm ||
+            architecture == Architecture.arm_x64 ||
             architecture == Architecture.arm64)) {
       print("Warning: Android only supports the following "
-          "architectures: ia32/x64/arm/arm64.");
+          "architectures: ia32/x64/arm/arm64/arm_x64.");
       isValid = false;
     }
 

pkg/test_runner/lib/src/feature.dart

@@ -5,7 +5,7 @@
 /// A capability that a Dart implementation may or may not provide that a test
 /// may require.
 ///
-/// Each [TestConfiguration] specifies the set of features it supports. A test
+/// Each `TestConfiguration` specifies the set of features it supports. A test
 /// can have a "// Requirements" comment indicating the names of features it
 /// requires. If a test requires a feature not supported by the current
 /// configution, the test runner automatically skips it.

pkg/test_runner/lib/src/options.dart

@@ -144,7 +144,7 @@ all
 ia32, x64
 arm, armv6, armv5te, arm64,
 simarm, simarmv6, simarmv5te, simarm64,
-simdbc, simdbc64''',
+simdbc, simdbc64, arm_x64''',
         abbr: 'a',
         values: ['all']..addAll(Architecture.names),
         defaultsTo: Architecture.x64.name,

pkg/test_runner/lib/src/runtime_configuration.dart

@@ -229,6 +229,7 @@ class DartVmRuntimeConfiguration extends RuntimeConfiguration {
     switch (arch) {
       case Architecture.simarm:
       case Architecture.arm:
+      case Architecture.arm_x64:
       case Architecture.arm64:
       case Architecture.simarmv6:
       case Architecture.armv6:

tools/bots/test_matrix.json

@@ -167,6 +167,7 @@
       "out/DebugSIMARM_X64/",
       "out/DebugSIMDBC64/",
       "out/DebugAndroidARM/",
+      "out/DebugAndroidARM_X64/",
       "out/DebugAndroidARM64/",
       "out/ReleaseIA32/",
       "out/ReleaseX64/",
@@ -175,6 +176,7 @@
       "out/ReleaseSIMARM_X64/",
       "out/ReleaseSIMDBC64/",
       "out/ReleaseAndroidARM/",
+      "out/ReleaseAndroidARM_X64/",
       "out/ReleaseAndroidARM64/",
       "out/ReleaseXARM64/",
       "out/ProductIA32/",
@@ -339,7 +341,7 @@
         "minified": true,
         "use-sdk": true
     }},
-    "dartkp-android-(debug|product|release)-(arm|arm64)": {
+    "dartkp-android-(debug|product|release)-(arm|arm64|arm_x64)": {
       "options": {
         "use-elf": true
     }},
@@ -600,6 +602,7 @@
     {
       "builders": [
         "vm-kernel-precomp-android-release-arm",
+        "vm-kernel-precomp-android-release-arm_x64",
         "vm-kernel-precomp-android-release-arm64"
       ],
       "meta": {

tools/build.py

@@ -17,7 +17,7 @@
 SCRIPT_DIR = os.path.dirname(sys.argv[0])
 DART_ROOT = os.path.realpath(os.path.join(SCRIPT_DIR, '..'))
 AVAILABLE_ARCHS = [
-    'ia32', 'x64', 'simarm', 'arm', 'simarmv6', 'armv6', 'simarmv5te',
+    'ia32', 'x64', 'simarm', 'arm', 'arm_x64', 'simarmv6', 'armv6', 'simarmv5te',
     'armv5te', 'simarm64', 'arm64', 'simdbc', 'simdbc64', 'armsimdbc',
     'armsimdbc64', 'simarm_x64'
 ]
@@ -117,7 +117,7 @@ def ProcessOptions(options, args):
                       % (os_name, HOST_OS))
                 return False
             if not arch in [
-                    'ia32', 'x64', 'arm', 'armv6', 'armv5te', 'arm64', 'simdbc',
+                    'ia32', 'x64', 'arm', 'arm_x64', 'armv6', 'armv5te', 'arm64', 'simdbc',
                     'simdbc64'
             ]:
                 print(

tools/gn.py

@@ -89,7 +89,9 @@ def HostCpuForArch(arch):
             'simarmv5te', 'simdbc', 'armsimdbc', 'simarm_x64'
     ]:
         return 'x86'
-    if arch in ['x64', 'arm64', 'simarm64', 'simdbc64', 'armsimdbc64']:
+    if arch in [
+            'x64', 'arm64', 'simarm64', 'simdbc64', 'armsimdbc64', 'arm_x64'
+    ]:
         return 'x64'
 
 
@@ -103,6 +105,8 @@ def TargetCpuForArch(arch, target_os):
         return 'arm' if target_os == 'android' else 'x86'
     if arch in ['simdbc64']:
         return 'arm64' if target_os == 'android' else 'x64'
+    if arch == 'arm_x64':
+        return 'arm'
     if arch == 'armsimdbc':
         return 'arm'
     if arch == 'armsimdbc64':
@@ -116,7 +120,7 @@ def DartTargetCpuForArch(arch):
         return 'ia32'
     if arch in ['x64']:
         return 'x64'
-    if arch in ['arm', 'simarm', 'simarm_x64']:
+    if arch in ['arm', 'simarm', 'simarm_x64', 'arm_x64']:
         return 'arm'
     if arch in ['armv6', 'simarmv6']:
         return 'armv6'
@@ -313,7 +317,7 @@ def ProcessOptions(args):
             return False
     for arch in args.arch:
         archs = [
-            'ia32', 'x64', 'simarm', 'arm', 'simarmv6', 'armv6', 'simarmv5te',
+            'ia32', 'x64', 'simarm', 'arm', 'arm_x64', 'simarmv6', 'armv6', 'simarmv5te',
             'armv5te', 'simarm64', 'arm64', 'simdbc', 'simdbc64', 'armsimdbc',
             'armsimdbc64', 'simarm_x64'
         ]
@@ -334,7 +338,7 @@ def ProcessOptions(args):
                       % (os_name, HOST_OS))
                 return False
             if not arch in [
-                    'ia32', 'x64', 'arm', 'armv6', 'armv5te', 'arm64', 'simdbc',
+                    'ia32', 'x64', 'arm', 'arm_x64', 'armv6', 'armv5te', 'arm64', 'simdbc',
                     'simdbc64'
             ]:
                 print(
@@ -373,7 +377,7 @@ def parse_args(args):
         '-a',
         type=str,
         help='Target architectures (comma-separated).',
-        metavar='[all,ia32,x64,simarm,arm,simarmv6,armv6,simarmv5te,armv5te,'
+        metavar='[all,ia32,x64,simarm,arm,arm_x64,simarmv6,armv6,simarmv5te,armv5te,'
         'simarm64,arm64,simdbc,armsimdbc,simarm_x64]',
         default='x64')
     common_group.add_argument(