Skip to content

chore: add some static optimization #294

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

Merged
stephenamar-db merged 1 commit into from
Apr 21, 2025
Merged

chore: add some static optimization #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions sjsonnet/src/sjsonnet/Error.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package sjsonnet

import fastparse.IndexedParserInput

import scala.util.control.NonFatal

/**
Expand Down
3 changes: 1 addition & 2 deletions sjsonnet/src/sjsonnet/Evaluator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package sjsonnet

import Expr.{Error => _, _}
import sjsonnet.Expr.Member.Visibility
import sjsonnet.Expr.{Error => _, _}
import ujson.Value

import scala.annotation.tailrec
import scala.collection.mutable

/**
* Recursively walks the [[Expr]] trees to convert them into into [[Val]]
Expand Down
71 changes: 70 additions & 1 deletion sjsonnet/src/sjsonnet/StaticOptimizer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,80 @@ class StaticOptimizer(
case Lookup(pos, ValidSuper(_, selfIdx), index) =>
LookupSuper(pos, selfIdx, index)

case b2 @ BinaryOp(pos, lhs, BinaryOp.OP_in, ValidSuper(_, selfIdx)) =>
case BinaryOp(pos, lhs, BinaryOp.OP_in, ValidSuper(_, selfIdx)) =>
InSuper(pos, lhs, selfIdx)
case BinaryOp(pos, Val.Str(_, key), BinaryOp.OP_in, obj: Val.Obj) if obj.staticSafe =>
Val.bool(pos, obj.containsKey(key))
case b2 @ BinaryOp(pos, lhs: Val.Str, BinaryOp.OP_%, rhs) =>
try ApplyBuiltin1(pos, new Format.PartialApplyFmt(lhs.value), rhs, tailstrict = false)
catch { case _: Exception => b2 }
//optimize booleans
case Or(_, Val.False(_), rhs) => transform(rhs)
case Or(pos, Val.True(_), _) => Val.True(pos)
case Or(pos, _, Val.True(_)) => Val.True(pos)
case And(_, Val.True(_), rhs) => transform(rhs)
case And(pos, Val.False(_), _) => Val.False(pos)
case And(pos, _, Val.False(_)) => Val.False(pos)
case UnaryOp(pos, UnaryOp.OP_!, Val.True(_)) => Val.False(pos)
case UnaryOp(pos, UnaryOp.OP_!, Val.False(_)) => Val.True(pos)
case UnaryOp(_, UnaryOp.OP_!, UnaryOp(_, UnaryOp.OP_!, expr)) => expr
//optimize for numbers
case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_+, Val.Num(_, r)) => Val.Num(pos, l + r)
case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_-, Val.Num(_, r)) => Val.Num(pos, l - r)
case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_*, Val.Num(_, r)) => Val.Num(pos, l * r)
case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_/, Val.Num(_, r)) if r != 0 => Val.Num(pos, l / r)
case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_%, Val.Num(_, r)) if r != 0 => Val.Num(pos, l % r)
case UnaryOp(pos, UnaryOp.OP_!, Val.False(_)) => Val.True(pos)
case UnaryOp(pos, UnaryOp.OP_!, Val.True(_)) => Val.False(pos)
case UnaryOp(pos, UnaryOp.OP_+, Val.Num(_, v)) => Val.Num(pos, v)
case UnaryOp(pos, UnaryOp.OP_-, Val.Num(_, v)) => Val.Num(pos, -v)
case UnaryOp(pos, UnaryOp.OP_~, Val.Num(_, v)) => Val.Num(pos, ~v.toLong)
//optimize for bitwise
case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_&, Val.Num(_, r)) =>
Val.Num(pos, l.toLong & r.toLong)
case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_^, Val.Num(_, r)) =>
Val.Num(pos, l.toLong ^ r.toLong)
case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_|, Val.Num(_, r)) =>
Val.Num(pos, l.toLong | r.toLong)
case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_<<, Val.Num(_, r)) if r.isValidInt =>
Val.Num(pos, l.toLong << r.toInt)
case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_>>, Val.Num(_, r)) if r.isValidInt =>
Val.Num(pos, l.toLong >> r.toInt)
//optimize for strings
case BinaryOp(pos, Val.Str(_, l), BinaryOp.OP_+, Val.Str(_, r)) => Val.Str(pos, l + r)
//optimize for comparing
case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_==, Val.Num(_, r)) => Val.bool(pos, l == r)
case BinaryOp(pos, Val.Str(_, l), BinaryOp.OP_==, Val.Str(_, r)) => Val.bool(pos, l == r)
case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_!=, Val.Num(_, r)) => Val.bool(pos, l != r)
case BinaryOp(pos, Val.Str(_, l), BinaryOp.OP_!=, Val.Str(_, r)) => Val.bool(pos, l != r)
case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_<, Val.Num(_, r)) => Val.bool(pos, l < r)
case BinaryOp(pos, Val.Str(_, l), BinaryOp.OP_<, Val.Str(_, r)) => Val.bool(pos, l < r)
case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_>, Val.Num(_, r)) => Val.bool(pos, l > r)
case BinaryOp(pos, Val.Str(_, l), BinaryOp.OP_>, Val.Str(_, r)) => Val.bool(pos, l > r)
case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_<=, Val.Num(_, r)) => Val.bool(pos, l <= r)
case BinaryOp(pos, Val.Str(_, l), BinaryOp.OP_<=, Val.Str(_, r)) => Val.bool(pos, l <= r)
case BinaryOp(pos, Val.Num(_, l), BinaryOp.OP_>=, Val.Num(_, r)) => Val.bool(pos, l >= r)
case BinaryOp(pos, Val.Str(_, l), BinaryOp.OP_>=, Val.Str(_, r)) => Val.bool(pos, l >= r)
//optimize for if else
case IfElse(_, Val.True(_), thenExpr, _) => transform(thenExpr)
case IfElse(pos, Val.False(_), _, elseExpr) => `elseExpr` match {
case null => Val.Null(pos)
case _ => transform(elseExpr)
}
//optimize for obj
case b3@BinaryOp(_, lhs: Val.Obj, BinaryOp.OP_+, rhs: Val.Obj) if lhs.staticSafe && rhs.staticSafe =>
if (lhs.allKeyNames.isEmpty) {
rhs
} else if (rhs.allKeyNames.isEmpty) {
lhs
} else b3
//optimize for arr
case b4@BinaryOp(pos, lhs: Val.Arr, BinaryOp.OP_+, rhs: Val.Arr) =>
if (lhs.length == 0) {
new Val.Arr(pos, rhs.asLazyArray)
} else if (rhs.length == 0) {
new Val.Arr(pos, lhs.asLazyArray)
} else b4

case e @ Id(pos, name) =>
scope.get(name) match {
Expand Down
2 changes: 2 additions & 0 deletions sjsonnet/src/sjsonnet/Val.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,8 @@ object Val{
f(k, v)
}
}

def staticSafe:Boolean = static
}

final class StaticObjectFieldSet(protected val keys: Array[String]) {
Expand Down