Skip to content
This repository has been archived by the owner on Jun 19, 2024. It is now read-only.

Commit

Permalink
pbot: remove binary configurations (they produce too much data and we…
Browse files Browse the repository at this point in the history 
… don't use it). same for valgrind flavors
  • Loading branch information
@lewurm
lewurm committed Jun 8, 2017
1 parent ffa1420 commit 6db3e12
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 42 deletions.
17 changes: 17 additions & 0 deletions configs/auto-sgen-aotjit-conc.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"Name": "auto-sgen-aotjit-conc",
"Count": 10,
"Mono": "$ROOT/bin/mono-sgen",
"AOTOptions": [
"-O=gsharedvt",
"--aot"
],
"MonoOptions": [
"-O=aot"
],
"MonoEnvironmentVariables": {
"MONO_PATH": "$ROOT/lib/mono/4.5",
"MONO_GC_PARAMS": "major=marksweep-conc"
}
}

17 changes: 17 additions & 0 deletions configs/auto-sgen-aotjit-serial.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"Name": "auto-sgen-aotjit-serial",
"Count": 10,
"Mono": "$ROOT/bin/mono-sgen",
"AOTOptions": [
"-O=gsharedvt",
"--aot"
],
"MonoOptions": [
"-O=aot"
],
"MonoEnvironmentVariables": {
"MONO_PATH": "$ROOT/lib/mono/4.5",
"MONO_GC_PARAMS": "major=marksweep"
}
}

12 changes: 12 additions & 0 deletions configs/auto-sgen-conc-par.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"Name": "auto-sgen-conc-par",
"Count": 10,
"Mono": "$ROOT/bin/mono-sgen",
"MonoOptions": [
"-O=-aot"
],
"MonoEnvironmentVariables": {
"MONO_PATH": "$ROOT/lib/mono/4.5",
"MONO_GC_PARAMS": "major=marksweep-conc-par"
}
}
64 changes: 22 additions & 42 deletions performancebot/master.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -630,63 +630,43 @@ def create_slaves():

# TODO: add AOT concurrent configuration.
for lane_cfg in [LANE_MONO_MASTER, LANE_MONO_PULLREQUEST]:
for (cfg, benchkind) in [('auto-sgen-conc-par-binary', BenchmarkKind.Default), ('auto-sgen-conc-binary', BenchmarkKind.Default), ('auto-sgen-serial-binary', BenchmarkKind.Default), ('auto-sgen-aotjit-conc-binary', BenchmarkKind.Default), ('auto-sgen-aotjit-serial-binary', BenchmarkKind.Default), ('default-aot', BenchmarkKind.CompileTime)]:
for (cfg, benchkind) in [('auto-sgen-conc-par', BenchmarkKind.Default), ('auto-sgen-conc', BenchmarkKind.Default), ('auto-sgen-serial', BenchmarkKind.Default), ('auto-sgen-aotjit-conc', BenchmarkKind.Default), ('auto-sgen-aotjit-serial', BenchmarkKind.Default), ('default-aot', BenchmarkKind.CompileTime)]:
_mk_benchmarker(lane_cfg, 'poweredge1', 'ubuntu-1404-amd64', cfg, kind=benchkind, swarm=poweredge_swarm)
if lane_cfg == LANE_MONO_MASTER:
_mk_find_regression('ec2-slave1', 'poweredge1', cfg, swarm=ec2_swarm)

assert 'benchmarker' in slaves
_mk_benchmarker(LANE_MONO_MASTER, 'benchmarker', 'debian-amd64', 'auto-sgen-noturbo', enable_scheduling=False, tags=[BuilderTags.Deprecated("new configuration")])
_mk_benchmarker(LANE_MONO_MASTER, 'benchmarker', 'debian-amd64', 'auto-sgen-noturbo-binary', enable_scheduling=False, tags=[BuilderTags.Deprecated("new platform name")])
_mk_benchmarker(LANE_MONO_MASTER, 'benchmarker', 'ubuntu-1404-amd64', 'auto-sgen-noturbo-binary', enable_scheduling=False, tags=[BuilderTags.Deprecated("retire \"benchmarker\"")])

