Skip to content

Commit c65925b

Browse files
timfeltimfel
committed
[GR-21590] Update imports.
PullRequest: graalpython/4065
2 parents 669bf09 + 51f9df8 commit c65925b

File tree

7 files changed

+25
-18
lines changed

7 files changed

+25
-18
lines changed

‎ci.jsonnet‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,8 @@
297297
}),
298298
},
299299

300+
local need_pgo = task_spec({runAfter: ["python-pgo-profile-post_merge-linux-amd64-jdk-latest"]}),
301+
local need_bc_pgo = task_spec({runAfter: ["python-pgo-profile-bytecode-dsl-post_merge-linux-amd64-jdk-latest"]}),
300302
local forks_warmup = forks("./mx.graalpython/warmup-fork-counts.json"),
301303
local forks_meso = forks("meso.json"),
302304
local raw_results = task_spec({
@@ -313,7 +315,7 @@
313315
local bench_task_dict = {
314316
[bench]: bench_task(bench) + platform_spec(no_jobs) + bench_variants({
315317
"vm_name:graalvm_ce_default" : {"linux:amd64:jdk-latest" : on_demand + t("08:00:00")},
316-
"vm_name:graalvm_ee_default" : {"linux:amd64:jdk-latest" : post_merge + t("08:00:00")},
318+
"vm_name:graalvm_ee_default" : {"linux:amd64:jdk-latest" : post_merge + t("08:00:00") + need_pgo},
317319
"vm_name:graalpython_core" : {"linux:amd64:jdk-latest" : on_demand + t("08:00:00")},
318320
"vm_name:graalpython_enterprise" : {"linux:amd64:jdk-latest" : daily + t("08:00:00"),
319321
"job_type:checkup" : {"linux:amd64:jdk-latest" : on_demand + t("08:00:00")}
@@ -332,7 +334,7 @@
332334
} + {
333335
[bench]: bench_task(bench) + platform_spec(no_jobs) + bench_variants({
334336
"vm_name:graalvm_ce_default" : {"linux:amd64:jdk-latest" : on_demand + t("08:00:00")},
335-
"vm_name:graalvm_ee_default" : {"linux:amd64:jdk-latest" : post_merge + t("08:00:00")},
337+
"vm_name:graalvm_ee_default" : {"linux:amd64:jdk-latest" : post_merge + t("08:00:00") + need_pgo},
336338
"vm_name:graalpython_core" : {"linux:amd64:jdk-latest" : on_demand + t("08:00:00")},
337339
"vm_name:graalpython_core_panama" : {"linux:amd64:jdk-latest" : on_demand + t("08:00:00")},
338340
"vm_name:graalpython_enterprise" : {"linux:amd64:jdk-latest" : daily + t("08:00:00"),
@@ -399,14 +401,14 @@
399401
for bench in ["warmup"]
400402
} + {
401403
[bench]: bench_task(bench) + platform_spec(no_jobs) + bench_variants({
402-
"vm_name:graalvm_ee_default_interpreter" : {"linux:amd64:jdk-latest" : post_merge + t("02:00:00")},
404+
"vm_name:graalvm_ee_default_interpreter" : {"linux:amd64:jdk-latest" : post_merge + t("02:00:00") + need_pgo},
403405
"vm_name:graalpython_enterprise_interpreter" : {"linux:amd64:jdk-latest" : weekly + t("02:00:00")},
404406
"vm_name:cpython" : {"linux:amd64:jdk-latest" : weekly + t("01:00:00")},
405407
}),
406408
for bench in ["heap", "micro_small_heap"]
407409
} + {
408410
[bench + "-bytecode-dsl"]: bench_task(bench) + bytecode_dsl_bench + platform_spec(no_jobs) + bench_variants({
409-
"vm_name:graalvm_ee_default_interpreter_bc_dsl" : {"linux:amd64:jdk-latest" : post_merge + t("02:00:00")},
411+
"vm_name:graalvm_ee_default_interpreter_bc_dsl" : {"linux:amd64:jdk-latest" : post_merge + t("02:00:00") + need_bc_pgo},
410412
"vm_name:graalpython_enterprise_interpreter_bc_dsl" : {"linux:amd64:jdk-latest" : weekly + t("02:00:00")},
411413
}),
412414
for bench in ["heap", "micro_small_heap"]

‎ci/graal/ci/common.jsonnet‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,26 @@ local common_json = import "../common.json";
5959
'oraclejdk24': jdk_base + common_json.jdks["oraclejdk24"] + { jdk_version:: 24 },
6060
} + {
6161
[name]: jdk_base + common_json.jdks[name] + { jdk_version:: 25 }
62-
for name in ["oraclejdk25"] + variants("labsjdk-ce-25") + variants("labsjdk-ee-25")
62+
for name in ["oraclejdk25"]
63+
} + {
64+
# Synthesize labsjdk-*-25 from labsjdk-*-latest
65+
# This is intended for jobs that specifically need the 25 LTS JDK (e.g., espresso for its guest).
66+
# When running the compiler or the native image generator "latest" should be used instead.
67+
# When latest moves past 25, jobs using 25 should be reviwed and if they are still needed labsjdk-(ce|ee)-25 should
68+
# be added to common.json.
69+
# Note that the assert below unfortunately doesn't work in the sjsonnet version used currently in the CI (GR-40975).
70+
[std.strReplace(name, 'latest', '25')]: jdk_base + common_json.jdks[name] + { assert parse_labsjdk_version(self) == 25, jdk_version:: 25 }
71+
for name in variants("labsjdk-ce-latest") + variants("labsjdk-ee-latest")
6372
} + {
6473
[name]: jdk_base + common_json.jdks[name] + { jdk_version:: parse_labsjdk_version(self), jdk_name:: "jdk-latest"}
6574
for name in ["oraclejdk-latest"] + variants("labsjdk-ce-latest") + variants("labsjdk-ee-latest")
6675
} + {
6776
'graalvm-ee-21': jdk_base + common_json.jdks["graalvm-ee-21"] + { jdk_version:: 21 },
6877
'graalvm-ee-25-ea': jdk_base + common_json.jdks["graalvm-ee-25-ea"] + { jdk_version:: 25 },
6978
},
70-
# We do not want to expose galahad-jdk
71-
assert std.assertEqual([x for x in std.objectFields(common_json.jdks) if x != "galahad-jdk"], std.objectFields(jdks_data)),
79+
# We do not want to expose galahad-jdk, labsjdk-(ce|ee)-25 are synthetized from latest
80+
local is_labsjdk_25(x) = std.startsWith(x, "labsjdk-ee-25") || std.startsWith(x, "labsjdk-ce-25"),
81+
assert std.assertEqual([x for x in std.objectFields(common_json.jdks) if x != "galahad-jdk"], [x for x in std.objectFields(jdks_data) if !is_labsjdk_25(x)]),
7282
# Verify oraclejdk-latest and labsjdk-ee-latest versions match
7383
assert
7484
local _labsjdk = common_json.jdks["labsjdk-ee-latest"];

‎ci/graal/common.json‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,7 @@
4545

4646
"oraclejdk24": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24.0.1+9", "platformspecific": true, "extrabundles": ["static-libs"]},
4747

48-
"oraclejdk25": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+30", "platformspecific": true, "extrabundles": ["static-libs"]},
49-
"labsjdk-ce-25": {"name": "labsjdk", "version": "ce-25+30-jvmci-b01", "platformspecific": true },
50-
"labsjdk-ce-25Debug": {"name": "labsjdk", "version": "ce-25+30-jvmci-b01-debug", "platformspecific": true },
51-
"labsjdk-ce-25-llvm": {"name": "labsjdk", "version": "ce-25+30-jvmci-b01-sulong", "platformspecific": true },
52-
"labsjdk-ee-25": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01", "platformspecific": true },
53-
"labsjdk-ee-25Debug": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-debug", "platformspecific": true },
54-
"labsjdk-ee-25-llvm": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-sulong", "platformspecific": true },
48+
"oraclejdk25": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+37", "platformspecific": true, "extrabundles": ["static-libs"]},
5549
"graalvm-ee-25-ea": {"name": "graalvm-jdk", "version": "25.0.0", "ea": "36", "platformspecific": true },
5650

5751
"oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+37", "platformspecific": true, "extrabundles": ["static-libs"]},

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_capi.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ test.test_capi.test_dict.CAPITest.test_dict_contains @ darwin-arm64,darwin-x86_6
5555
test.test_capi.test_dict.CAPITest.test_dict_copy @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
5656
test.test_capi.test_dict.CAPITest.test_dict_delitem @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
5757
test.test_capi.test_dict.CAPITest.test_dict_getitemwitherror @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
58+
test.test_capi.test_dict.CAPITest.test_dict_keys_valuesitems_bad_arg @ darwin-arm64,linux-x86_64,win32-AMD64
5859
test.test_capi.test_dict.CAPITest.test_dict_new @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
5960
test.test_capi.test_dict.CAPITest.test_dict_next @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
6061
test.test_capi.test_dict.CAPITest.test_dict_setitem @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_mmap.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ test.test_mmap.MmapTests.test_prot_readonly @ darwin-arm64,darwin-x86_64,linux-a
1919
test.test_mmap.MmapTests.test_read_all @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2020
test.test_mmap.MmapTests.test_read_invalid_arg @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2121
test.test_mmap.MmapTests.test_subclass @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
22-
test.test_mmap.MmapTests.test_tougher_find @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
22+
test.test_mmap.MmapTests.test_tougher_find @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2323
test.test_mmap.MmapTests.test_write_returning_the_number_of_bytes_written @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎mx.graalpython/mx_graalpython.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ def libpythonvm_build_args():
316316
# when running in the CI on a bench runner, ensure a PGO profile
317317
if (
318318
any(b.startswith("release/") for b in [branch, os.environ.get("TO_BRANCH", "")])
319-
or os.environ.get('BUILD_NAME', '').startswith('pybench-')
319+
or ("bench" in os.environ.get('BUILD_NAME', ''))
320320
):
321321
mx.warn("PGO profile must exist for benchmarking and release, creating one now...")
322322
profile = graalpy_native_pgo_build_and_test()

‎mx.graalpython/suite.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@
5353
},
5454
{
5555
"name": "tools",
56-
"version": "c97cbace010614eeb21abd39946a58a2107fcf03",
56+
"version": "acc29b5d3628aff89d74962ce84b8737aea5ca3d",
5757
"subdir": True,
5858
"urls": [
5959
{"url": "https://github.com/oracle/graal", "kind": "git"},
6060
],
6161
},
6262
{
6363
"name": "regex",
64-
"version": "c97cbace010614eeb21abd39946a58a2107fcf03",
64+
"version": "acc29b5d3628aff89d74962ce84b8737aea5ca3d",
6565
"subdir": True,
6666
"urls": [
6767
{"url": "https://github.com/oracle/graal", "kind": "git"},

0 commit comments

Comments
 (0)