Skip to content

Commit

Permalink
Update Scala 3 to 3.6.1 for sub-project
Browse files Browse the repository at this point in the history
  • Loading branch information
@plokhotnyuk
plokhotnyuk committed Oct 19, 2024
1 parent d3faea3 commit 176e16a
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 21 deletions.
18 changes: 9 additions & 9 deletions benchmark-t16.sh
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/bin/bash
sbt -batch -java-home /usr/lib/jvm/jdk-24 ++3.5.2-RC2 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -t 16 -p size=128 -prof gc -rf json -rff jdk-24-t16.json .*' 2>&1 | tee jdk-24-t16.txt
sbt -batch -java-home /usr/lib/jvm/jdk-21 ++3.5.2-RC2 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -t 16 -p size=128 -prof gc -rf json -rff jdk-21-t16.json .*' 2>&1 | tee jdk-21-t16.txt
sbt -batch -java-home /usr/lib/jvm/jdk-17 ++3.5.2-RC2 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -t 16 -p size=128 -prof gc -rf json -rff jdk-17-t16.json .*' 2>&1 | tee jdk-17-t16.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-jdk-24 ++3.5.2-RC2 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -t 16 -p size=128 -prof gc -rf json -rff graalvm-jdk-24-t16.json .*' 2>&1 | tee graalvm-jdk-24-t16.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-jdk-21 ++3.5.2-RC2 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -t 16 -p size=128 -prof gc -rf json -rff graalvm-jdk-21-t16.json .*' 2>&1 | tee graalvm-jdk-21-t16.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-jdk-17 ++3.5.2-RC2 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -t 16 -p size=128 -prof gc -rf json -rff graalvm-jdk-17-t16.json .*' 2>&1 | tee graalvm-jdk-17-t16.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-community-jdk-24 ++3.5.2-RC2 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -t 16 -p size=128 -prof gc -rf json -rff graalvm-community-jdk-24-t16.json .*' 2>&1 | tee graalvm-community-jdk-24-t16.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-community-jdk-21 ++3.5.2-RC2 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -t 16 -p size=128 -prof gc -rf json -rff graalvm-community-jdk-21-t16.json .*' 2>&1 | tee graalvm-community-jdk-21-t16.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-community-jdk-17 ++3.5.2-RC2 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -t 16 -p size=128 -prof gc -rf json -rff graalvm-community-jdk-17-t16.json .*' 2>&1 | tee graalvm-community-jdk-17-t16.txt
sbt -batch -java-home /usr/lib/jvm/jdk-24 ++3.6.1 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -t 16 -p size=128 -prof gc -rf json -rff jdk-24-t16.json .*' 2>&1 | tee jdk-24-t16.txt
sbt -batch -java-home /usr/lib/jvm/jdk-21 ++3.6.1 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -t 16 -p size=128 -prof gc -rf json -rff jdk-21-t16.json .*' 2>&1 | tee jdk-21-t16.txt
sbt -batch -java-home /usr/lib/jvm/jdk-17 ++3.6.1 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -t 16 -p size=128 -prof gc -rf json -rff jdk-17-t16.json .*' 2>&1 | tee jdk-17-t16.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-jdk-24 ++3.6.1 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -t 16 -p size=128 -prof gc -rf json -rff graalvm-jdk-24-t16.json .*' 2>&1 | tee graalvm-jdk-24-t16.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-jdk-21 ++3.6.1 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -t 16 -p size=128 -prof gc -rf json -rff graalvm-jdk-21-t16.json .*' 2>&1 | tee graalvm-jdk-21-t16.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-jdk-17 ++3.6.1 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -t 16 -p size=128 -prof gc -rf json -rff graalvm-jdk-17-t16.json .*' 2>&1 | tee graalvm-jdk-17-t16.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-community-jdk-24 ++3.6.1 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -t 16 -p size=128 -prof gc -rf json -rff graalvm-community-jdk-24-t16.json .*' 2>&1 | tee graalvm-community-jdk-24-t16.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-community-jdk-21 ++3.6.1 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -t 16 -p size=128 -prof gc -rf json -rff graalvm-community-jdk-21-t16.json .*' 2>&1 | tee graalvm-community-jdk-21-t16.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-community-jdk-17 ++3.6.1 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -t 16 -p size=128 -prof gc -rf json -rff graalvm-community-jdk-17-t16.json .*' 2>&1 | tee graalvm-community-jdk-17-t16.txt
18 changes: 9 additions & 9 deletions benchmark.sh
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/bin/bash
sbt -batch -java-home /usr/lib/jvm/jdk-24 ++3.5.2-RC2 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -p size=128 -prof gc -rf json -rff jdk-24.json .*' 2>&1 | tee jdk-24.txt
sbt -batch -java-home /usr/lib/jvm/jdk-21 ++3.5.2-RC2 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -p size=128 -prof gc -rf json -rff jdk-21.json .*' 2>&1 | tee jdk-21.txt
sbt -batch -java-home /usr/lib/jvm/jdk-17 ++3.5.2-RC2 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -p size=128 -prof gc -rf json -rff jdk-17.json .*' 2>&1 | tee jdk-17.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-jdk-24 ++3.5.2-RC2 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -p size=128 -prof gc -rf json -rff graalvm-jdk-24.json .*' 2>&1 | tee graalvm-jdk-24.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-jdk-21 ++3.5.2-RC2 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -p size=128 -prof gc -rf json -rff graalvm-jdk-21.json .*' 2>&1 | tee graalvm-jdk-21.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-jdk-17 ++3.5.2-RC2 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -p size=128 -prof gc -rf json -rff graalvm-jdk-17.json .*' 2>&1 | tee graalvm-jdk-17.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-community-jdk-24 ++3.5.2-RC2 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -p size=128 -prof gc -rf json -rff graalvm-community-jdk-24.json .*' 2>&1 | tee graalvm-community-jdk-24.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-community-jdk-21 ++3.5.2-RC2 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -p size=128 -prof gc -rf json -rff graalvm-community-jdk-21.json .*' 2>&1 | tee graalvm-community-jdk-21.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-community-jdk-17 ++3.5.2-RC2 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -p size=128 -prof gc -rf json -rff graalvm-community-jdk-17.json .*' 2>&1 | tee graalvm-community-jdk-17.txt
sbt -batch -java-home /usr/lib/jvm/jdk-24 ++3.6.1 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -p size=128 -prof gc -rf json -rff jdk-24.json .*' 2>&1 | tee jdk-24.txt
sbt -batch -java-home /usr/lib/jvm/jdk-21 ++3.6.1 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -p size=128 -prof gc -rf json -rff jdk-21.json .*' 2>&1 | tee jdk-21.txt
sbt -batch -java-home /usr/lib/jvm/jdk-17 ++3.6.1 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -p size=128 -prof gc -rf json -rff jdk-17.json .*' 2>&1 | tee jdk-17.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-jdk-24 ++3.6.1 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -p size=128 -prof gc -rf json -rff graalvm-jdk-24.json .*' 2>&1 | tee graalvm-jdk-24.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-jdk-21 ++3.6.1 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -p size=128 -prof gc -rf json -rff graalvm-jdk-21.json .*' 2>&1 | tee graalvm-jdk-21.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-jdk-17 ++3.6.1 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -p size=128 -prof gc -rf json -rff graalvm-jdk-17.json .*' 2>&1 | tee graalvm-jdk-17.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-community-jdk-24 ++3.6.1 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -p size=128 -prof gc -rf json -rff graalvm-community-jdk-24.json .*' 2>&1 | tee graalvm-community-jdk-24.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-community-jdk-21 ++3.6.1 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -p size=128 -prof gc -rf json -rff graalvm-community-jdk-21.json .*' 2>&1 | tee graalvm-community-jdk-21.txt
sbt -batch -java-home /usr/lib/jvm/graalvm-community-jdk-17 ++3.6.1 clean 'jsoniter-scala-benchmarkJVM/jmh:run -jvmArgsAppend "-Djmh.executor=FJP" -p size=128 -prof gc -rf json -rff graalvm-community-jdk-17.json .*' 2>&1 | tee graalvm-community-jdk-17.txt
2 changes: 1 addition & 1 deletion build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ lazy val `jsoniter-scala-benchmark` = crossProject(JVMPlatform, JSPlatform)
.settings(commonSettings)
.settings(noPublishSettings)
.settings(
crossScalaVersions := Seq("3.5.2-RC2", "2.13.15"),
crossScalaVersions := Seq("3.6.1", "2.13.15"),
scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, _)) => Seq()
case _ => Seq("-source:3.3", "-Xmax-inlines:100")
Expand Down
4 changes: 2 additions & 2 deletions jsoniter-scala-benchmark/js/scala-3-fullopt.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</head>
<body>
<div id="body">Loading...</div>
<script type="text/javascript" src="target/scala-3.5.2-RC2/jsoniter-scala-benchmark-jsdeps.min.js"></script>
<script type="text/javascript" src="target/scala-3.5.2-RC2/jsoniter-scala-benchmark-opt.js"></script>
<script type="text/javascript" src="target/scala-3.6.1/jsoniter-scala-benchmark-jsdeps.min.js"></script>
<script type="text/javascript" src="target/scala-3.6.1/jsoniter-scala-benchmark-opt.js"></script>
</body>
</html>

0 comments on commit 176e16a

Please sign in to comment.