Improve compile-time optimizations (zio#9021)

* Enable inlining from scala std lib and all of zio * Enable optimizers when running mima checks
hearnadam · Jul 19, 2024 · 63980f2 · 63980f2
1 parent 0e799a9
commit 63980f2
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -168,7 +168,8 @@ jobs:
       uses: coursier/cache-action@v6
     - name: Mima Checks
       if: ${{ !startsWith(matrix.scala, '3.') }}
-      run: sbt -v ++${{ matrix.scala }} mimaChecks
+      # Enable optimizers as inlining might affect binary compatibility in rare cases
+      run: CI_RELEASE_MODE=1 sbt -v ++${{ matrix.scala }} mimaChecks
     - name: Test 2.12
       if: ${{ startsWith(matrix.scala, '2.12.') }}
       run: sbt -v ++${{ matrix.scala }} test${{ matrix.platform }}
@@ -300,7 +301,8 @@ jobs:
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-
+          CI_RELEASE_MODE: 1 # Needed to enable optimizers
+
   publish-website:
     needs: [ci]
     if: github.event_name != 'pull_request'

diff --git a/core/shared/src/main/scala/zio/internal/FiberRuntime.scala b/core/shared/src/main/scala/zio/internal/FiberRuntime.scala
@@ -1521,7 +1521,7 @@ object FiberRuntime {
    * For Scala 3, `-X-elide-below` is ignored, and therefore we need to use an
    * '''inlinable''' build-time constant to disable assertions
    */
-  private final val DisableAssertions = !BuildInfo.isSnapshot
+  private final val DisableAssertions = BuildInfo.optimizationsEnabled
 
   private type EvaluationSignal = Int
   private object EvaluationSignal {

diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala
@@ -11,6 +11,12 @@ object BuildHelper {
   val Scala213: String = "2.13.13"
   val Scala3: String   = "3.3.3"
 
+  lazy val isRelease = {
+    val value = sys.env.get("CI_RELEASE_MODE").isDefined
+    if (value) println("Detected CI_RELEASE_MODE envvar, enabling optimizations")
+    value
+  }
+
   private val stdOptions = Seq(
     "-deprecation",
     "-encoding",
@@ -40,7 +46,8 @@ object BuildHelper {
       Seq(
         "-opt:l:method",
         "-opt:l:inline",
-        "-opt-inline-from:zio.internal.**",
+        "-opt-inline-from:zio.**",
+        "-opt-inline-from:scala.**",
         // To remove calls to `assert` in releases. Assertions are level 2000
         "-Xelide-below",
         "2001"
@@ -51,7 +58,16 @@ object BuildHelper {
     Seq(
       // BuildInfoOption.ConstantValue required to disable assertions in FiberRuntime!
       buildInfoOptions += BuildInfoOption.ConstantValue,
-      buildInfoKeys    := Seq[BuildInfoKey](organization, moduleName, name, version, scalaVersion, sbtVersion, isSnapshot),
+      buildInfoKeys := Seq[BuildInfoKey](
+        organization,
+        moduleName,
+        name,
+        version,
+        scalaVersion,
+        sbtVersion,
+        isSnapshot,
+        BuildInfoKey("optimizationsEnabled" -> isRelease)
+      ),
       buildInfoPackage := packageName
     )
 
@@ -106,7 +122,8 @@ object BuildHelper {
         )
       case Some((2, 13)) =>
         Seq(
-          "-Ywarn-unused:params,-implicits"
+          "-Ywarn-unused:params,-implicits",
+          "-Ybackend-parallelism:4"
         ) ++ std2xOptions ++ optimizerOptions(optimize)
       case Some((2, 12)) =>
         Seq(
@@ -172,7 +189,7 @@ object BuildHelper {
     name                     := s"$prjName",
     crossScalaVersions       := Seq(Scala212, Scala213, Scala3),
     ThisBuild / scalaVersion := Scala213,
-    scalacOptions ++= stdOptions ++ extraOptions(scalaVersion.value, optimize = !isSnapshot.value),
+    scalacOptions ++= stdOptions ++ extraOptions(scalaVersion.value, optimize = isRelease || !isSnapshot.value),
     scalacOptions --= {
       if (scalaVersion.value == Scala3)
         List("-Xfatal-warnings")