_mk_benchmarker(LANE_MONO_MASTER, 'benchmarker', 'debian-amd64', 'auto-sgen-conc-noturbo-binary', enable_scheduling=False, tags=[BuilderTags.Deprecated("new platform name")])
_mk_benchmarker(LANE_MONO_MASTER, 'benchmarker', 'ubuntu-1404-amd64', 'auto-sgen-conc-noturbo-binary', enable_scheduling=False, tags=[BuilderTags.Deprecated("retire \"benchmarker\"")])

_mk_benchmarker(LANE_MONO_MASTER, 'benchmarker', 'debian-amd64', 'default-aot-all-noturbo', kind=BenchmarkKind.CompileTime, enable_scheduling=False, tags=[BuilderTags.Deprecated("new platform names")])
_mk_benchmarker(LANE_MONO_MASTER, 'benchmarker', 'ubuntu-1404-amd64', 'default-aot-all-noturbo', kind=BenchmarkKind.CompileTime, enable_scheduling=False, tags=[BuilderTags.Deprecated("retire \"benchmarker\"")])

_mk_benchmarker(LANE_MONO_PULLREQUEST, 'benchmarker', 'debian-amd64', 'auto-sgen-noturbo-binary', enable_scheduling=False, tags=[BuilderTags.Deprecated("new platform name")])
_mk_benchmarker(LANE_MONO_PULLREQUEST, 'benchmarker', 'ubuntu-1404-amd64', 'auto-sgen-noturbo-binary', enable_scheduling=False, tags=[BuilderTags.Deprecated("retire \"benchmarker\"")])
_mk_benchmarker(LANE_MONO_PULLREQUEST, 'benchmarker', 'debian-amd64', 'auto-sgen-conc-noturbo-binary', enable_scheduling=False, tags=[BuilderTags.Deprecated("new platform name")])
_mk_benchmarker(LANE_MONO_PULLREQUEST, 'benchmarker', 'ubuntu-1404-amd64', 'auto-sgen-conc-noturbo-binary', enable_scheduling=False, tags=[BuilderTags.Deprecated("retire \"benchmarker\"")])
_mk_benchmarker(LANE_MONO_PULLREQUEST, 'benchmarker', 'debian-amd64', 'default-aot-all-noturbo', kind=BenchmarkKind.CompileTime, enable_scheduling=False, tags=[BuilderTags.Deprecated("new platform name")])
_mk_benchmarker(LANE_MONO_PULLREQUEST, 'benchmarker', 'ubuntu-1404-amd64', 'default-aot-all-noturbo', kind=BenchmarkKind.CompileTime, enable_scheduling=False, tags=[BuilderTags.Deprecated("retire \"benchmarker\"")])

_mk_benchmarker(LANE_MONO_MASTER, 'utilite-desktop', 'debian-armhf', 'auto-sgen', queue_type=QueueType.Fifo, swarm=perfarm_swarm, enable_scheduling=False, tags=[BuilderTags.Deprecated("new platform name and configuration")])
_mk_benchmarker(LANE_MONO_MASTER, 'utilite-desktop', 'debian-8-armhf', 'auto-sgen-binary', queue_type=QueueType.Fifo, swarm=perfarm_swarm)

_mk_benchmarker(LANE_MONO_MASTER, 'utilite-desktop', 'debian-8-armhf', 'auto-sgen-conc-binary', queue_type=QueueType.Fifo, swarm=perfarm_swarm)
_mk_benchmarker(LANE_MONO_MASTER, 'utilite-desktop', 'debian-8-armhf', 'auto-sgen', queue_type=QueueType.Fifo, swarm=perfarm_swarm)
_mk_benchmarker(LANE_MONO_MASTER, 'utilite-desktop', 'debian-8-armhf', 'auto-sgen-conc', queue_type=QueueType.Fifo, swarm=perfarm_swarm)
# TODO: enable
# _mk_benchmarker(LANE_MONO_MASTER, 'utilite-desktop', 'debian-8-armhf', 'auto-sgen-aotjit-serial-binary', queue_type=QueueType.Fifo, swarm=perfarm_swarm)
# _mk_benchmarker(LANE_MONO_MASTER, 'utilite-desktop', 'debian-8-armhf', 'auto-sgen-aotjit-conc-binary', queue_type=QueueType.Fifo, swarm=perfarm_swarm)

