Release 0.4.8 (#23)

WojciechMazur · web-flow · commit b60c19a95d7e · 2022-11-09T21:23:57.000+01:00
* Sync with Scala Native 0.4.8
* Setup env in CI
* Run scalafmt
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -7,13 +7,19 @@ jobs:
       fail-fast: false
       matrix:
         OS: [ubuntu-22.04, windows-2022]
-        scala: [2.12.15, 2.13.8, 3.2.0]
+        scala: [2.12.17, 2.13.10, 3.2.1]
     steps:
       - uses: actions/checkout@v2
       - uses: olafurpg/setup-scala@v13
+      - name: Set env Linux
+        if: ${{ startsWith(matrix.OS, 'ubuntu') }}
+        run: |
+          export LLVM_BIN=$(dirname $(readlink -f /usr/bin/clang))
+          echo "LLVM_BIN=${LLVM_BIN}" >> $GITHUB_ENV
+
       - name: Test
         run: >
-         sbt 'set cli/scalaVersion := "${{matrix.scala}}"'
-         +cli/test
-         +cliScriptedTests/scripted
+          sbt 'set cli/scalaVersion := "${{matrix.scala}}"'
+          +cli/test
+          +cliScriptedTests/scripted
         shell: bash
diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
-val crossScalaVersions212 = (13 to 16).map("2.12." + _)
-val crossScalaVersions213 = (4 to 8).map("2.13." + _)
-val crossScalaVersions3 = (0 to 3).map("3.1." + _) ++ (0 to 0).map("3.2." + _)
+val crossScalaVersions212 = (13 to 17).map("2.12." + _)
+val crossScalaVersions213 = (4 to 10).map("2.13." + _)
+val crossScalaVersions3 = (0 to 3).map("3.1." + _) ++ (0 to 1).map("3.2." + _)
 val publishScalaVersions =
   Seq(crossScalaVersions212, crossScalaVersions213).map(_.last) ++ Seq("3.1.3")
 
@@ -51,7 +51,7 @@ val cliAssemblyJarName = settingKey[String]("Name of created assembly jar")
 inThisBuild(
   Def.settings(
     organization := "org.scala-native",
-    scalaNativeVersion := "0.4.7",
+    scalaNativeVersion := "0.4.8",
     version := scalaNativeVersion.value,
     scalaVersion := crossScalaVersions212.last,
     crossScalaVersions := publishScalaVersions,
@@ -71,7 +71,8 @@ inThisBuild(
       )
     ),
     resolvers += Resolver.sonatypeRepo("snapshots"),
-    resolvers += Resolver.mavenCentral
+    resolvers += Resolver.mavenCentral,
+    resolvers += Resolver.defaultLocal
   )
 )
 val cliPackLibJars =
diff --git a/cli/src/main/scala/scala/scalanative/cli/ScalaNativeLd.scala b/cli/src/main/scala/scala/scalanative/cli/ScalaNativeLd.scala
@@ -1,12 +1,9 @@
 package scala.scalanative.cli
 
-import scala.scalanative.build.Build
+import scala.scalanative.build._
 import scala.scalanative.util.Scope
 import scala.scalanative.cli.utils.ConfigConverter
