Skip to content

Commit 33e4f67

Browse files
teshullteshull
committed
Merge remote-tracking branch 'origin/master' into tshull/GR-37306_aarch64_inflate_compress
2 parents 83f1806 + 05f66b3 commit 33e4f67

File tree

700 files changed

+18317
-8408
lines changed

Some content is hidden

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

700 files changed

+18317
-8408
lines changed

‎.mx_vcs_repo renamed to ‎.mx_vcs_root

File renamed without changes.

‎ci.hocon

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ local javadoc = import "ci_includes/publish-javadoc.jsonnet";
3232
local vm = import 'vm/ci_includes/vm.jsonnet';
3333

3434
# Add a guard to `build` that prevents it from running in the gate
35-
# for a PR that only touches *.md files, the docs, are config files for GitHub.
35+
# for a PR that only touches *.md files, the docs, are config files for GitHub
3636
local add_excludes_guard(build) = build + {
3737
guard+: {
3838
excludes+: ["**.md", "docs/**", ".github/**"]

‎ci_includes/publish-javadoc.jsonnet

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,27 @@
2828
["cd", ".."],
2929
["git", "clone", ["mx", "urlrewrite", "https://github.com/graalvm/graalvm-website.git"]],
3030
["cd", "graalvm-website"],
31+
# dev-only
3132
["rm", "-rf", "sdk/javadoc", "truffle/javadoc", "tools/javadoc", "graphio/javadoc"],
3233
["git", "status" ],
3334
["unzip", "-o", "-d", "sdk", "$GRAAL_REPO/sdk/javadoc.zip"],
3435
["unzip", "-o", "-d", "truffle", "$GRAAL_REPO/truffle/javadoc.zip"],
3536
["unzip", "-o", "-d", "tools", "$GRAAL_REPO/tools/javadoc.zip"],
3637
["unzip", "-o", "-d", "graphio", "$GRAAL_REPO/compiler/graphio-javadoc.zip"],
3738
["git", "add", "sdk/javadoc", "truffle/javadoc", "tools/javadoc", "graphio/javadoc"],
39+
# dev or release
40+
["set-export", "GRAAL_VERSION", "dev"],
41+
["rm", "-rf", "$GRAAL_VERSION/javadoc"],
42+
["mkdir", "-p", "$GRAAL_VERSION/javadoc"],
43+
["unzip", "-o", "-d", "$GRAAL_VERSION/javadoc/tmp", "$GRAAL_REPO/sdk/javadoc.zip"],
44+
["mv", "$GRAAL_VERSION/javadoc/tmp/javadoc", "$GRAAL_VERSION/javadoc/sdk"],
45+
["unzip", "-o", "-d", "$GRAAL_VERSION/javadoc/tmp", "$GRAAL_REPO/truffle/javadoc.zip"],
46+
["mv", "$GRAAL_VERSION/javadoc/tmp/javadoc", "$GRAAL_VERSION/javadoc/truffle"],
47+
["unzip", "-o", "-d", "$GRAAL_VERSION/javadoc/tmp", "$GRAAL_REPO/tools/javadoc.zip"],
48+
["mv", "$GRAAL_VERSION/javadoc/tmp/javadoc", "$GRAAL_VERSION/javadoc/tools"],
49+
["unzip", "-o", "-d", "$GRAAL_VERSION/javadoc/tmp", "$GRAAL_REPO/compiler/graphio-javadoc.zip"],
50+
["mv", "$GRAAL_VERSION/javadoc/tmp/javadoc", "$GRAAL_VERSION/javadoc/graphio"],
51+
["git", "add", "$GRAAL_VERSION/javadoc"],
3852
["git", "config", "user.name", "Javadoc Publisher"],
3953
["git", "config", "user.email", "[email protected]"],
4054
["git", "diff", "--staged", "--quiet", "||", "git", "commit", "-m", ["echo", "Javadoc as of", ["date", "+%Y/%m/%d"]]],

‎common.hocon

Lines changed: 0 additions & 91 deletions
This file was deleted.

‎common.json

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
"jdks": {
55
"openjdk11": {"name": "openjdk", "version": "11.0.11+9", "platformspecific": true },
66
"oraclejdk11": {"name": "oraclejdk", "version": "11.0.11+9", "platformspecific": true },
7-
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.15+4-jvmci-22.1-b02", "platformspecific": true },
8-
"labsjdk-ce-11-llvm": {"name": "labsjdk", "version": "ce-11.0.15+4-jvmci-22.1-b02-sulong", "platformspecific": true },
9-
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.15+7-jvmci-22.1-b02", "platformspecific": true },
10-
"labsjdk-ee-11-llvm": {"name": "labsjdk", "version": "ee-11.0.15+7-jvmci-22.1-b02-sulong", "platformspecific": true },
7+
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.15+5-jvmci-22.1-b03", "platformspecific": true },
8+
"labsjdk-ce-11-llvm": {"name": "labsjdk", "version": "ce-11.0.15+5-jvmci-22.1-b03-sulong", "platformspecific": true },
9+
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.15+8-jvmci-22.1-b03", "platformspecific": true },
10+
"labsjdk-ee-11-llvm": {"name": "labsjdk", "version": "ee-11.0.15+8-jvmci-22.1-b03-sulong", "platformspecific": true },
1111

1212
"oraclejdk17": {"name": "oraclejdk", "version": "17.0.1+12", "platformspecific": true },
13-
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.3+4-jvmci-22.1-b02", "platformspecific": true },
14-
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.3+4-jvmci-22.1-b02-debug", "platformspecific": true },
15-
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.3+4-jvmci-22.1-b02-sulong", "platformspecific": true },
16-
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.3+7-jvmci-22.1-b02", "platformspecific": true },
17-
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.3+7-jvmci-22.1-b02-debug", "platformspecific": true },
18-
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.3+7-jvmci-22.1-b02-sulong", "platformspecific": true }
13+
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.3+4-jvmci-22.1-b03", "platformspecific": true },
14+
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.3+4-jvmci-22.1-b03-debug", "platformspecific": true },
15+
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.3+4-jvmci-22.1-b03-sulong", "platformspecific": true },
16+
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.3+8-jvmci-22.1-b03", "platformspecific": true },
17+
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.3+8-jvmci-22.1-b03-debug", "platformspecific": true },
18+
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.3+8-jvmci-22.1-b03-sulong", "platformspecific": true }
1919
},
2020

2121
"COMMENT.devkits" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",
@@ -96,11 +96,16 @@
9696
"cmake": "==3.15.2"
9797
}
9898
},
99-
"darwin": {
99+
"darwin_amd64": {
100100
"packages": {
101101
"cmake": "==3.15.2"
102102
}
103103
},
104+
"darwin_aarch64": {
105+
"packages": {
106+
"cmake": "==3.22.2"
107+
}
108+
},
104109
"windows": {
105110
"packages": {
106111
"msvc": "==10.0",
@@ -165,7 +170,8 @@
165170
"ruby": ">=2.1.0"
166171
}
167172
},
168-
"darwin": {},
173+
"darwin_amd64": {},
174+
"darwin_aarch64": {},
169175
"windows": {}
170176
}
171177
}

