summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor "Nate" Graf <nategraf1@gmail.com>2017-12-01 15:18:02 -0800
committerGitHub <noreply@github.com>2017-12-01 15:18:02 -0800
commit1a62b232a9dcb6e426042c1dcc17ba9d8a7c88dc (patch)
treeceb0060b143eda0f0c17e4df9ee9086d156d0262
parent030af0a84753d6823f5fdc995a4d5213c2aa8fa5 (diff)
downloadcoreclr-1a62b232a9dcb6e426042c1dcc17ba9d8a7c88dc.tar.gz
coreclr-1a62b232a9dcb6e426042c1dcc17ba9d8a7c88dc.tar.bz2
coreclr-1a62b232a9dcb6e426042c1dcc17ba9d8a7c88dc.zip
Change name to perf jobs to reflect the actual OS they run on (#15314)
* Change name fo perf jobs to reflect the actual OS they run on * readd Ubuntu 14.04
-rw-r--r--buildpipeline/perf-pipeline.groovy4
-rw-r--r--perf.groovy2
-rw-r--r--tests/scripts/run-throughput-perf.py5
3 files changed, 6 insertions, 5 deletions
diff --git a/buildpipeline/perf-pipeline.groovy b/buildpipeline/perf-pipeline.groovy
index 2251f3c887..5921cf6f12 100644
--- a/buildpipeline/perf-pipeline.groovy
+++ b/buildpipeline/perf-pipeline.groovy
@@ -365,13 +365,13 @@ if (!isPR()) {
['pgo', 'nopgo'].each { pgo_enabled ->
outerLoopTests["linux ${arch} ryujit ${opt_level} ${pgo_enabled} perf"] = {
simpleNode('ubuntu_1604_clr_perf', 180) {
- linuxPerf(arch, 'Ubuntu14.04', config, uploadString, runType, opt_level, pgo_enabled, false)
+ linuxPerf(arch, 'Ubuntu16.04', config, uploadString, runType, opt_level, pgo_enabled, false)
}
}
outerLoopTests["linux ${arch} ryujit ${opt_level} ${pgo_enabled} throughput"] = {
simpleNode('ubuntu_1604_clr_perf', 180) {
- linuxThroughput(arch, 'Ubuntu14.04', config, uploadString, runType, opt_level, pgo_enabled, false)
+ linuxThroughput(arch, 'Ubuntu16.04', config, uploadString, runType, opt_level, pgo_enabled, false)
}
}
}
diff --git a/perf.groovy b/perf.groovy
index a87bf836cc..19de486350 100644
--- a/perf.groovy
+++ b/perf.groovy
@@ -267,7 +267,7 @@ def static getFullPerfJobName(def project, def os, def isPR) {
// Actual perf testing on the following OSes
- def perfOSList = ['Ubuntu14.04']
+ def perfOSList = ['Ubuntu16.04']
perfOSList.each { os ->
def newJob = job(getFullPerfJobName(project, os, isPR)) {
diff --git a/tests/scripts/run-throughput-perf.py b/tests/scripts/run-throughput-perf.py
index 3763b92599..77a0811416 100644
--- a/tests/scripts/run-throughput-perf.py
+++ b/tests/scripts/run-throughput-perf.py
@@ -93,7 +93,8 @@ jit_list = {
os_group_list = {
'Windows_NT': 'Windows_NT',
- 'Ubuntu14.04': 'Linux'
+ 'Ubuntu14.04': 'Linux',
+ 'Ubuntu16.04': 'Linux'
}
python_exe_list = {
@@ -168,7 +169,7 @@ def validate_args(args):
valid_archs = {'Windows_NT': ['x86', 'x64'], 'Linux': ['x64']}
valid_build_types = ['Release']
valid_run_types = ['rolling', 'private']
- valid_os = ['Windows_NT', 'Ubuntu14.04']
+ valid_os = ['Windows_NT', 'Ubuntu14.04', 'Ubuntu16.04']
valid_opt_levels = ['full_opt', 'min_opt']
valid_jit_names = {'x64': ['ryujit'], 'x86': ['ryujit', 'legacy_backend']}