interpreter

.github/workflows/ci.yml

@@ -6,9 +6,11 @@ on:
     tags:
       - "v*"
   pull_request:
+    branches:
+      - dev
 
 jobs:
-  format:
+  format_and_compile:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -19,4 +21,4 @@ jobs:
         with:
           jvm: graalvm-java21
           apps: sbt
-      - run: sbt "formatCheckAll"
+      - run: sbt "formatCheckAll; compile"

.scalafmt.conf

@@ -8,6 +8,7 @@ optIn.configStyleArguments = false
 rewrite.rules = [RedundantBraces, RedundantParens, SortModifiers, PreferCurlyFors, Imports]
 rewrite.sortModifiers.preset = styleGuide
 rewrite.trailingCommas.style = always
+rewrite.scala3.convertToNewSyntax = true
 
 indent.defnSite = 2
 newlines.inInterpolation = "avoid"

README.md

@@ -3,8 +3,10 @@
 Library provides a way to compile Scala 3 DSL to SPIR-V and to run it with Vulkan runtime on GPUs.
 
 It is multiplatform. It works on:
- - Linux, Windows, and Mac (for Mac requires installation of moltenvk).
- - Any dedicated or integrated GPUs that support Vulkan. In practice, it means almost all moderately modern devices from most manufacturers including Nvidia, AMD, Intel, Apple.
+
+- Linux, Windows, and Mac (for Mac requires installation of moltenvk).
+- Any dedicated or integrated GPUs that support Vulkan. In practice, it means almost all moderately modern devices from
+  most manufacturers including Nvidia, AMD, Intel, Apple.
 
 Library is in an early stage - alpha release and proper documentation are coming.
 
@@ -15,22 +17,27 @@ Included Foton library provides a clean and fun way to animate functions and ray
 ## Examples
 
 ### Ray traced animation
