Skip to content

Commit 0b31a29

Browse files
authored
Merge branch 'master' into vcalvez/github_ci
2 parents 12d283a + c52c129 commit 0b31a29

48 files changed

Lines changed: 2564 additions & 1680 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ci.jsonnet

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@
323323
// time in the interpreter and they are used for interpreter benchmarking
324324
[bench]: bench_task(bench) + platform_spec(no_jobs) + bench_variants({
325325
"vm_name:graalvm_ce_default_interpreter" : {"linux:amd64:jdk-latest" : on_demand + t("02:00:00")},
326-
"vm_name:graalvm_ee_default_interpreter" : {"linux:amd64:jdk-latest" : daily + t("02:00:00")},
326+
"vm_name:graalvm_ee_default_interpreter" : {"linux:amd64:jdk-latest" : daily + t("02:00:00") + need_pgo},
327327
"vm_name:graalpython_core_interpreter" : {"linux:amd64:jdk-latest" : on_demand + t("02:00:00")},
328328
"vm_name:graalpython_core_native_interpreter" : {"linux:amd64:jdk-latest" : on_demand + t("02:00:00")},
329329
"vm_name:graalpython_enterprise_interpreter" : {"linux:amd64:jdk-latest" : weekly + t("02:00:00")},
@@ -343,19 +343,19 @@
343343
"vm_name:graalpython_core" : {"linux:amd64:jdk-latest" : on_demand + t("05:00:00") + forks_warmup},
344344
"vm_name:graalpython_enterprise" : {"linux:amd64:jdk-latest" : daily + t("05:00:00") + forks_warmup},
345345
"vm_name:graalvm_ce_default" : {"linux:amd64:jdk-latest" : on_demand + t("05:00:00") + forks_warmup},
346-
"vm_name:graalvm_ee_default" : {"linux:amd64:jdk-latest" : daily + t("05:00:00") + forks_warmup},
346+
"vm_name:graalvm_ee_default" : {"linux:amd64:jdk-latest" : daily + t("05:00:00") + forks_warmup + need_pgo},
347347
"vm_name:graalpython_core_multi_tier" : {"linux:amd64:jdk-latest" : on_demand + t("05:00:00") + forks_warmup},
348348
"vm_name:graalpython_enterprise_multi_tier" : {"linux:amd64:jdk-latest" : weekly + t("05:00:00") + forks_warmup},
349349
"vm_name:graalvm_ce_default_multi_tier" : {"linux:amd64:jdk-latest" : on_demand + t("05:00:00") + forks_warmup},
350-
"vm_name:graalvm_ee_default_multi_tier" : {"linux:amd64:jdk-latest" : weekly + t("05:00:00") + forks_warmup},
350+
"vm_name:graalvm_ee_default_multi_tier" : {"linux:amd64:jdk-latest" : weekly + t("05:00:00") + forks_warmup + need_pgo},
351351
"vm_name:graalpython_core_3threads" : {"linux:amd64:jdk-latest" : on_demand + t("05:00:00") + forks_warmup},
352352
"vm_name:graalpython_enterprise_3threads" : {"linux:amd64:jdk-latest" : weekly + t("05:00:00") + forks_warmup},
353353
"vm_name:graalvm_ce_default_3threads" : {"linux:amd64:jdk-latest" : on_demand + t("05:00:00") + forks_warmup},
354-
"vm_name:graalvm_ee_default_3threads" : {"linux:amd64:jdk-latest" : weekly + t("05:00:00") + forks_warmup},
354+
"vm_name:graalvm_ee_default_3threads" : {"linux:amd64:jdk-latest" : weekly + t("05:00:00") + forks_warmup + need_pgo},
355355
"vm_name:graalpython_core_multi_tier_3threads" : {"linux:amd64:jdk-latest" : on_demand + t("05:00:00") + forks_warmup},
356356
"vm_name:graalpython_enterprise_multi_tier_3threads" : {"linux:amd64:jdk-latest" : weekly + t("05:00:00") + forks_warmup},
357357
"vm_name:graalvm_ce_default_multi_tier_3threads" : {"linux:amd64:jdk-latest" : on_demand + t("05:00:00") + forks_warmup},
358-
"vm_name:graalvm_ee_default_multi_tier_3threads" : {"linux:amd64:jdk-latest" : weekly + t("05:00:00") + forks_warmup},
358+
"vm_name:graalvm_ee_default_multi_tier_3threads" : {"linux:amd64:jdk-latest" : weekly + t("05:00:00") + forks_warmup + need_pgo},
359359
"vm_name:pypy" : {"linux:amd64:jdk-latest" : on_demand + t("01:00:00")},
360360
}),
361361
for bench in ["warmup"]
@@ -377,7 +377,7 @@
377377
// benchmarks with many forks for weekly performance reports
378378
[bench + "-forks"]: bench_task(bench) + platform_spec(no_jobs) + bench_variants({
379379
"vm_name:graalvm_ce_default" : {"linux:amd64:jdk-latest" : on_demand + t("10:00:00") + forks_meso},
380-
"vm_name:graalvm_ee_default" : {"linux:amd64:jdk-latest" : weekly + t("10:00:00") + forks_meso},
380+
"vm_name:graalvm_ee_default" : {"linux:amd64:jdk-latest" : weekly + t("10:00:00") + forks_meso + need_pgo},
381381
}),
382382
for bench in ["meso"]
383383
} + {
@@ -386,7 +386,7 @@
386386
"vm_name:graalpython_core" : {"linux:amd64:jdk-latest" : on_demand + t("08:00:00")},
387387
"vm_name:graalpython_enterprise" : {"linux:amd64:jdk-latest" : weekly + t("08:00:00")},
388388
"vm_name:graalvm_ce_default" : {"linux:amd64:jdk-latest" : on_demand + t("08:00:00")},
389-
"vm_name:graalvm_ee_default" : {"linux:amd64:jdk-latest" : weekly + t("08:00:00")},
389+
"vm_name:graalvm_ee_default" : {"linux:amd64:jdk-latest" : weekly + t("08:00:00") + need_pgo},
390390
"vm_name:cpython_launcher" : {"linux:amd64:jdk-latest" : monthly + t("08:00:00")},
391391
"vm_name:pypy_launcher" : {"linux:amd64:jdk-latest" : on_demand + t("08:00:00")},
392392
}),
@@ -399,7 +399,7 @@
399399
"vm_name:graalpython_enterprise" : {"linux:amd64:jdk-latest" : weekly + t("08:00:00")},
400400
"vm_name:graalpython_enterprise_panama" : {"linux:amd64:jdk-latest" : on_demand + t("08:00:00")},
401401
"vm_name:graalvm_ce_default" : {"linux:amd64:jdk-latest" : on_demand + t("08:00:00")},
402-
"vm_name:graalvm_ee_default" : {"linux:amd64:jdk-latest" : weekly + t("08:00:00")},
402+
"vm_name:graalvm_ee_default" : {"linux:amd64:jdk-latest" : weekly + t("08:00:00") + need_pgo},
403403
"vm_name:cpython_launcher" : {"linux:amd64:jdk-latest" : monthly + t("08:00:00")},
404404
"vm_name:pypy_launcher" : {"linux:amd64:jdk-latest" : on_demand + t("08:00:00")},
405405
}),

ci/python-gate.libsonnet

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,8 @@
427427
environment+: $.environment(self.os, self.arch),
428428
packages+: $.packages(self.os, self.arch),
429429
run+: [
430-
["mx"] + self.mx_parameters + self.dy + self.primary_suite + [
430+
// TODO: remove inlineVerifierInstrument=false once VerifierInstrument#checkFrameIsEmpty is fixed, GR-72201
431+
["mx", "--J", "@-Dtck.inlineVerifierInstrument=false"] + self.mx_parameters + self.dy + self.primary_suite + [
431432
"--strict-compliance", "--primary", "gate", "--tags", self.tags, "-B=--force-deprecation-as-warning",
432433
] + self.all_suites + self.gate_parameters,
433434
],

0 commit comments

Comments
 (0)