-import scala.scalanative.cli.options.LinkerOptions
-import scala.scalanative.cli.options.BuildInfo
-import scala.scalanative.cli.options.ConfigOptions
-import scala.scalanative.cli.options.NativeConfigOptions
+import scala.scalanative.cli.options._
 
 object ScalaNativeLd {
 
@@ -22,6 +19,7 @@ object ScalaNativeLd {
 
       ConfigOptions.set(this)
       NativeConfigOptions.set(this)
+      OptimizerConfigOptions.set(this)
 
       note("Logger options:")
       opt[Unit]("verbose")
@@ -50,7 +48,11 @@ object ScalaNativeLd {
   }
 
   def runLd(options: LinkerOptions) = {
-    if (options.config.main.isEmpty) {
+    val needsMain = options.nativeConfig.buildTarget match {
+      case BuildTarget.Application => true
+      case _: BuildTarget.Library  => false
+    }
+    if (needsMain && options.config.main.isEmpty) {
       println("Required option not specified: --main")
       sys.exit(1)
     } else {
@@ -59,7 +61,7 @@ object ScalaNativeLd {
       ignoredArgs.foreach { arg =>
         println(s"Unrecognised argument: ${arg}")
       }
-      val main = options.config.main.get
+      val main = options.config.main
       val buildOptionsMaybe = ConfigConverter.convert(options, main, classpath)
 
       buildOptionsMaybe match {
diff --git a/cli/src/main/scala/scala/scalanative/cli/options/ConfigOptions.scala b/cli/src/main/scala/scala/scalanative/cli/options/ConfigOptions.scala
@@ -16,7 +16,7 @@ object ConfigOptions {
       .valueName("<main>")
       .optional()
       .action((x, c) => c.copy(config = c.config.copy(main = Some(x))))
-      .text("Required main class.")
+      .text("Main class - entry point for application")
     parser
       .opt[String]('o', "outpath")
       .valueName("<output-path>")
diff --git a/cli/src/main/scala/scala/scalanative/cli/options/LinkerOptions.scala b/cli/src/main/scala/scala/scalanative/cli/options/LinkerOptions.scala
@@ -4,5 +4,6 @@ case class LinkerOptions(
     classpath: List[String] = Nil,
     config: ConfigOptions = ConfigOptions(),
     nativeConfig: NativeConfigOptions = NativeConfigOptions(),
+    optimizerConifg: OptimizerConfigOptions = OptimizerConfigOptions(),
     verbose: Int = 0
 )
diff --git a/cli/src/main/scala/scala/scalanative/cli/options/NativeConfigOptions.scala b/cli/src/main/scala/scala/scalanative/cli/options/NativeConfigOptions.scala
@@ -2,13 +2,12 @@ package scala.scalanative.cli.options
 
 import scopt.OptionParser
 
-import scala.scalanative.build.LTO
-import scala.scalanative.build.Mode
-import scala.scalanative.build.GC
+import scala.scalanative.build._
 import scala.scalanative.cli.utils.NativeConfigParserImplicits._
 
 case class NativeConfigOptions(
     mode: Mode = Mode.debug,
+    buildTarget: BuildTarget = BuildTarget.application,
     lto: LTO = LTO.none,
     gc: GC = GC.immix,
     linkStubs: Boolean = false,
@@ -34,6 +33,16 @@ object NativeConfigOptions {
       .optional()
       .action((x, c) => c.copy(nativeConfig = c.nativeConfig.copy(mode = x)))
       .text("Scala Native compilation mode. [debug]")
+    parser
+      .opt[BuildTarget]("build-target")
+      .valueName(
+        "<build-target> (application, library-dynamic or library-static)"
+      )
+      .optional()
+      .action((x, c) =>
+        c.copy(nativeConfig = c.nativeConfig.copy(buildTarget = x))
+      )
+      .text("Scala Native build target. [application]")
     parser
       .opt[LTO]("lto")
       .valueName("<mode> (none, thin or full)")
diff --git a/cli/src/main/scala/scala/scalanative/cli/options/OptimizerConfigOptions.scala b/cli/src/main/scala/scala/scalanative/cli/options/OptimizerConfigOptions.scala
@@ -0,0 +1,38 @@
+package scala.scalanative.cli.options
+
+import scopt.OptionParser
+
+case class OptimizerConfigOptions(
+    maxInlineDepth: Option[Int] = None,
+    maxCallerSize: Option[Int] = None,
+    maxInlineSize: Option[Int] = None
+)
+
+object OptimizerConfigOptions {
+  def set(parser: OptionParser[LinkerOptions]) = {
+    def update(c: LinkerOptions)(
+        fn: OptimizerConfigOptions => OptimizerConfigOptions
+    ) =
+      c.copy(optimizerConifg = fn(c.optimizerConifg))
+    parser.note("Optimizer options:")
+    parser
+      .opt[Int]("max-inline-depth")
+      .optional()
+      .action((x, c) => update(c)(_.copy(maxInlineDepth = Some(x))))
+      .text("Maximal number of allowed nested inlines.")
+    parser
+      .opt[Int]("max-caller-size")
+      .optional()
+      .action((x, c) => update(c)(_.copy(maxCallerSize = Some(x))))
+      .text(
+        "Maximal size (number of instructions) of the caller method which can accept inlines."
+      )
+    parser
+      .opt[Int]("max-inline-size")
+      .optional()
+      .action((x, c) => update(c)(_.copy(maxInlineSize = Some(x))))
+      .text(
+        "Maximal size (number of instructions) of the inlined method."
+      )
+  }
+}
diff --git a/cli/src/main/scala/scala/scalanative/cli/utils/ConfigConverter.scala b/cli/src/main/scala/scala/scalanative/cli/utils/ConfigConverter.scala
@@ -1,24 +1,27 @@
 package scala.scalanative.cli.utils
 
-import scala.scalanative.build.Config
-import scala.scalanative.build.NativeConfig
-import scala.scalanative.build.Discover
+import scala.scalanative.build._
 import java.nio.file.Paths
 import java.nio.file.Path
 import scala.util.Try
-import scala.scalanative.cli.options.LinkerOptions
+import scala.scalanative.cli.options._
 
 case class BuildOptions(
     config: Config,
     outpath: Path
 )
 
 object ConfigConverter {
-
   def convert(
       options: LinkerOptions,
       main: String,
       classpath: Seq[String]
+  ): Either[Throwable, BuildOptions] = convert(options, Some(main), classpath)
+
+  def convert(
+      options: LinkerOptions,
+      main: Option[String],
+      classpath: Seq[String]
   ): Either[Throwable, BuildOptions] = {
     if (classpath.isEmpty) {
       Left(
@@ -68,26 +71,36 @@ object ConfigConverter {
       .withCompileOptions(options.nativeConfig.compileOption)
       .withLinkingOptions(options.nativeConfig.linkingOption)
       .withLinktimeProperties(ltp)
+      .withBuildTarget(options.nativeConfig.buildTarget)
+      .withOptimizerConfig(generateOptimizerConfig(options.optimizerConifg))
+  }
+
+  private def generateOptimizerConfig(
+      options: OptimizerConfigOptions
+  ): OptimizerConfig = {
+    val c0 = OptimizerConfig.empty
+    val c1 = options.maxInlineDepth.foldLeft(c0)(_.withMaxInlineDepth(_))
+    val c2 = options.maxCallerSize.foldLeft(c1)(_.withMaxCallerSize(_))
+    val c3 = options.maxInlineSize.foldLeft(c2)(_.withMaxInlineSize(_))
+    c3
   }
 
   private def generateConfig(
       options: LinkerOptions,
-      main: String,
+      main: Option[String],
       classPath: Seq[String]
   ): Either[Throwable, Config] = {
     for {
       nativeConfig <- generateNativeConfig(options)
       classPath <- Try(parseClassPath(classPath)).toEither
     } yield {
-      val config = Config.empty
+      val baseConfig = Config.empty
         .withWorkdir(Paths.get(options.config.workdir).toAbsolutePath())
         .withCompilerConfig(nativeConfig)
         .withClassPath(classPath)
-        .withMainClass(main)
+        .withLogger(new FilteredLogger(options.verbose))
 
-      val verbosity = options.verbose
-      val logger = new FilteredLogger(verbosity)
-      config.withLogger(logger)
+      main.foldLeft(baseConfig)(_.withMainClass(_))
     }
   }
 
diff --git a/cli/src/main/scala/scala/scalanative/cli/utils/NativeConfigParserImplicits.scala b/cli/src/main/scala/scala/scalanative/cli/utils/NativeConfigParserImplicits.scala
@@ -1,8 +1,6 @@
 package scala.scalanative.cli.utils
 
-import scala.scalanative.build.LTO
-import scala.scalanative.build.GC
-import scala.scalanative.build.Mode
+import scala.scalanative.build._
 
 object NativeConfigParserImplicits {
 
@@ -30,4 +28,12 @@ object NativeConfigParserImplicits {
       case "release-full" => Mode.releaseFull
       case other          => throw new IllegalArgumentException(other)
     }
+
+  implicit val buildTargetRead: scopt.Read[BuildTarget] =
+    scopt.Read.reads {
+      case "application" | "app" | "default"    => BuildTarget.application
+      case "library-dynamic" | "library-shared" => BuildTarget.libraryDynamic
+      case "library-static"                     => BuildTarget.libraryStatic
+      case other => throw new IllegalArgumentException(other)
+    }
 }
diff --git a/cli/src/sbt-test/integration/cli/test b/cli/src/sbt-test/integration/cli/test
@@ -27,3 +27,12 @@ $ mkdir native-dir
 > runCli --outpath target/out6 -v -v --workdir native-dir --dump --main Main
 $ exists native-dir/optimized.hnir
 $ exists target/out6
+
+# -- Build dynamic library
+> runCli --outpath target/out7 --build-target=library-dynamic
+$ exists target/out7
+
+# -- Build static library
+> runCli --outpath target/out8 --build-target=library-static
+$ exists target/out8
+
diff --git a/cli/src/test/scala/scala/scalanative/cli/utils/ConfigConverterTest.scala b/cli/src/test/scala/scala/scalanative/cli/utils/ConfigConverterTest.scala
@@ -10,6 +10,7 @@ import scala.scalanative.build.GC
 import scala.scalanative.cli.utils.NativeConfigParserImplicits
 import scala.scalanative.build.Mode
 import scala.scalanative.build.LTO
+import scala.scalanative.build.BuildTarget
 
 class ConfigConverterTest extends AnyFlatSpec {
   val dummyConfigOptions = ConfigOptions(main = Some("Main"))
@@ -114,6 +115,28 @@ class ConfigConverterTest extends AnyFlatSpec {
     ltoAssertion("full", LTO.full)
   }
 
+  it should "handle NativeConfig Buildtarget correctly" in {
+    def checkParser(stringValue: String, expected: BuildTarget) = {
+      import NativeConfigParserImplicits.buildTargetRead
+      val target = implicitly[scopt.Read[BuildTarget]].reads(stringValue)
+      val options = LinkerOptions(
+        classpath = dummyArguments.toList,
+        config = dummyConfigOptions,
+        nativeConfig = NativeConfigOptions(buildTarget = target)
+      )
+      val parsed =
+        ConfigConverter
+          .convert(options, dummyMain, dummyArguments)
+          .map(_.config.compilerConfig.buildTarget)
+
+      assert(parsed.contains(expected))
+    }
+    checkParser("application", BuildTarget.application)
+    checkParser("app", BuildTarget.application)
+    checkParser("library-dynamic", BuildTarget.libraryDynamic)
+    checkParser("library-static", BuildTarget.libraryStatic)
+  }
+
   it should "set clang and clang++ correctly" in {
     val clangString = "/tmp/clang"
     val clangPPString = "tmp/clang++"
diff --git a/scripts/dist.sh b/scripts/dist.sh
@@ -1,15 +1,16 @@
 #/bin/bash
 
-Version=0.4.5
+set -x
+Version=0.4.8
 Scala3Version=3.1.3
 ReleaseDir="${PWD}/release"
 TargetDir="${PWD}/cli/target"
 
+sbt "clean;+cli/cliPack"
+
 mkdir -p ${ReleaseDir}
 cd $ReleaseDir
 
-sbt clean;+cliPack
-
 for ScalaBinVer in 2.12 2.13 3; do
   ScalaVersion=$ScalaBinVer
   if [ "$ScalaBinVer" = "3" ]; then

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,6 @@ case class LinkerOptions(`
`4`	`4`	`classpath: List[String] = Nil,`
`5`	`5`	`config: ConfigOptions = ConfigOptions(),`
`6`	`6`	`nativeConfig: NativeConfigOptions = NativeConfigOptions(),`
	`7`	`+ optimizerConifg: OptimizerConfigOptions = OptimizerConfigOptions(),`
`7`	`8`	`verbose: Int = 0`
`8`	`9`	`)`