mirror of
https://github.com/enso-org/enso.git
synced 2024-11-23 08:08:34 +03:00
Graal upgrade to 19.3.0 (#350)
This commit is contained in:
parent
e51a06e263
commit
85272edcb0
@ -17,16 +17,18 @@ trigger:
|
||||
pr: none
|
||||
|
||||
variables:
|
||||
graalVersion: 19.2.1 # Please ensure this is in sync with the graalAPIVersion in build.sbt
|
||||
graalVersion: 19.3.0 # Please ensure this is in sync with the graalAPIVersion in build.sbt
|
||||
graalReleasesUrl: https://github.com/graalvm/graalvm-ce-builds/releases/download
|
||||
graalDistributionName: graalvm-ce-java8
|
||||
sbtVersion: 1.3.3 # Please ensure this is in sync with project/build.properties
|
||||
|
||||
jobs:
|
||||
- job: Linux
|
||||
- job: Linux
|
||||
timeoutInMinutes: 90
|
||||
pool:
|
||||
vmImage: 'Ubuntu-16.04'
|
||||
container:
|
||||
image: oracle/graalvm-ce:$(graalVersion)
|
||||
image: oracle/graalvm-ce:$(graalVersion)-java8
|
||||
options: "--name ci-container -v /usr/bin/docker:/tmp/docker:ro"
|
||||
steps:
|
||||
- script: /tmp/docker exec -t -u 0 ci-container sh -c "yum install -y sudo"
|
||||
@ -68,18 +70,18 @@ jobs:
|
||||
echo "##vso[task.complete result=Failed;]DONE"
|
||||
condition: eq(variables['Agent.JobStatus'], 'SucceededWithIssues')
|
||||
displayName: Fail on Issues
|
||||
- job: macOS
|
||||
- job: macOS
|
||||
timeoutInMinutes: 90
|
||||
pool:
|
||||
vmImage: macOS-10.13
|
||||
steps:
|
||||
- script: |
|
||||
curl -fSL -o graal.tar.gz https://github.com/oracle/graal/releases/download/vm-$(graalVersion)/graalvm-ce-darwin-amd64-$(graalVersion).tar.gz
|
||||
curl -fSL -o graal.tar.gz $(graalReleasesUrl)/vm-$(graalVersion)/$(graalDistributionName)-darwin-amd64-$(graalVersion).tar.gz
|
||||
tar -x -z -C ~ -f graal.tar.gz
|
||||
ls ~/graalvm-ce-$(graalVersion)
|
||||
sudo mv ~/graalvm-ce-$(graalVersion) /Library/Java/JavaVirtualMachines
|
||||
echo "##vso[task.setvariable variable=JAVA_HOME]/Library/Java/JavaVirtualMachines/graalvm-ce-$(graalVersion)/Contents/Home"
|
||||
echo "##vso[task.setvariable variable=PATH]/Library/Java/JavaVirtualMachines/graalvm-ce-$(graalVersion)/Contents/Home/bin:$PATH"
|
||||
ls ~/$(graalDistributionName)-$(graalVersion)
|
||||
sudo mv ~/$(graalDistributionName)-$(graalVersion) /Library/Java/JavaVirtualMachines
|
||||
echo "##vso[task.setvariable variable=JAVA_HOME]/Library/Java/JavaVirtualMachines/$(graalDistributionName)-$(graalVersion)/Contents/Home"
|
||||
echo "##vso[task.setvariable variable=PATH]/Library/Java/JavaVirtualMachines/$(graalDistributionName)-$(graalVersion)/Contents/Home/bin:$PATH"
|
||||
displayName: Install GraalVM
|
||||
- script: |
|
||||
curl -fSL -o sbt.tgz https://piccolo.link/sbt-$(sbtVersion).tgz
|
||||
@ -106,13 +108,13 @@ jobs:
|
||||
echo "##vso[task.complete result=Failed;]DONE"
|
||||
condition: eq(variables['Agent.JobStatus'], 'SucceededWithIssues')
|
||||
displayName: Fail on Issues
|
||||
- job: Windows
|
||||
- job: Windows
|
||||
timeoutInMinutes: 90
|
||||
pool:
|
||||
vmImage: windows-2019
|
||||
steps:
|
||||
- script: |
|
||||
curl -fSL -o graal.zip https://github.com/oracle/graal/releases/download/vm-$(graalVersion)/graalvm-ce-windows-amd64-$(graalVersion).zip
|
||||
curl -fSL -o graal.zip $(graalReleasesUrl)/vm-$(graalVersion)/$(graalDistributionName)-windows-amd64-$(graalVersion).zip
|
||||
7z x -y -oC:\ graal.zip
|
||||
displayName: Install GraalVM
|
||||
- script: |
|
||||
@ -121,8 +123,8 @@ jobs:
|
||||
displayName: Install SBT
|
||||
- script: |
|
||||
call refreshenv
|
||||
echo ##vso[task.setvariable variable=JAVA_HOME]C:\graalvm-ce-$(graalVersion)
|
||||
echo ##vso[task.setvariable variable=PATH]C:\graalvm-ce-$(graalVersion)\bin;%PATH%
|
||||
echo ##vso[task.setvariable variable=JAVA_HOME]C:\$(graalDistributionName)-$(graalVersion)
|
||||
echo ##vso[task.setvariable variable=PATH]C:\$(graalDistributionName)-$(graalVersion)\bin;%PATH%
|
||||
echo ##vso[task.setvariable variable=PATH]%USERPROFILE%\sbt\bin\;%PATH%
|
||||
displayName: Adjust Environment Variables
|
||||
- script: |
|
||||
|
@ -9,7 +9,7 @@ import sbtassembly.AssemblyPlugin.defaultUniversalScript
|
||||
//////////////////////////////
|
||||
|
||||
val scalacVersion = "2.12.10"
|
||||
val graalVersion = "19.2.0.1"
|
||||
val graalVersion = "19.3.0"
|
||||
val circeVersion = "0.11.1"
|
||||
organization in ThisBuild := "org.enso"
|
||||
scalaVersion in ThisBuild := scalacVersion
|
||||
@ -300,7 +300,8 @@ lazy val project_manager = (project in file("common/scala/project-manager"))
|
||||
val truffleRunOptions = Seq(
|
||||
"-Dgraal.TruffleIterativePartialEscape=true",
|
||||
"-XX:-UseJVMCIClassLoader",
|
||||
"-Dgraal.TruffleBackgroundCompilation=false"
|
||||
"-Dgraal.TruffleBackgroundCompilation=false",
|
||||
"-Dgraalvm.locatorDisabled=true"
|
||||
)
|
||||
|
||||
val truffleRunOptionsSettings = Seq(
|
||||
|
@ -2,6 +2,7 @@
|
||||
"argv": [
|
||||
"java",
|
||||
"-XX:-UseJVMCIClassLoader",
|
||||
"-Dgraalvm.locatorDisabled=true",
|
||||
"-jar",
|
||||
"<ABSOLUTE_PATH_TO_ENSO_JAR>",
|
||||
"--jupyter-kernel",
|
||||
|
@ -45,7 +45,7 @@ public class LoopingCallOptimiserNode extends CallOptimiserNode {
|
||||
VirtualFrame frame = Truffle.getRuntime().createVirtualFrame(null, loopFrameDescriptor);
|
||||
((RepeatedCallNode) loopNode.getRepeatingNode())
|
||||
.setNextCall(frame, function, callerInfo, state, arguments);
|
||||
loopNode.executeLoop(frame);
|
||||
loopNode.execute(frame);
|
||||
|
||||
return ((RepeatedCallNode) loopNode.getRepeatingNode()).getResult(frame);
|
||||
}
|
||||
|
@ -55,7 +55,8 @@ public class Context {
|
||||
SourceFile::qualifiedName,
|
||||
srcFile ->
|
||||
new Module(
|
||||
getEnvironment().getTruffleFile(srcFile.file().getAbsolutePath()))));
|
||||
getEnvironment()
|
||||
.getInternalTruffleFile(srcFile.file().getAbsolutePath()))));
|
||||
|
||||
this.compiler = new Compiler(this.language, knownFiles, this);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user