Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cache Scala.js Linker to enable incremental linking #1007

Merged
merged 2 commits into from
Nov 24, 2020
Merged

Cache Scala.js Linker to enable incremental linking #1007

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd86efd
Cache Scala.js Linker to enable incremental linking
lolgab Nov 20, 2020
0268586
Use WeakReference to allow garbage collection of Linkers
lolgab Nov 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 33 additions & 18 deletions scalajslib/worker/0.6/src/ScalaJSWorkerImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,43 @@ import mill.scalajslib.api.{JsEnvConfig, ModuleKind}
import org.scalajs.core.tools.io.IRFileCache.IRContainer
import org.scalajs.core.tools.io._
import org.scalajs.core.tools.jsdep.ResolvedJSDependency
import org.scalajs.core.tools.linker.{ModuleInitializer, Semantics, StandardLinker, ModuleKind => ScalaJSModuleKind}
import org.scalajs.core.tools.linker.{Linker, ModuleInitializer, Semantics, StandardLinker, ModuleKind => ScalaJSModuleKind}
import org.scalajs.core.tools.logging.ScalaConsoleLogger
import org.scalajs.jsenv._
import org.scalajs.testadapter.TestAdapter

class ScalaJSWorkerImpl extends mill.scalajslib.api.ScalaJSWorkerApi {
private case class LinkerInput(fullOpt: Boolean, moduleKind: ModuleKind, useECMAScript2015: Boolean)
private object ScalaJSLinker {
private var cache = Map.empty[LinkerInput, Linker]
def reuseOrCreate(input: LinkerInput): Linker =
cache.getOrElse(
input,
{
val newLinker = createLinker(input)
cache += (input -> newLinker)
newLinker
}
)
private def createLinker(input: LinkerInput): Linker = {
val semantics = input.fullOpt match {
case true => Semantics.Defaults.optimized
case false => Semantics.Defaults
}
val scalaJSModuleKind = input.moduleKind match {
case ModuleKind.NoModule => ScalaJSModuleKind.NoModule
case ModuleKind.CommonJSModule => ScalaJSModuleKind.CommonJSModule
case ModuleKind.ESModule => ScalaJSModuleKind.ESModule
}
val config = StandardLinker.Config()
.withOptimizer(input.fullOpt)
.withClosureCompilerIfAvailable(input.fullOpt)
.withSemantics(semantics)
.withModuleKind(scalaJSModuleKind)
.withESFeatures(_.withUseECMAScript2015(input.useECMAScript2015))
StandardLinker(config)
}
}

def link(sources: Array[File],
libraries: Array[File],
Expand All @@ -24,23 +55,7 @@ class ScalaJSWorkerImpl extends mill.scalajslib.api.ScalaJSWorkerApi {
fullOpt: Boolean,
moduleKind: ModuleKind,
useECMAScript2015: Boolean) = {

val semantics = fullOpt match {
case true => Semantics.Defaults.optimized
case false => Semantics.Defaults
}
val scalaJSModuleKind = moduleKind match {
case ModuleKind.NoModule => ScalaJSModuleKind.NoModule
case ModuleKind.CommonJSModule => ScalaJSModuleKind.CommonJSModule
case ModuleKind.ESModule => ScalaJSModuleKind.ESModule
}
val config = StandardLinker.Config()
.withOptimizer(fullOpt)
.withClosureCompilerIfAvailable(fullOpt)
.withSemantics(semantics)
.withModuleKind(scalaJSModuleKind)
.withESFeatures(_.withUseECMAScript2015(useECMAScript2015))
val linker = StandardLinker(config)
val linker = ScalaJSLinker.reuseOrCreate(LinkerInput(fullOpt, moduleKind, useECMAScript2015))
val sourceSJSIRs = sources.map(new FileVirtualScalaJSIRFile(_))
val jars = libraries.map(jar => IRContainer.Jar(new FileVirtualBinaryFile(jar) with VirtualJarFile))
val jarSJSIRs = jars.flatMap(_.jar.sjsirFiles)
Expand Down
48 changes: 32 additions & 16 deletions scalajslib/worker/1/src/ScalaJSWorkerImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,37 @@ import org.scalajs.testing.adapter.TestAdapter
import org.scalajs.testing.adapter.{TestAdapterInitializer => TAI}

class ScalaJSWorkerImpl extends mill.scalajslib.api.ScalaJSWorkerApi {
private case class LinkerInput(fullOpt: Boolean, moduleKind: ModuleKind, useECMAScript2015: Boolean)
private object ScalaJSLinker {
private var cache = Map.empty[LinkerInput, Linker]
def reuseOrCreate(input: LinkerInput): Linker =
cache.getOrElse(
input,
{
val newLinker = createLinker(input)
cache += (input -> newLinker)
newLinker
}
)
private def createLinker(input: LinkerInput): Linker = {
val semantics = input.fullOpt match {
case true => Semantics.Defaults.optimized
case false => Semantics.Defaults
}
val scalaJSModuleKind = input.moduleKind match {
case ModuleKind.NoModule => ScalaJSModuleKind.NoModule
case ModuleKind.CommonJSModule => ScalaJSModuleKind.CommonJSModule
case ModuleKind.ESModule => ScalaJSModuleKind.ESModule
}
val config = StandardConfig()
.withOptimizer(input.fullOpt)
.withClosureCompilerIfAvailable(input.fullOpt)
.withSemantics(semantics)
.withModuleKind(scalaJSModuleKind)
.withESFeatures(_.withUseECMAScript2015(input.useECMAScript2015))
StandardImpl.linker(config)
}
}
def link(sources: Array[File],
libraries: Array[File],
dest: File,
Expand All @@ -26,22 +57,7 @@ class ScalaJSWorkerImpl extends mill.scalajslib.api.ScalaJSWorkerApi {
moduleKind: ModuleKind,
useECMAScript2015: Boolean) = {
import scala.concurrent.ExecutionContext.Implicits.global
val semantics = fullOpt match {
case true => Semantics.Defaults.optimized
case false => Semantics.Defaults
}
val scalaJSModuleKind = moduleKind match {
case ModuleKind.NoModule => ScalaJSModuleKind.NoModule
case ModuleKind.CommonJSModule => ScalaJSModuleKind.CommonJSModule
case ModuleKind.ESModule => ScalaJSModuleKind.ESModule
}
val config = StandardConfig()
.withOptimizer(fullOpt)
.withClosureCompilerIfAvailable(fullOpt)
.withSemantics(semantics)
.withModuleKind(scalaJSModuleKind)
.withESFeatures(_.withUseECMAScript2015(useECMAScript2015))
val linker = StandardImpl.linker(config)
val linker = ScalaJSLinker.reuseOrCreate(LinkerInput(fullOpt, moduleKind, useECMAScript2015))
val cache = StandardImpl.irFileCache().newCache
val sourceIRsFuture = Future.sequence(sources.toSeq.map(f => PathIRFile(f.toPath())))
val irContainersPairs = PathIRContainer.fromClasspath(libraries.map(_.toPath()))
Expand Down