Initial SpirvTools integration #39
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package io.computenode.cyfra.runtime | ||
|
|
||
| import io.computenode.cyfra.utility.Logger.logger | ||
|
|
||
| import java.nio.ByteBuffer | ||
|
|
||
| object SpirvDisassembler extends SpirvTool { | ||
|
|
||
| override type SpirvError = SpirvDisassemblerError | ||
| protected override val toolName: SupportedSpirVTools = SupportedSpirVTools.Disassembler | ||
|
|
||
| def getDisassembledSpirv(shaderCode: ByteBuffer, options: Param*): Option[String] = { | ||
| getOS.flatMap { os => | ||
| getToolExecutableFromPath( | ||
| toolName, os) | ||
| } match { | ||
| case None => | ||
| logger.warn("Shader code will not be disassembled.") | ||
| None | ||
| case Some(executable) => | ||
| val cmd = Seq(executable) ++ options.flatMap(_.asStringParam.split(" ")) ++ Seq("-") | ||
| val (outputStream, errorStream, exitCode) = executeSpirvCmd(shaderCode, cmd) | ||
|
|
||
| if (exitCode == 0) { | ||
| logger.debug("SPIRV-Tools Disassembler succeeded.") | ||
| Some(outputStream.toString) | ||
| } else { | ||
| throw SpirvDisassemblerError(s"SPIRV-Tools Disassembler failed with exit code $exitCode. ${errorStream.toString}") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override protected def createError(message: String): SpirvDisassemblerError = | ||
|
Member
There was a problem hiding this comment. let's jsut get rid of all that and just do some SpirvToolException |
||
| SpirvDisassemblerError(message) | ||
|
|
||
| case class SpirvDisassemblerError(msg: String) extends RuntimeException(msg) | ||
|
|
||
| case object NoIndent extends FlagParam("--no-indent") | ||
|
|
||
| case object NoHeader extends FlagParam("--no-header") | ||
|
|
||
| case object RawId extends FlagParam("--raw-id") | ||
|
|
||
| case object NestedIndent extends FlagParam("--nested-indent") | ||
|
|
||
| case object ReorderBlocks extends FlagParam("--reorder-blocks") | ||
|
|
||
| case object Offsets extends FlagParam("--offsets") | ||
|
|
||
| case object Comment extends FlagParam("--comment") | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| package io.computenode.cyfra.runtime | ||
|
|
||
| import io.computenode.cyfra.runtime.SpirvDisassembler.executeSpirvCmd | ||
| import io.computenode.cyfra.utility.Logger.logger | ||
|
|
||
| import java.nio.ByteBuffer | ||
|
|
||
| object SpirvOptimizer extends SpirvTool { | ||
|
|
||
| override type SpirvError = SpirvOptimizationError | ||
| protected override val toolName: SupportedSpirVTools = SupportedSpirVTools.Optimizer | ||
|
|
||
| def getOptimizedSpirv(shaderCode: ByteBuffer, optimization: Optimization): Option[ByteBuffer] = { | ||
| optimization match { | ||
| case Disable => None | ||
| case Enable(settings*) => | ||
| getOS.flatMap { os => | ||
| getToolExecutableFromPath( | ||
| toolName, os) | ||
| } match { | ||
| case None => | ||
| logger.warn("Shader code will not be optimized.") | ||
| None | ||
| case Some(executable) => | ||
| val cmd = Seq(executable) ++ settings.flatMap(_.asStringParam.split(" ")) ++ Seq("-", "-o", "-") | ||
| val (outputStream, errorStream, exitCode) = executeSpirvCmd(shaderCode, cmd) | ||
|
|
||
| if (exitCode == 0) { | ||
| logger.debug("SPIRV-Tools Optimizer succeeded.") | ||
| Some(toDirectBuffer(ByteBuffer.wrap(outputStream.toByteArray))) | ||
| } else { | ||
| throw SpirvOptimizationError(s"SPIRV-Tools Optimizer failed with exit code $exitCode.\n${errorStream.toString()}") | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private def toDirectBuffer(buf: ByteBuffer): ByteBuffer = { | ||
| val direct = ByteBuffer.allocateDirect(buf.remaining()) | ||
| direct.put(buf) | ||
| direct.flip() | ||
| direct | ||
| } | ||
|
|
||
| override protected def createError(message: String): SpirvOptimizationError = | ||
| SpirvOptimizationError(message) | ||
|
|
||
| sealed trait Optimization | ||
|
|
||
| case class SpirvOptimizationError(msg: String) extends RuntimeException(msg) | ||
|
|
||
| case class TargetEnv(version: String) extends ParamWithArgs("--target-env", version) | ||
|
|
||
| case class Enable(settings: Param*) extends Optimization | ||
|
|
||
| case object O extends FlagParam("-O") | ||
|
|
||
| case object Os extends FlagParam("-Os") | ||
|
|
||
| case object Disable extends Optimization | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we have this somewhere, like in Util object?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wasn't able to find it