languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-16 01:59:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[infra] Further teach test harness about new compressed architectures.

Browse source 
Change-Id: Ibfcad1997c79b1839b1842a1b7f7b14b328c3599
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/183720
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
This commit is contained in:
Ryan Macnak 2021-02-09 17:55:27 +00:00 committed by commit-bot@chromium.org
parent cb06d6c86a
commit f40113cda5
4 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkg/test_runner/lib/src/compiler_configuration.dart
View file

@ -100,6 +100,7 @@ abstract class CompilerConfiguration {
case Compiler.dartk:
if (configuration.architecture == Architecture.simarm ||
configuration.architecture == Architecture.simarm64 ||
configuration.architecture == Architecture.simarm64c ||
configuration.system == System.android) {
return VMKernelCompilerConfiguration(configuration);
}
@ -690,13 +691,19 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration
bool get _isSimArm => _configuration.architecture == Architecture.simarm;
bool get _isSimArm64 => _configuration.architecture == Architecture.simarm64;
bool get _isSimArm64 =>
_configuration.architecture == Architecture.simarm64 ||
_configuration.architecture == Architecture.simarm64c;
bool get _isArmX64 => _configuration.architecture == Architecture.arm_x64;
bool get _isArm64 => _configuration.architecture == Architecture.arm64;
bool get _isArm64 =>
_configuration.architecture == Architecture.arm64 ||
_configuration.architecture == Architecture.arm64c;
bool get _isX64 => _configuration.architecture == Architecture.x64;
bool get _isX64 =>
_configuration.architecture == Architecture.x64 ||
_configuration.architecture == Architecture.x64c;
bool get _isIA32 => _configuration.architecture == Architecture.ia32;
@ -864,14 +871,17 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration
String ccFlags;
switch (_configuration.architecture) {
case Architecture.x64:
case Architecture.x64c:
ccFlags = "-m64";
break;
case Architecture.simarm64:
case Architecture.simarm64c:
case Architecture.ia32:
case Architecture.simarm:
case Architecture.arm:
case Architecture.arm_x64:
case Architecture.arm64:
case Architecture.arm64c:
ccFlags = null;
break;
default:

2
pkg/test_runner/lib/src/runtime_configuration.dart
View file

@ -244,9 +244,11 @@ class DartVmRuntimeConfiguration extends RuntimeConfiguration {
case Architecture.arm:
case Architecture.arm_x64:
case Architecture.arm64:
case Architecture.arm64c:
case Architecture.simarmv6:
case Architecture.armv6:
case Architecture.simarm64:
case Architecture.simarm64c:
multiplier *= 4;
break;
}

3
pkg/test_runner/lib/src/test_suite.dart
View file

@ -309,7 +309,8 @@ class VMTestSuite extends TestSuite {
hasRuntimeError: testExpectation == Expectation.runtimeError,
hasStaticWarning: false,
hasCrash: testExpectation == Expectation.crash);
var filename = configuration.architecture == Architecture.x64
var filename = configuration.architecture == Architecture.x64 ||
configuration.architecture == Architecture.x64c
? '$buildDir/gen/kernel-service.dart.snapshot'
: '$buildDir/gen/kernel_service.dill';
var dfePath = Path(filename).absolute.toNativePath();

6
tools/bots/test_matrix.json
View file

@ -1407,7 +1407,9 @@
{
"builders": [
"vm-kernel-precomp-linux-debug-x64",
"vm-kernel-precomp-linux-debug-x64c"
"vm-kernel-precomp-linux-debug-x64c",
"vm-kernel-precomp-linux-debug-simarm64",
"vm-kernel-precomp-linux-debug-simarm64c"
],
"meta": {
"description": "This configuration is used by the vm kernel precomp debug builders. It uses 15 shards for testing to avoid 1 hour shard timeouts."
@ -1624,6 +1626,8 @@
},
{
"builders": [
"vm-kernel-linux-debug-simarm64",
"vm-kernel-linux-debug-simarm64c",
"vm-kernel-linux-release-simarm",
"vm-kernel-linux-release-simarm64",
"vm-kernel-linux-release-simarm64c",