_mk_benchmarker(LANE_MONO_PULLREQUEST, 'utilite-desktop', 'debian-armhf', 'auto-sgen', queue_type=QueueType.Fifo, swarm=perfarm_swarm, enable_scheduling=False, tags=[BuilderTags.Deprecated("new platform name and configuration")])
_mk_benchmarker(LANE_MONO_PULLREQUEST, 'utilite-desktop', 'debian-8-armhf', 'auto-sgen-binary', queue_type=QueueType.Fifo, swarm=perfarm_swarm)
# _mk_benchmarker(LANE_MONO_MASTER, 'utilite-desktop', 'debian-8-armhf', 'auto-sgen-aotjit-serial', queue_type=QueueType.Fifo, swarm=perfarm_swarm)
# _mk_benchmarker(LANE_MONO_MASTER, 'utilite-desktop', 'debian-8-armhf', 'auto-sgen-aotjit-conc', queue_type=QueueType.Fifo, swarm=perfarm_swarm)

_mk_benchmarker(LANE_MONO_PULLREQUEST, 'utilite-desktop', 'debian-8-armhf', 'auto-sgen-conc-binary', queue_type=QueueType.Fifo, swarm=perfarm_swarm)
_mk_benchmarker(LANE_MONO_PULLREQUEST, 'utilite-desktop', 'debian-8-armhf', 'auto-sgen', queue_type=QueueType.Fifo, swarm=perfarm_swarm)
_mk_benchmarker(LANE_MONO_PULLREQUEST, 'utilite-desktop', 'debian-8-armhf', 'auto-sgen-conc', queue_type=QueueType.Fifo, swarm=perfarm_swarm)
# TODO: enable
# _mk_benchmarker(LANE_MONO_PULLREQUEST, 'utilite-desktop', 'debian-8-armhf', 'auto-sgen-aotjit-serial-binary', queue_type=QueueType.Fifo, swarm=perfarm_swarm)
# _mk_benchmarker(LANE_MONO_PULLREQUEST, 'utilite-desktop', 'debian-8-armhf', 'auto-sgen-aotjit-conc-binary', queue_type=QueueType.Fifo, swarm=perfarm_swarm)
# _mk_benchmarker(LANE_MONO_PULLREQUEST, 'utilite-desktop', 'debian-8-armhf', 'auto-sgen-aotjit-serial', queue_type=QueueType.Fifo, swarm=perfarm_swarm)
# _mk_benchmarker(LANE_MONO_PULLREQUEST, 'utilite-desktop', 'debian-8-armhf', 'auto-sgen-aotjit-conc', queue_type=QueueType.Fifo, swarm=perfarm_swarm)

_mk_find_regression('ec2-slave1', 'utilite-desktop', 'auto-sgen', swarm=ec2_swarm)
_mk_find_regression('ec2-slave1', 'utilite-desktop', 'auto-sgen-binary', swarm=ec2_swarm)
_mk_find_regression('ec2-slave1', 'utilite-desktop', 'auto-sgen-conc-binary', swarm=ec2_swarm)
_mk_find_regression('ec2-slave1', 'utilite-desktop', 'auto-sgen-conc', swarm=ec2_swarm)

_mk_benchmark_bisector('ec2-slave1', swarm=ec2_swarm)
_mk_bostonpoller_test('ec2-slave1', URL_GITHUB_MONO_MONO, 'master', 'mono-master-monodroid', swarm=ec2_swarm)
if False:
_mk_benchmark_bisector('ec2-slave1', swarm=ec2_swarm)
_mk_bostonpoller_test('ec2-slave1', URL_GITHUB_MONO_MONO, 'master', 'mono-master-monodroid', swarm=ec2_swarm)