+
 ![output](https://github.com/user-attachments/assets/3eac9f7f-72df-4a5d-b768-9117d651c78d)
 
 [code](https://github.com/ComputeNode/cyfra/blob/50aecea/cyfra-examples/src/main/scala/io/computenode/samples/cyfra/foton/AnimatedRaytrace.scala)
-(this is API usage, to see ray tracing implementation look at [RtRenderer](https://github.com/ComputeNode/cyfra/blob/50aecea132188776021afe0b407817665676a021/cyfra-foton/src/main/scala/io/computenode/cyfra/foton/rt/RtRenderer.scala))
+(this is API usage, to see ray tracing implementation look
+at [RtRenderer](https://github.com/ComputeNode/cyfra/blob/50aecea132188776021afe0b407817665676a021/cyfra-foton/src/main/scala/io/computenode/cyfra/foton/rt/RtRenderer.scala))
 
 ### Animated Julia set
+
 <img src="assets/julia.gif" width="360">
 
 [code](https://github.com/ComputeNode/cyfra/blob/50aecea132188776021afe0b407817665676a021/cyfra-examples/src/main/scala/io/computenode/samples/cyfra/foton/AnimatedJulia.scala)
 
 ## Animation features examples
 
 ### Custom animated functions
+
 <img src="https://github.com/user-attachments/assets/1030d968-014a-4c2c-8f21-26b999fe57fc" width="650">
 
 ### Animated ray traced scene
+
 <img src="https://github.com/user-attachments/assets/a4189bc3-e2a9-4e52-9363-93f83b530595" width="750">
 
 ## Coding features examples
@@ -48,9 +55,15 @@ Included Foton library provides a clean and fun way to animate functions and ray
 
 ## Development
 
-To enable validation layers for vulkan, you need to install vulkan SKD. After installing, set the following VM options:
+To enable validation layers for vulkan, you need to install vulkan SKD. After installing, set the following VM option:
+
 ```
--Dorg.lwjgl.vulkan.libname=libvulkan.1.dylib
 -Dio.computenode.cyfra.vulkan.validation=true
+```
+
+If you are on MacOs, then also add:
+
+```
+-Dorg.lwjgl.vulkan.libname=libvulkan.1.dylib
 -Djava.library.path=$VULKAN_SDK/lib
 ```

build.sbt

@@ -1,8 +1,8 @@
 ThisBuild / organization := "com.computenode.cyfra"
 ThisBuild / scalaVersion := "3.6.4"
-ThisBuild / version := "0.1.0-SNAPSHOT"
+ThisBuild / version := "0.2.0-SNAPSHOT"
 
-val lwjglVersion = "3.3.6"
+val lwjglVersion = "3.4.0-SNAPSHOT"
 val jomlVersion = "1.10.0"
 
 lazy val osName = System.getProperty("os.name").toLowerCase
@@ -36,8 +36,10 @@ lazy val vulkanNatives =
   else Seq.empty
 
 lazy val commonSettings = Seq(
+  scalacOptions ++= Seq("-feature", "-deprecation", "-unchecked", "-language:implicitConversions"),
+  resolvers += "maven snapshots" at "https://central.sonatype.com/repository/maven-snapshots/",
   libraryDependencies ++= Seq(
-    "dev.zio" % "izumi-reflect_3" % "2.3.10",
+    "dev.zio" % "izumi-reflect_3" % "3.0.5",
     "com.lihaoyi" % "pprint_3" % "0.9.0",
     "com.diogonunes" % "JColor" % "5.5.1",
     "org.lwjgl" % "lwjgl" % lwjglVersion,
@@ -47,54 +49,72 @@ lazy val commonSettings = Seq(
     "org.lwjgl" % "lwjgl-vma" % lwjglVersion classifier lwjglNatives,
     "org.joml" % "joml" % jomlVersion,
     "commons-io" % "commons-io" % "2.16.1",
-    "org.slf4j" % "slf4j-api" % "1.7.30",
-    "org.slf4j" % "slf4j-simple" % "1.7.30" % Test,
     "org.scalameta" % "munit_3" % "1.0.0" % Test,
     "com.lihaoyi" %% "sourcecode" % "0.4.3-M5",
     "org.slf4j" % "slf4j-api" % "2.0.17",
+    "org.apache.logging.log4j" % "log4j-slf4j2-impl" % "2.24.3" % Test,
   ) ++ vulkanNatives,
 )
 
 lazy val runnerSettings = Seq(libraryDependencies += "org.apache.logging.log4j" % "log4j-slf4j2-impl" % "2.24.3")
 
+lazy val fs2Settings = Seq(libraryDependencies ++= Seq("co.fs2" %% "fs2-core" % "3.12.0", "co.fs2" %% "fs2-io" % "3.12.0"))
+
 lazy val utility = (project in file("cyfra-utility"))
   .settings(commonSettings)
 
+lazy val spirvTools = (project in file("cyfra-spirv-tools"))
+  .settings(commonSettings)
+  .dependsOn(utility)
+
 lazy val vulkan = (project in file("cyfra-vulkan"))
   .settings(commonSettings)
   .dependsOn(utility)
 
 lazy val dsl = (project in file("cyfra-dsl"))
   .settings(commonSettings)
-  .dependsOn(vulkan, utility)
+  .dependsOn(utility)
 
 lazy val compiler = (project in file("cyfra-compiler"))
   .settings(commonSettings)
   .dependsOn(dsl, utility)
 
+lazy val core = (project in file("cyfra-core"))
+  .settings(commonSettings)
+  .dependsOn(compiler, dsl, utility, spirvTools)
+
 lazy val runtime = (project in file("cyfra-runtime"))
   .settings(commonSettings)
-  .dependsOn(compiler, dsl, vulkan, utility)
+  .dependsOn(core, vulkan)
 
 lazy val foton = (project in file("cyfra-foton"))
   .settings(commonSettings)
   .dependsOn(compiler, dsl, runtime, utility)
 
 lazy val examples = (project in file("cyfra-examples"))
   .settings(commonSettings, runnerSettings)
+  .settings(libraryDependencies += "org.scala-lang.modules" % "scala-parallel-collections_3" % "1.2.0")
   .dependsOn(foton)
 
 lazy val vscode = (project in file("cyfra-vscode"))
   .settings(commonSettings)
   .dependsOn(foton)
 
+lazy val interpreter = (project in file("cyfra-interpreter"))
+  .settings(commonSettings)
+  .dependsOn(dsl, compiler)
+
+lazy val fs2interop = (project in file("cyfra-fs2"))
+  .settings(commonSettings, fs2Settings)
+  .dependsOn(runtime)
+
 lazy val e2eTest = (project in file("cyfra-e2e-test"))
   .settings(commonSettings, runnerSettings)
-  .dependsOn(runtime)
+  .dependsOn(runtime, fs2interop, interpreter)
 
 lazy val root = (project in file("."))
   .settings(name := "Cyfra")
-  .aggregate(compiler, dsl, foton, runtime, vulkan, examples)
+  .aggregate(compiler, dsl, foton, core, runtime, vulkan, examples, fs2interop, interpreter)
 
 e2eTest / Test / javaOptions ++= Seq("-Dorg.lwjgl.system.stackSize=1024", "-DuniqueLibraryNames=true")
 

cyfra-compiler/src/main/scala/io/computenode/cyfra/spirv/BlockBuilder.scala

@@ -1,20 +1,15 @@
 package io.computenode.cyfra.spirv
 
-import io.computenode.cyfra.dsl.Control.Scope
-import io.computenode.cyfra.dsl.Expression.{E, FunctionCall}
-import io.computenode.cyfra.dsl.Value
-import io.computenode.cyfra.dsl.macros.Source
-import izumi.reflect.Tag
+import io.computenode.cyfra.dsl.Expression.E
 
 import scala.collection.mutable
-import scala.quoted.Expr
 
 private[cyfra] object BlockBuilder:
 
-  def buildBlock(tree: E[_], providedExprIds: Set[Int] = Set.empty): List[E[_]] =
-    val allVisited = mutable.Map[Int, E[_]]()
+  def buildBlock(tree: E[?], providedExprIds: Set[Int] = Set.empty): List[E[?]] =
+    val allVisited = mutable.Map[Int, E[?]]()
     val inDegrees = mutable.Map[Int, Int]().withDefaultValue(0)
-    val q = mutable.Queue[E[_]]()
+    val q = mutable.Queue[E[?]]()
     q.enqueue(tree)
     allVisited(tree.treeid) = tree
 
@@ -28,8 +23,8 @@ private[cyfra] object BlockBuilder:
           allVisited(childId) = child
           q.enqueue(child)
 
-    val l = mutable.ListBuffer[E[_]]()
-    val roots = mutable.Queue[E[_]]()
+    val l = mutable.ListBuffer[E[?]]()
+    val roots = mutable.Queue[E[?]]()
     allVisited.values.foreach: node =>
       if inDegrees(node.treeid) == 0 then roots.enqueue(node)
 

cyfra-compiler/src/main/scala/io/computenode/cyfra/spirv/Context.scala

@@ -1,9 +1,9 @@
 package io.computenode.cyfra.spirv
 
+import io.computenode.cyfra.dsl.binding.{GBuffer, GUniform}
 import io.computenode.cyfra.dsl.macros.FnCall.FnIdentifier
-import io.computenode.cyfra.dsl.macros.Source
-import io.computenode.cyfra.spirv.compilers.FunctionCompiler.SprivFunction
 import io.computenode.cyfra.spirv.SpirvConstants.HEADER_REFS_TOP
+import io.computenode.cyfra.spirv.compilers.FunctionCompiler.SprivFunction
 import io.computenode.cyfra.spirv.compilers.SpirvProgramCompiler.ArrayBufferBlock
 import izumi.reflect.Tag
 import izumi.reflect.macrortti.LightTypeTag
@@ -17,16 +17,17 @@ private[cyfra] case class Context(
   voidTypeRef: Int = -1,
   voidFuncTypeRef: Int = -1,
   workerIndexRef: Int = -1,
-  uniformVarRef: Int = -1,
-  constRefs: Map[(Tag[_], Any), Int] = Map(),
+  uniformVarRefs: Map[GUniform[?], Int] = Map.empty,
+  bindingToStructType: Map[Int, Int] = Map.empty,
+  constRefs: Map[(Tag[?], Any), Int] = Map(),
   exprRefs: Map[Int, Int] = Map(),
-  inBufferBlocks: List[ArrayBufferBlock] = List(),
-  outBufferBlocks: List[ArrayBufferBlock] = List(),
+  bufferBlocks: Map[GBuffer[?], ArrayBufferBlock] = Map(),
   nextResultId: Int = HEADER_REFS_TOP,
   nextBinding: Int = 0,
   exprNames: Map[Int, String] = Map(),
-  memberNames: Map[Int, String] = Map(),
+  names: Set[String] = Set(),
   functions: Map[FnIdentifier, SprivFunction] = Map(),
+  stringLiterals: Map[String, Int] = Map(),
 ):
   def joinNested(ctx: Context): Context =
     this.copy(nextResultId = ctx.nextResultId, exprNames = ctx.exprNames ++ this.exprNames, functions = ctx.functions ++ this.functions)