‎common.jsonnet

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,10 @@
129129

130130
linux_amd64:: self.linux + self.amd64,
131131
darwin_amd64:: self.darwin + self.amd64,
132+
darwin_aarch64:: self.darwin + self.aarch64 + {
133+
# only needed until GR-22580 is resolved?
134+
python_version: 3,
135+
},
132136
windows_amd64:: self.windows + self.amd64,
133137
windows_server_2016_amd64:: self.windows_server_2016 + self.amd64,
134138
linux_aarch64:: self.linux + self.aarch64,

‎compiler/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@
22

33
This changelog summarizes newly introduced optimizations that may be relevant to other teams.
44

5+
## Version 22.2.0
6+
* (GR-16452) Compute the code emission basic block order after backend control flow optimizations.
7+
58
## Version 22.1.0
69
* (GR-36751): Removed the `DuplicateIrreducibleLoops` option. To disable irreducible loop handling, set
710
`-Dgraal.MaxDuplicationFactor` to a value less than or equal to 1. For AOT compilations, the effort
811
spent to handle irreducible loops is boosted to let Native Image support more programs with irreducible loops.
12+
* (GR-35033): Enable floating and global value numbering of division nodes early on in the compilation pipeline if
13+
it is known they will not trap.
914

1015
## Version 22.0.0
1116
* (GR-22707) (GR-30838): New, inner loops first, reverse post order and loop frequency calculations for the compiler.

‎compiler/ci_common/bench.hocon

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎compiler/ci_common/gate.jsonnet

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,10 @@
129129
{name: "gate-compiler-test-labsjdk-17-darwin-amd64"} + s.test + c.labsjdk17 + c.darwin_amd64 + t("1:00:00") + s.save_as_json + c.mach5_target,
130130
{name: "weekly-compiler-test-labsjdk-11-darwin-amd64"} + s.test + c.labsjdk11 + c.darwin_amd64 + s.weekly,
131131

132+
# Darwin AArch64
133+
{name: "gate-compiler-test-labsjdk-17-darwin-aarch64"} + s.test + c.labsjdk17 + c.darwin_aarch64 + t("1:00:00") + s.save_as_json,
134+
{name: "weekly-compiler-test-labsjdk-11-darwin-aarch64"} + s.test + c.labsjdk11 + c.darwin_aarch64 + s.weekly,
135+
132136
# Windows AMD64
133137
{name: "gate-compiler-test-labsjdk-11-windows-amd64"} + s.test + c.labsjdk11 + c.windows_amd64 + t("55:00") + c.devkits["windows-jdk11"] + s.save_as_json + c.mach5_target,
134138
{name: "gate-compiler-test-labsjdk-17-windows-amd64"} + s.test + c.labsjdk17 + c.windows_amd64 + t("55:00") + c.devkits["windows-jdk17"] + s.save_as_json + c.mach5_target,

0 commit comments

Comments
 (0)