_mk_benchmarker(LANE_MONO_MASTER, 'ec2-slave1', 'debian-amd64', 'auto-sgen', kind=BenchmarkKind.Massif, swarm=ec2_swarm, enable_scheduling=False, tags=[BuilderTags.Deprecated("new platform name")])
_mk_benchmarker(LANE_MONO_MASTER, 'ec2-slave1', 'ubuntu-1404-amd64', 'auto-sgen', kind=BenchmarkKind.Massif, swarm=ec2_swarm)
if False:
_mk_benchmarker(LANE_MONO_MASTER, 'ec2-slave1', 'debian-amd64', 'auto-sgen', kind=BenchmarkKind.Massif, swarm=ec2_swarm, enable_scheduling=False, tags=[BuilderTags.Deprecated("new platform name")])
_mk_benchmarker(LANE_MONO_MASTER, 'ec2-slave1', 'ubuntu-1404-amd64', 'auto-sgen', kind=BenchmarkKind.Massif, swarm=ec2_swarm)

_mk_benchmarker(LANE_MONO_PULLREQUEST, 'ec2-slave1', 'debian-amd64', 'auto-sgen', kind=BenchmarkKind.Massif, swarm=ec2_swarm, enable_scheduling=False, tags=[BuilderTags.Deprecated("new platform name")])
_mk_benchmarker(LANE_MONO_PULLREQUEST, 'ec2-slave1', 'ubuntu-1404-amd64', 'auto-sgen', kind=BenchmarkKind.Massif, swarm=ec2_swarm)
_mk_benchmarker(LANE_MONO_PULLREQUEST, 'ec2-slave1', 'debian-amd64', 'auto-sgen', kind=BenchmarkKind.Massif, swarm=ec2_swarm, enable_scheduling=False, tags=[BuilderTags.Deprecated("new platform name")])
_mk_benchmarker(LANE_MONO_PULLREQUEST, 'ec2-slave1', 'ubuntu-1404-amd64', 'auto-sgen', kind=BenchmarkKind.Massif, swarm=ec2_swarm)

_mk_benchmarker(LANE_MONO_MASTER, 'ec2-slave1', 'debian-amd64', 'auto-sgen-cachegrind', kind=BenchmarkKind.Cachegrind, swarm=ec2_swarm, enable_scheduling=False, tags=[BuilderTags.Deprecated("new platform name")])
_mk_benchmarker(LANE_MONO_MASTER, 'ec2-slave1', 'ubuntu-1404-amd64', 'auto-sgen-cachegrind', kind=BenchmarkKind.Cachegrind, swarm=ec2_swarm)
_mk_benchmarker(LANE_MONO_MASTER, 'ec2-slave1', 'debian-amd64', 'auto-sgen-cachegrind', kind=BenchmarkKind.Cachegrind, swarm=ec2_swarm, enable_scheduling=False, tags=[BuilderTags.Deprecated("new platform name")])
_mk_benchmarker(LANE_MONO_MASTER, 'ec2-slave1', 'ubuntu-1404-amd64', 'auto-sgen-cachegrind', kind=BenchmarkKind.Cachegrind, swarm=ec2_swarm)

_mk_benchmarker(LANE_MONO_PULLREQUEST, 'ec2-slave1', 'debian-amd64', 'auto-sgen-cachegrind', kind=BenchmarkKind.Cachegrind, swarm=ec2_swarm, enable_scheduling=False, tags=[BuilderTags.Deprecated("new platform name")])
_mk_benchmarker(LANE_MONO_PULLREQUEST, 'ec2-slave1', 'ubuntu-1404-amd64', 'auto-sgen-cachegrind', kind=BenchmarkKind.Cachegrind, swarm=ec2_swarm)
_mk_benchmarker(LANE_MONO_PULLREQUEST, 'ec2-slave1', 'debian-amd64', 'auto-sgen-cachegrind', kind=BenchmarkKind.Cachegrind, swarm=ec2_swarm, enable_scheduling=False, tags=[BuilderTags.Deprecated("new platform name")])
_mk_benchmarker(LANE_MONO_PULLREQUEST, 'ec2-slave1', 'ubuntu-1404-amd64', 'auto-sgen-cachegrind', kind=BenchmarkKind.Cachegrind, swarm=ec2_swarm)


_mk_update_benchmarks('ec2-slave1', swarm=(ec2_swarm + poweredge_swarm))
Expand Down

0 comments on commit 6db3e12

Please sign in to comment.