Skip to content

Commit

Permalink
CI: add more precise time limits and bundle short benchmarks together
Browse files Browse the repository at this point in the history
  • Loading branch information
eregon committed Oct 12, 2016
1 parent 287add8 commit 8a4e539
Showing 1 changed file with 24 additions and 73 deletions.
97 changes: 24 additions & 73 deletions ci.hocon
Expand Up @@ -235,6 +235,7 @@ metrics: {
] ${post-process-and-upload-results} [
[mx, benchmark, time]
] ${post-process-and-upload-results}
timelimit: "00:25:00"
}

compiler-metrics: {
Expand All @@ -245,6 +246,7 @@ compiler-metrics: {
] ${post-process-and-upload-results} [
[mx, benchmark, "time:compile-mandelbrot"]
] ${post-process-and-upload-results}
timelimit: "00:50:00"
}

setup-benchmarks: [
Expand All @@ -256,56 +258,44 @@ classic-benchmarks: {
run: ${setup-benchmarks} [
[mx, benchmark, classic]
] ${post-process-and-upload-results}
timelimit: "00:35:00"
}

chunky-benchmarks: {
run: ${setup-benchmarks} [
[mx, benchmark, chunky]
] ${post-process-and-upload-results}
timelimit: "00:40:00"
}

psd-benchmarks: {
run: ${setup-benchmarks} [
[mx, benchmark, psd]
] ${post-process-and-upload-results}
}

image-demo-benchmarks: {
run: ${setup-benchmarks} [
[mx, benchmark, image-demo]
] ${post-process-and-upload-results}
}

optcarrot-benchmarks: {
run: ${setup-benchmarks} [
[mx, benchmark, optcarrot]
] ${post-process-and-upload-results}
timelimit: "01:15:00"
}

asciidoctor-benchmarks: {
run: ${setup-benchmarks} [
[mx, benchmark, asciidoctor]
] ${post-process-and-upload-results}
timelimit: "00:35:00"
}

synthetic-benchmarks: {
other-benchmarks: {
run: ${setup-benchmarks} [
[mx, benchmark, image-demo]
] ${post-process-and-upload-results} [
[mx, benchmark, optcarrot]
] ${post-process-and-upload-results} [
[mx, benchmark, savina]
] ${post-process-and-upload-results} [
[mx, benchmark, synthetic]
] ${post-process-and-upload-results}
}

micro-benchmarks: {
run: ${setup-benchmarks} [
] ${post-process-and-upload-results} [
[mx, benchmark, micro]
] ${post-process-and-upload-results}
}

savina-benchmarks: {
run: ${setup-benchmarks} [
[mx, benchmark, savina]
] ${post-process-and-upload-results}
}

server-benchmarks: {
packages: {
"apache/ab": ">=2.3"
Expand All @@ -314,6 +304,7 @@ server-benchmarks: {
run: ${setup-benchmarks} [
[mx, benchmark, server]
] ${post-process-and-upload-results}
timelimit: "00:20:00"
}

gem-test-pack: {
Expand Down Expand Up @@ -411,16 +402,6 @@ builds: [
{name: ruby-benchmarks-psd-graal-vm-snapshot} ${common} ${graal-vm-snapshot} ${bench-caps} ${jruby-truffle} ${psd-benchmarks},
{name: ruby-benchmarks-psd-graal-vm-release} ${common} ${graal-vm-release} ${bench-caps} ${jruby-truffle} ${psd-benchmarks},

{name: ruby-benchmarks-image-demo-mri} ${common} ${weekly-bench-caps} ${mri-benchmark} ${image-demo-benchmarks},
{name: ruby-benchmarks-image-demo-noindy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-noindy-benchmark} ${image-demo-benchmarks},
{name: ruby-benchmarks-image-demo-indy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-indy-benchmark} ${image-demo-benchmarks},
{name: ruby-benchmarks-image-demo-no-graal} ${common} ${no-graal} ${weekly-bench-caps} ${jruby-truffle} ${image-demo-benchmarks},
{name: ruby-benchmarks-image-demo-graal-core} ${common} ${graal-core} ${daily-bench-caps} ${jruby-truffle} ${image-demo-benchmarks},
{name: ruby-benchmarks-image-demo-graal-enterprise} ${common} ${graal-enterprise} ${daily-bench-caps} ${jruby-truffle} ${image-demo-benchmarks},
{name: ruby-benchmarks-image-demo-graal-enterprise-no-om} ${common} ${graal-enterprise-no-om} ${daily-bench-caps} ${jruby-truffle} ${image-demo-benchmarks},
{name: ruby-benchmarks-image-demo-graal-vm-snapshot} ${common} ${graal-vm-snapshot} ${bench-caps} ${jruby-truffle} ${image-demo-benchmarks},
{name: ruby-benchmarks-image-demo-graal-vm-release} ${common} ${graal-vm-release} ${bench-caps} ${jruby-truffle} ${image-demo-benchmarks},

{name: ruby-benchmarks-asciidoctor-mri} ${common} ${weekly-bench-caps} ${mri-benchmark} ${asciidoctor-benchmarks},
{name: ruby-benchmarks-asciidoctor-noindy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-noindy-benchmark} ${asciidoctor-benchmarks},
{name: ruby-benchmarks-asciidoctor-indy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-indy-benchmark} ${asciidoctor-benchmarks},
Expand All @@ -431,45 +412,15 @@ builds: [
{name: ruby-benchmarks-asciidoctor-graal-vm-snapshot} ${common} ${graal-vm-snapshot} ${bench-caps} ${jruby-truffle} ${asciidoctor-benchmarks},
{name: ruby-benchmarks-asciidoctor-graal-vm-release} ${common} ${graal-vm-release} ${bench-caps} ${jruby-truffle} ${asciidoctor-benchmarks},

{name: ruby-benchmarks-optcarrot-mri} ${common} ${weekly-bench-caps} ${mri-benchmark} ${optcarrot-benchmarks},
{name: ruby-benchmarks-optcarrot-noindy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-noindy-benchmark} ${optcarrot-benchmarks},
{name: ruby-benchmarks-optcarrot-indy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-indy-benchmark} ${optcarrot-benchmarks},
{name: ruby-benchmarks-optcarrot-no-graal} ${common} ${no-graal} ${weekly-bench-caps} ${jruby-truffle} ${optcarrot-benchmarks},
{name: ruby-benchmarks-optcarrot-graal-core} ${common} ${graal-core} ${daily-bench-caps} ${jruby-truffle} ${optcarrot-benchmarks},
{name: ruby-benchmarks-optcarrot-graal-enterprise} ${common} ${graal-enterprise} ${daily-bench-caps} ${jruby-truffle} ${optcarrot-benchmarks},
{name: ruby-benchmarks-optcarrot-graal-enterprise-no-om} ${common} ${graal-enterprise-no-om} ${daily-bench-caps} ${jruby-truffle} ${optcarrot-benchmarks},
{name: ruby-benchmarks-optcarrot-graal-vm-snapshot} ${common} ${graal-vm-snapshot} ${bench-caps} ${jruby-truffle} ${optcarrot-benchmarks},
{name: ruby-benchmarks-optcarrot-graal-vm-release} ${common} ${graal-vm-release} ${bench-caps} ${jruby-truffle} ${optcarrot-benchmarks},

{name: ruby-benchmarks-synthetic-mri} ${common} ${weekly-bench-caps} ${mri-benchmark} ${synthetic-benchmarks},
{name: ruby-benchmarks-synthetic-noindy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-noindy-benchmark} ${synthetic-benchmarks},
{name: ruby-benchmarks-synthetic-indy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-indy-benchmark} ${synthetic-benchmarks},
{name: ruby-benchmarks-synthetic-no-graal} ${common} ${no-graal} ${weekly-bench-caps} ${jruby-truffle} ${synthetic-benchmarks},
{name: ruby-benchmarks-synthetic-graal-core} ${common} ${graal-core} ${daily-bench-caps} ${jruby-truffle} ${synthetic-benchmarks},
{name: ruby-benchmarks-synthetic-graal-enterprise} ${common} ${graal-enterprise} ${daily-bench-caps} ${jruby-truffle} ${synthetic-benchmarks},
{name: ruby-benchmarks-synthetic-graal-enterprise-no-om} ${common} ${graal-enterprise-no-om} ${daily-bench-caps} ${jruby-truffle} ${synthetic-benchmarks},
{name: ruby-benchmarks-synthetic-graal-vm-snapshot} ${common} ${graal-vm-snapshot} ${bench-caps} ${jruby-truffle} ${synthetic-benchmarks},
{name: ruby-benchmarks-synthetic-graal-vm-release} ${common} ${graal-vm-release} ${bench-caps} ${jruby-truffle} ${synthetic-benchmarks},

{name: ruby-benchmarks-micro-mri} ${common} ${weekly-bench-caps} ${mri-benchmark} ${micro-benchmarks},
{name: ruby-benchmarks-micro-noindy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-noindy-benchmark} ${micro-benchmarks},
{name: ruby-benchmarks-micro-indy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-indy-benchmark} ${micro-benchmarks},
{name: ruby-benchmarks-micro-no-graal} ${common} ${no-graal} ${weekly-bench-caps} ${jruby-truffle} ${micro-benchmarks},
{name: ruby-benchmarks-micro-graal-core} ${common} ${graal-core} ${daily-bench-caps} ${jruby-truffle} ${micro-benchmarks},
{name: ruby-benchmarks-micro-graal-enterprise} ${common} ${graal-enterprise} ${daily-bench-caps} ${jruby-truffle} ${micro-benchmarks},
{name: ruby-benchmarks-micro-graal-enterprise-no-om} ${common} ${graal-enterprise-no-om} ${daily-bench-caps} ${jruby-truffle} ${micro-benchmarks},
{name: ruby-benchmarks-micro-graal-vm-snapshot} ${common} ${graal-vm-snapshot} ${bench-caps} ${jruby-truffle} ${micro-benchmarks},
{name: ruby-benchmarks-micro-graal-vm-release} ${common} ${graal-vm-release} ${bench-caps} ${jruby-truffle} ${micro-benchmarks},

{name: ruby-benchmarks-savina-mri} ${common} ${weekly-bench-caps} ${mri-benchmark} ${savina-benchmarks},
{name: ruby-benchmarks-savina-noindy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-noindy-benchmark} ${savina-benchmarks},
{name: ruby-benchmarks-savina-indy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-indy-benchmark} ${savina-benchmarks},
{name: ruby-benchmarks-savina-no-graal} ${common} ${no-graal} ${weekly-bench-caps} ${jruby-truffle} ${savina-benchmarks},
{name: ruby-benchmarks-savina-graal-core} ${common} ${graal-core} ${daily-bench-caps} ${jruby-truffle} ${savina-benchmarks},
{name: ruby-benchmarks-savina-graal-enterprise} ${common} ${graal-enterprise} ${daily-bench-caps} ${jruby-truffle} ${savina-benchmarks},
{name: ruby-benchmarks-savina-graal-enterprise-no-om} ${common} ${graal-enterprise-no-om} ${daily-bench-caps} ${jruby-truffle} ${savina-benchmarks},
{name: ruby-benchmarks-savina-graal-vm-snapshot} ${common} ${graal-vm-snapshot} ${bench-caps} ${jruby-truffle} ${savina-benchmarks},
{name: ruby-benchmarks-savina-graal-vm-release} ${common} ${graal-vm-release} ${bench-caps} ${jruby-truffle} ${savina-benchmarks},
{name: ruby-benchmarks-other-mri} ${common} ${weekly-bench-caps} ${mri-benchmark} ${other-benchmarks},
{name: ruby-benchmarks-other-noindy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-noindy-benchmark} ${other-benchmarks},
{name: ruby-benchmarks-other-indy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-indy-benchmark} ${other-benchmarks},
{name: ruby-benchmarks-other-no-graal} ${common} ${no-graal} ${weekly-bench-caps} ${jruby-truffle} ${other-benchmarks},
{name: ruby-benchmarks-other-graal-core} ${common} ${graal-core} ${daily-bench-caps} ${jruby-truffle} ${other-benchmarks},
{name: ruby-benchmarks-other-graal-enterprise} ${common} ${graal-enterprise} ${daily-bench-caps} ${jruby-truffle} ${other-benchmarks},
{name: ruby-benchmarks-other-graal-enterprise-no-om} ${common} ${graal-enterprise-no-om} ${daily-bench-caps} ${jruby-truffle} ${other-benchmarks},
{name: ruby-benchmarks-other-graal-vm-snapshot} ${common} ${graal-vm-snapshot} ${bench-caps} ${jruby-truffle} ${other-benchmarks},
{name: ruby-benchmarks-other-graal-vm-release} ${common} ${graal-vm-release} ${bench-caps} ${jruby-truffle} ${other-benchmarks},

{name: ruby-benchmarks-server-noindy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-noindy-benchmark} ${server-benchmarks},
{name: ruby-benchmarks-server-indy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-indy-benchmark} ${server-benchmarks},
Expand Down

0 comments on commit 8a4e539

Please sign in to comment.