[infra] Add configurations to rename AOT NNBD.

Change-Id: I56044e0fcfdb4623595971354a01164d8ae708e6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/286360
Reviewed-by: Alexander Thomas <athom@google.com>
This commit is contained in:
Ryan Macnak 2023-04-02 08:34:23 +00:00 committed by Alexander Thomas
parent 30a8b2ee4b
commit fdabbc9d10
3 changed files with 93 additions and 3 deletions

View file

@ -683,6 +683,7 @@ class Architecture extends NamedEnum {
static const arm64 = Architecture._('arm64');
static const arm64c = Architecture._('arm64c');
static const simarm = Architecture._('simarm');
static const simarm_x64 = Architecture._('simarm_x64');
static const simarm64 = Architecture._('simarm64');
static const simarm64c = Architecture._('simarm64c');
static const riscv32 = Architecture._('riscv32');
@ -703,6 +704,7 @@ class Architecture extends NamedEnum {
arm64,
arm64c,
simarm,
simarm_x64,
simarm64,
simarm64c,
riscv32,

View file

@ -108,7 +108,13 @@ abstract class RuntimeConfiguration {
var dartExecutable = _configuration.dartPrecompiledPath;
if (dartExecutable == null || dartExecutable == '') {
dartExecutable = '$buildDir/dart_precompiled_runtime$executableExtension';
var dir = buildDir;
// gen_snapshot can run with different word sizes, but the simulators
// cannot.
dir = dir.replaceAll("SIMARM_X64", "SIMARM");
dartExecutable = '$dir/dart_precompiled_runtime$executableExtension';
}
TestUtils.ensureExists(dartExecutable, _configuration);

View file

@ -382,7 +382,7 @@
"use-elf": true
}
},
"vm-aot-(linux|mac|win)-(debug|product|release)-(simarm|simarm64|simriscv32|simriscv64)": {
"vm-aot-(linux|mac|win)-(debug|product|release)-(simarm|simarm_x64|simarm64|simriscv32|simriscv64)": {
"options": {
"nnbd": "strong",
"use-elf": true
@ -1442,10 +1442,16 @@
},
{
"builders": [
"vm-aot-linux-debug-simriscv64",
"vm-aot-linux-debug-x64",
"vm-aot-linux-debug-x64c",
"vm-aot-linux-product-x64",
"vm-aot-linux-release-simarm64",
"vm-aot-linux-release-x64",
"vm-aot-mac-release-simarm64",
"vm-aot-win-debug-x64c",
"vm-aot-win-product-x64"
"vm-aot-win-product-x64",
"vm-aot-win-release-x64"
],
"meta": {
"description": "This configuration is used by the VM AOT builders."
@ -1466,6 +1472,82 @@
],
"fileset": "vm-kernel",
"shards": 10
},
{
"name": "co19 tests",
"arguments": [
"-nvm-aot-${system}-${mode}-${arch}",
"co19"
],
"fileset": "vm-kernel",
"shards": 10
}
]
},
{
"builders": [
"vm-aot-linux-debug-simarm_x64",
"vm-aot-linux-release-simarm_x64"
],
"meta": {
"description": "This configuration is used by the VM AOT builders."
},
"steps": [
{
"name": "build dart for simarm_x64",
"script": "tools/build.py",
"arguments": [
"gen_snapshot",
"vm_platform"
]
},
{
"name": "build dart for simarm",
"script": "tools/build.py",
"arguments": [
"--arch=simarm",
"dart_precompiled_runtime"
]
},
{
"name": "vm tests",
"arguments": [
"-nvm-aot-${system}-${mode}-${arch}"
],
"fileset": "vm-kernel",
"shards": 10
}
]
},
{
"builders": [
"vm-aot-mac-release-arm64"
],
"meta": {
"description": "This configuration is used by the VM AOT builders. Without shards because shards are missing XCode."
},
"steps": [
{
"name": "build dart",
"script": "tools/build.py",
"arguments": [
"runtime",
"dart_precompiled_runtime"
]
},
{
"name": "build dart (cross x64)",
"script": "tools/build.py",
"arguments": [
"--arch=simx64",
"gen_snapshot"
]
},
{
"name": "vm tests",
"arguments": [
"-nvm-aot-${system}-${mode}-${arch}"
]
}
]
},