Skip to content

A
angle
Commit 8b4f6e6d by Jamie Madill
Options

infra: Add perf configs.

Adds Win/Linux/Android configs. Bug: angleproject:6090 Change-Id: Ie80a12a16997aab08e9dbba0cc0a9b14414fc8f2 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2988793Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent da17d561
Showing with 173 additions and 63 deletions
infra/config/generated/cr-buildbucket.cfg
...@@ -83,6 +83,23 @@ buckets { ...@@ -83,6 +83,23 @@ buckets {
} }
} }
builders { builders {
name: "android-perf"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "os:Ubuntu"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
cmd: "recipes"
}
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"angle\",\"platform\":\"android\",\"recipe\":\"angle\",\"test_mode\":\"compile_and_test\",\"toolchain\":\"clang\"}"
build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "linux-clang-dbg" name: "linux-clang-dbg"
swarming_host: "chromium-swarm.appspot.com" swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1" dimensions: "builderless:1"
...@@ -155,6 +172,24 @@ buckets { ...@@ -155,6 +172,24 @@ buckets {
} }
} }
builders { builders {
name: "linux-perf"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
dimensions: "os:Ubuntu"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
cmd: "recipes"
}
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"angle\",\"platform\":\"linux\",\"recipe\":\"angle\",\"test_mode\":\"compile_and_test\",\"toolchain\":\"clang\"}"
build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "linux-trace-rel" name: "linux-trace-rel"
swarming_host: "chromium-swarm.appspot.com" swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1" dimensions: "builderless:1"
...@@ -351,6 +386,24 @@ buckets { ...@@ -351,6 +386,24 @@ buckets {
} }
} }
builders { builders {
name: "win-perf"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
dimensions: "os:Windows"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
cmd: "recipes"
}
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"angle\",\"platform\":\"win\",\"recipe\":\"angle\",\"test_mode\":\"compile_and_test\",\"toolchain\":\"clang\"}"
build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "win-trace-rel" name: "win-trace-rel"
swarming_host: "chromium-swarm.appspot.com" swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1" dimensions: "builderless:1"
......
infra/config/generated/luci-milo.cfg
...@@ -51,11 +51,6 @@ consoles { ...@@ -51,11 +51,6 @@ consoles {
short_name: "rel" short_name: "rel"
} }
builders { builders {
name: "buildbucket/luci.angle.ci/linux-trace-rel"
category: "trace|linux|clang|x64"
short_name: "rel"
}
builders {
name: "buildbucket/luci.angle.ci/mac-dbg" name: "buildbucket/luci.angle.ci/mac-dbg"
category: "angle|mac|clang|x64" category: "angle|mac|clang|x64"
short_name: "dbg" short_name: "dbg"
...@@ -106,11 +101,6 @@ consoles { ...@@ -106,11 +101,6 @@ consoles {
short_name: "rel" short_name: "rel"
} }
builders { builders {
name: "buildbucket/luci.angle.ci/win-trace-rel"
category: "trace|win|clang|x64"
short_name: "rel"
}
builders {
name: "buildbucket/luci.angle.ci/winuwp-x64-dbg" name: "buildbucket/luci.angle.ci/winuwp-x64-dbg"
category: "angle|winuwp|msvc|x64" category: "angle|winuwp|msvc|x64"
short_name: "dbg" short_name: "dbg"
...@@ -120,6 +110,31 @@ consoles { ...@@ -120,6 +110,31 @@ consoles {
category: "angle|winuwp|msvc|x64" category: "angle|winuwp|msvc|x64"
short_name: "rel" short_name: "rel"
} }
builders {
name: "buildbucket/luci.angle.ci/linux-trace-rel"
category: "trace|linux|clang|x64"
short_name: "rel"
}
builders {
name: "buildbucket/luci.angle.ci/win-trace-rel"
category: "trace|win|clang|x64"
short_name: "rel"
}
builders {
name: "buildbucket/luci.angle.ci/android-perf"
category: "perf|android|clang|arm64"
short_name: "rel"
}
builders {
name: "buildbucket/luci.angle.ci/linux-perf"
category: "perf|linux|clang|x64"
short_name: "rel"
}
builders {
name: "buildbucket/luci.angle.ci/win-perf"
category: "perf|win|clang|x64"
short_name: "rel"
}
} }
consoles { consoles {
id: "try" id: "try"
...@@ -149,9 +164,6 @@ consoles { ...@@ -149,9 +164,6 @@ consoles {
name: "buildbucket/luci.angle.try/linux-gcc-rel" name: "buildbucket/luci.angle.try/linux-gcc-rel"
} }
builders { builders {
name: "buildbucket/luci.angle.try/linux-trace-rel"
}
builders {
name: "buildbucket/luci.angle.try/mac-dbg" name: "buildbucket/luci.angle.try/mac-dbg"
} }
builders { builders {
...@@ -182,15 +194,18 @@ consoles { ...@@ -182,15 +194,18 @@ consoles {
name: "buildbucket/luci.angle.try/win-msvc-x64-rel" name: "buildbucket/luci.angle.try/win-msvc-x64-rel"
} }
builders { builders {
name: "buildbucket/luci.angle.try/win-trace-rel"
}
builders {
name: "buildbucket/luci.angle.try/winuwp-x64-dbg" name: "buildbucket/luci.angle.try/winuwp-x64-dbg"
} }
builders { builders {
name: "buildbucket/luci.angle.try/winuwp-x64-rel" name: "buildbucket/luci.angle.try/winuwp-x64-rel"
} }
builders { builders {
name: "buildbucket/luci.angle.try/linux-trace-rel"
}
builders {
name: "buildbucket/luci.angle.try/win-trace-rel"
}
builders {
name: "buildbucket/luci.angle.try/presubmit" name: "buildbucket/luci.angle.try/presubmit"
} }
builder_view_only: true builder_view_only: true
......
infra/config/generated/luci-scheduler.cfg
...@@ -45,6 +45,16 @@ job { ...@@ -45,6 +45,16 @@ job {
} }
} }
job { job {
id: "android-perf"
realm: "ci"
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "luci.angle.ci"
builder: "android-perf"
}
}
job {
id: "linux-clang-dbg" id: "linux-clang-dbg"
realm: "ci" realm: "ci"
acl_sets: "ci" acl_sets: "ci"
...@@ -85,6 +95,16 @@ job { ...@@ -85,6 +95,16 @@ job {
} }
} }
job { job {
id: "linux-perf"
realm: "ci"
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "luci.angle.ci"
builder: "linux-perf"
}
}
job {
id: "linux-trace-rel" id: "linux-trace-rel"
realm: "ci" realm: "ci"
acl_sets: "ci" acl_sets: "ci"
...@@ -195,6 +215,16 @@ job { ...@@ -195,6 +215,16 @@ job {
} }
} }
job { job {
id: "win-perf"
realm: "ci"
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "luci.angle.ci"
builder: "win-perf"
}
}
job {
id: "win-trace-rel" id: "win-trace-rel"
realm: "ci" realm: "ci"
acl_sets: "ci" acl_sets: "ci"
...@@ -233,10 +263,12 @@ trigger { ...@@ -233,10 +263,12 @@ trigger {
triggers: "android-arm-rel" triggers: "android-arm-rel"
triggers: "android-arm64-dbg" triggers: "android-arm64-dbg"
triggers: "android-arm64-rel" triggers: "android-arm64-rel"
triggers: "android-perf"
triggers: "linux-clang-dbg" triggers: "linux-clang-dbg"
triggers: "linux-clang-rel" triggers: "linux-clang-rel"
triggers: "linux-gcc-dbg" triggers: "linux-gcc-dbg"
triggers: "linux-gcc-rel" triggers: "linux-gcc-rel"
triggers: "linux-perf"
triggers: "linux-trace-rel" triggers: "linux-trace-rel"
triggers: "mac-dbg" triggers: "mac-dbg"
triggers: "mac-rel" triggers: "mac-rel"
...@@ -248,6 +280,7 @@ trigger { ...@@ -248,6 +280,7 @@ trigger {
triggers: "win-msvc-x64-rel" triggers: "win-msvc-x64-rel"
triggers: "win-msvc-x86-dbg" triggers: "win-msvc-x86-dbg"
triggers: "win-msvc-x86-rel" triggers: "win-msvc-x86-rel"
triggers: "win-perf"
triggers: "win-trace-rel" triggers: "win-trace-rel"
triggers: "winuwp-x64-dbg" triggers: "winuwp-x64-dbg"
triggers: "winuwp-x64-rel" triggers: "winuwp-x64-rel"
......
infra/config/main.star
...@@ -188,7 +188,7 @@ def get_os_from_name(name): ...@@ -188,7 +188,7 @@ def get_os_from_name(name):
return os.MAC return os.MAC
# Adds both the CI and Try standalone builders. # Adds both the CI and Try standalone builders.
def angle_standalone_builder(name, debug, cpu, toolchain = "clang", uwp = False, trace_tests = False): def angle_builder(name, debug, cpu, toolchain = "clang", uwp = False, test_mode = "compile_and_test"):
properties = { properties = {
"builder_group": "angle", "builder_group": "angle",
} }
...@@ -210,14 +210,12 @@ def angle_standalone_builder(name, debug, cpu, toolchain = "clang", uwp = False, ...@@ -210,14 +210,12 @@ def angle_standalone_builder(name, debug, cpu, toolchain = "clang", uwp = False,
properties["platform"] = config_os.console_name properties["platform"] = config_os.console_name
properties["toolchain"] = toolchain properties["toolchain"] = toolchain
if trace_tests: if toolchain == "gcc":
properties["test_mode"] = "trace_tests"
elif toolchain == "gcc":
properties["test_mode"] = "checkout_only" properties["test_mode"] = "checkout_only"
elif debug or toolchain == "msvc" or (config_os.category == os_category.ANDROID and cpu == "arm"): elif debug or toolchain == "msvc" or (config_os.category == os_category.ANDROID and cpu == "arm"):
properties["test_mode"] = "compile_only" properties["test_mode"] = "compile_only"
else: else:
properties["test_mode"] = "compile_and_test" properties["test_mode"] = test_mode
luci.builder( luci.builder(
name = name, name = name,
...@@ -230,23 +228,17 @@ def angle_standalone_builder(name, debug, cpu, toolchain = "clang", uwp = False, ...@@ -230,23 +228,17 @@ def angle_standalone_builder(name, debug, cpu, toolchain = "clang", uwp = False,
build_numbers = True, build_numbers = True,
) )
luci.builder( is_perf = "-perf" in name
name = name,
bucket = "try",
executable = "recipe:angle",
service_account = "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com",
properties = properties,
dimensions = dimensions,
build_numbers = True,
)
# Trace tests are only included automatically if files in the capture folder change. # Trace tests are only included automatically if files in the capture folder change.
if trace_tests: if test_mode == "trace_tests":
config = "trace" config = "trace"
location_regexp = [ location_regexp = [
".+/[+]/src/libANGLE/capture/.+", ".+/[+]/src/libANGLE/capture/.+",
".+/[+]/src/tests/capture.+", ".+/[+]/src/tests/capture.+",
] ]
elif is_perf:
config = "perf"
else: else:
config = "angle" config = "angle"
location_regexp = None location_regexp = None
...@@ -265,19 +257,31 @@ def angle_standalone_builder(name, debug, cpu, toolchain = "clang", uwp = False, ...@@ -265,19 +257,31 @@ def angle_standalone_builder(name, debug, cpu, toolchain = "clang", uwp = False,
short_name = short_name, short_name = short_name,
) )
luci.list_view_entry( # Do not include perf tests in "try".
list_view = "try", if not is_perf:
builder = "try/" + name, luci.list_view_entry(
) list_view = "try",
builder = "try/" + name,
)
# Include all bots in the CQ by default except GCC and Android configs. luci.builder(
if toolchain != "gcc": name = name,
luci.cq_tryjob_verifier( bucket = "try",
cq_group = "master", executable = "recipe:angle",
builder = "angle:try/" + name, service_account = "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com",
location_regexp = location_regexp, properties = properties,
dimensions = dimensions,
build_numbers = True,
) )
# Include all other bots in the CQ by default except the placeholder GCC configs.
if toolchain != "gcc":
luci.cq_tryjob_verifier(
cq_group = "master",
builder = "angle:try/" + name,
location_regexp = location_regexp,
)
luci.bucket( luci.bucket(
name = "ci", name = "ci",
acls = [ acls = [
...@@ -329,28 +333,33 @@ luci.gitiles_poller( ...@@ -329,28 +333,33 @@ luci.gitiles_poller(
) )
# name, clang, debug, cpu, uwp, trace_tests # name, clang, debug, cpu, uwp, trace_tests
angle_standalone_builder("android-arm-dbg", debug = True, cpu = "arm") angle_builder("android-arm-dbg", debug = True, cpu = "arm")
angle_standalone_builder("android-arm-rel", debug = False, cpu = "arm") angle_builder("android-arm-rel", debug = False, cpu = "arm")
angle_standalone_builder("android-arm64-dbg", debug = True, cpu = "arm64") angle_builder("android-arm64-dbg", debug = True, cpu = "arm64")
angle_standalone_builder("android-arm64-rel", debug = False, cpu = "arm64") angle_builder("android-arm64-rel", debug = False, cpu = "arm64")
angle_standalone_builder("linux-clang-dbg", debug = True, cpu = "x64") angle_builder("linux-clang-dbg", debug = True, cpu = "x64")
angle_standalone_builder("linux-clang-rel", debug = False, cpu = "x64") angle_builder("linux-clang-rel", debug = False, cpu = "x64")
angle_standalone_builder("linux-gcc-dbg", debug = True, cpu = "x64", toolchain = "gcc") angle_builder("linux-gcc-dbg", debug = True, cpu = "x64", toolchain = "gcc")
angle_standalone_builder("linux-gcc-rel", debug = False, cpu = "x64", toolchain = "gcc") angle_builder("linux-gcc-rel", debug = False, cpu = "x64", toolchain = "gcc")
angle_standalone_builder("linux-trace-rel", debug = False, cpu = "x64", trace_tests = True) angle_builder("mac-dbg", debug = True, cpu = "x64")
angle_standalone_builder("mac-dbg", debug = True, cpu = "x64") angle_builder("mac-rel", debug = False, cpu = "x64")
angle_standalone_builder("mac-rel", debug = False, cpu = "x64") angle_builder("win-clang-x86-dbg", debug = True, cpu = "x86")
angle_standalone_builder("win-clang-x86-dbg", debug = True, cpu = "x86") angle_builder("win-clang-x86-rel", debug = False, cpu = "x86")
angle_standalone_builder("win-clang-x86-rel", debug = False, cpu = "x86") angle_builder("win-clang-x64-dbg", debug = True, cpu = "x64")
angle_standalone_builder("win-clang-x64-dbg", debug = True, cpu = "x64") angle_builder("win-clang-x64-rel", debug = False, cpu = "x64")
angle_standalone_builder("win-clang-x64-rel", debug = False, cpu = "x64") angle_builder("win-msvc-x86-dbg", debug = True, cpu = "x86", toolchain = "msvc")
angle_standalone_builder("win-msvc-x86-dbg", debug = True, cpu = "x86", toolchain = "msvc") angle_builder("win-msvc-x86-rel", debug = False, cpu = "x86", toolchain = "msvc")
angle_standalone_builder("win-msvc-x86-rel", debug = False, cpu = "x86", toolchain = "msvc") angle_builder("win-msvc-x64-dbg", debug = True, cpu = "x64", toolchain = "msvc")
angle_standalone_builder("win-msvc-x64-dbg", debug = True, cpu = "x64", toolchain = "msvc") angle_builder("win-msvc-x64-rel", debug = False, cpu = "x64", toolchain = "msvc")
angle_standalone_builder("win-msvc-x64-rel", debug = False, cpu = "x64", toolchain = "msvc") angle_builder("winuwp-x64-dbg", debug = True, cpu = "x64", toolchain = "msvc", uwp = True)
angle_standalone_builder("win-trace-rel", debug = False, cpu = "x64", trace_tests = True) angle_builder("winuwp-x64-rel", debug = False, cpu = "x64", toolchain = "msvc", uwp = True)
angle_standalone_builder("winuwp-x64-dbg", debug = True, cpu = "x64", toolchain = "msvc", uwp = True)
angle_standalone_builder("winuwp-x64-rel", debug = False, cpu = "x64", toolchain = "msvc", uwp = True) angle_builder("linux-trace-rel", debug = False, cpu = "x64", test_mode = "trace_tests")
angle_builder("win-trace-rel", debug = False, cpu = "x64", test_mode = "trace_tests")
angle_builder("android-perf", debug = False, cpu = "arm64")
angle_builder("linux-perf", debug = False, cpu = "x64")
angle_builder("win-perf", debug = False, cpu = "x64")
# Views # Views
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment