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

Performance Optimizations #467

Merged
merged 17 commits into from
Mar 20, 2023
Merged

Performance Optimizations #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c669894
add testSlow
lihaoyi Mar 19, 2023
8e193dd
fast double parser and BaseElemRenderer.scala updates
lihaoyi Mar 19, 2023
7bfd10c
fast string writers
lihaoyi Mar 19, 2023
5c33531
MsgPackWriter improvements
lihaoyi Mar 19, 2023
cb59f0b
BufferingElemParser changes
lihaoyi Mar 19, 2023
ec6d100
properly make longReader accept non-trivial strings
lihaoyi Mar 18, 2023
0b37e95
de-virtualize CaseClassReader.write0
lihaoyi Mar 19, 2023
6329d73
avoid allocating a objectAttributeKeyWriteMap lambda when writing cas…
lihaoyi Mar 19, 2023
600979c
use checkSafeIndex for string parsing
lihaoyi Mar 19, 2023
e1b3c4e
fix tests
lihaoyi Mar 19, 2023
84827e0
fix tests by introducing WrapElemArrayCharSeq.NonUnicode
lihaoyi Mar 19, 2023
fc104f5
make parser use specialized visitFloat64ElemParts callback for handli…
lihaoyi Mar 19, 2023
49b6461
ensure visitFloat64ElemParts implementations copy array before parsin…
lihaoyi Mar 19, 2023
66d9af8
cleanup
lihaoyi Mar 19, 2023
05f8b98
add back bounds check to parseLong
lihaoyi Mar 19, 2023
4e1c08b
fix scala 3 compile
lihaoyi Mar 19, 2023
8aec3b7
mima
lihaoyi Mar 20, 2023
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
62 changes: 49 additions & 13 deletions bench/src-js/Main.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,69 @@ import upickle.Recursive.{End, LL, Node}
import scala.scalajs.js
object Main{
def main(args: Array[String]): Unit = {
for(duration <- Seq(2500, 5000, 10000, 10000, 10000, 10000)){
val allResults = collection.mutable.Buffer.empty[(String, Int)]
for((duration, save) <- Seq(2500 -> false, 5000 -> false, 10000 -> true, 10000 -> true, 10000 -> true)){
println("RUN JS: " + duration)
println()
// rawJsonParseSerialize(duration)
NonNative.playJson(duration)
NonNative.circe(duration)
Common.upickleDefault(duration)
Common.upickleDefaultByteArray(duration)
Common.upickleDefaultBinary(duration)
upickleWebDefault(duration)
// NonNative.playJson(duration)
// NonNative.circe(duration)
// Common.upickleDefault(duration)
// Common.upickleDefaultByteArray(duration)
// Common.upickleDefaultBinary(duration)
// upickleWebDefault(duration)
// Common.upickleLegacy(duration)
// Common.upickleBinaryLegacy(duration)
// Common.genCodec(duration)
// upickleWebDefault(duration)
// upickleWebLegacy(duration)
NonNative.playJsonCached(duration)
NonNative.circeCached(duration)
upickleWebDefaultCached(duration)
Common.upickleDefaultCached(duration)
Common.upickleDefaultByteArrayCached(duration)
Common.upickleDefaultBinaryCached(duration)
// NonNative.playJsonCached(duration)
// NonNative.circeCached(duration)
// upickleWebDefaultCached(duration)
// Common.upickleDefaultCached(duration)
// Common.upickleDefaultByteArrayCached(duration)
// Common.upickleDefaultBinaryCached(duration)
// Common.upickleLegacyCached(duration)
// Common.upickleLegacyBinaryCached(duration)
// Common.genCodecCached(duration)
// upickleWebLegacyCached(duration)
val results = Seq(
Common.upickleDefault(duration),
Common.upickleDefaultByteArray(duration),
Common.upickleDefaultBinary(duration),
Common.integers(duration),
Common.integersByteArray(duration),
Common.integersBinary(duration),

Common.doubles(duration),
Common.doublesByteArray(duration),
Common.doublesBinary(duration),

Common.sequences(duration),
Common.sequencesByteArray(duration),
Common.sequencesBinary(duration),

Common.shortStrings(duration),
Common.shortStringsByteArray(duration),
Common.shortStringsBinary(duration),

Common.longStrings(duration),
Common.longStringsByteArray(duration),
Common.longStringsBinary(duration),

Common.unicodeStrings(duration),
Common.unicodeStringsByteArray(duration),
Common.unicodeStringsBinary(duration),

Common.caseClasses(duration),
Common.caseClassesByteArray(duration),
Common.caseClassesBinary(duration)
)
println()
if (save) allResults.appendAll(results.flatten)
println()
}
Common.prettyPrintResults(allResults)
}

def rawJsonParseSerialize(duration: Int) = {
Expand Down
187 changes: 97 additions & 90 deletions bench/src-jvm/Main.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,49 +11,109 @@ object Main{
import Hierarchy._
import Recursive._
def main(args: Array[String]): Unit = {
for(duration <- Seq(2500, 5000, 10000, 10000, 10000, 10000)){
val allResults = collection.mutable.Buffer.empty[(String, Int)]
for((duration, save) <- Seq(2500 -> false, 5000 -> false, 10000 -> true, 10000 -> true, 10000 -> true)){
println("RUN JVM: " + duration)
println()

// Main.ujsonAst(duration)
// Main.upackAst(duration)
// Main.playJsonAst(duration)
// Main.uJsonPlayJsonAst(duration)
// Main.circeJsonAst(duration)
// Main.uJsonCirceJsonAst(duration)
// Main.argonautJsonAst(duration)
// Main.uJsonArgonautJsonAst(duration)
// Main.json4sJsonAst(duration)
// Main.uJsonJson4sJsonAst(duration)

// Main.jacksonModuleScala(duration)
NonNative.playJson(duration)
NonNative.circe(duration)
Common.upickleDefault(duration)
Common.upickleDefaultByteArray(duration)
Common.upickleDefaultBinary(duration)
// Common.upickleLegacy(duration)
// Common.upickleBinaryLegacy(duration)
// Common.genCodec(duration)
NonNative.playJsonCached(duration)
NonNative.circeCached(duration)
Common.upickleDefaultCached(duration)
Common.upickleDefaultByteArrayCached(duration)
Common.upickleDefaultBinaryCached(duration)
// Common.upickleDefaultCachedReadable(duration)
// Common.upickleDefaultCachedReadablePath(duration)

// Common.upickleLegacyCached(duration)
// Common.upickleDefaultBinaryCachedReadable(duration)
// Common.upickleLegacyBinaryCached(duration)
// Common.genCodecCached(duration)
benchParsingRendering(duration, bytes = true, strings = false, streams = false, msgpack = false)
benchParsingRendering(duration, bytes = false, strings = true, streams = false, msgpack = false)
benchParsingRendering(duration, bytes = false, strings = false, streams = true, msgpack = false)
benchParsingRendering(duration, bytes = false, strings = false, streams = false, msgpack = true)
// Main.ujsonAst(duration)
// Main.upackAst(duration)
// Main.playJsonAst(duration)
// Main.uJsonPlayJsonAst(duration)
// Main.circeJsonAst(duration)
// Main.uJsonCirceJsonAst(duration)
// Main.argonautJsonAst(duration)
// Main.uJsonArgonautJsonAst(duration)
// Main.json4sJsonAst(duration)
// Main.uJsonJson4sJsonAst(duration)

// Main.jacksonModuleScala(duration)


val results = Seq(
// NonNative.playJson(duration),
// NonNative.circe(duration),
Common.upickleDefault(duration),
Common.upickleDefaultByteArray(duration),
Common.upickleDefaultBinary(duration),
// Common.upickleLegacy(duration)
// Common.upickleBinaryLegacy(duration)
// Common.genCodec(duration)
// NonNative.playJsonCached(duration)
// NonNative.circeCached(duration)
// Common.upickleDefaultCached(duration)
// Common.upickleDefaultByteArrayCached(duration)
// Common.upickleDefaultBinaryCached(duration)
// Common.upickleDefaultCachedReadable(duration)
// Common.upickleDefaultCachedReadablePath(duration)

// Common.upickleLegacyCached(duration)
// Common.upickleDefaultBinaryCachedReadable(duration)
// Common.upickleLegacyBinaryCached(duration)
// Common.genCodecCached(duration)
// benchParsingRendering(duration, bytes = true, strings = false, streams = false, msgpack = false)
// benchParsingRendering(duration, bytes = false, strings = true, streams = false, msgpack = false)
// benchParsingRendering(duration, bytes = false, strings = false, streams = true, msgpack = false)
// benchParsingRendering(duration, bytes = false, strings = false, streams = false, msgpack = true)
Common.integers(duration),
Common.integersByteArray(duration),
Common.integersBinary(duration),

Common.doubles(duration),
Common.doublesByteArray(duration),
Common.doublesBinary(duration),

Common.shortStrings(duration),
Common.shortStringsByteArray(duration),
Common.shortStringsBinary(duration),

Common.longStrings(duration),
Common.longStringsByteArray(duration),
Common.longStringsBinary(duration),

Common.unicodeStrings(duration),
Common.unicodeStringsByteArray(duration),
Common.unicodeStringsBinary(duration),

Common.caseClasses(duration),
Common.caseClassesByteArray(duration),
Common.caseClassesBinary(duration),

Common.sequences(duration),
Common.sequencesByteArray(duration),
Common.sequencesBinary(duration),
)

if (save) allResults.appendAll(results.flatten)
println()
}
val prettyResults = Common.prettyPrintResults(allResults)
println(prettyResults)
for(savePath <- args.headOption){
val p = java.nio.file.Paths.get(savePath)
if (!java.nio.file.Files.exists(p)) java.nio.file.Files.write(p, prettyResults.getBytes)
else {
val before = new String(java.nio.file.Files.readAllBytes(p))
def split(s: String) = s.linesIterator.map(_.drop(2).dropRight(2).split(" *\\| *")).toList
println(
split(prettyResults).zip(split(before)).zipWithIndex.map {
case ((afterLine, beforeLine), 0 | 1) => afterLine
case ((afterLine, beforeLine), _) =>
afterLine.zip(beforeLine) match {
case Array(head, tail@_*) =>
Array(head._1) ++ tail.map { case (a, b) =>
val percentChange = ((a.toDouble / b.toDouble - 1) * 100).toInt
val sign =
if (percentChange == 0) "" else if (percentChange < 0) "-" else if (percentChange > 0) "+"
s"$b -> $a (${sign}${math.abs(percentChange)}%)"
}
}
}.map(_.mkString("| ", " | ", " |")).mkString("\n")
)
}
}
}

@nowarn("cat=deprecation")
def benchParsingRendering(duration: Int, bytes: Boolean, strings: Boolean, streams: Boolean, msgpack: Boolean) = {
import java.nio.file.{Files, Paths}
Expand Down Expand Up @@ -163,57 +223,4 @@ object Main{
ujson.json4s.Json4sJson.transform(_, ujson.StringRenderer()).toString
)
}
// def jacksonModuleScala(duration: Int) = {
// val mapper = new ObjectMapper() with ScalaObjectMapper
// val m = new SimpleModule
// mapper.registerModule(DefaultScalaModule)
//
// // https://stackoverflow.com/questions/47955581/jackson-deserialize-json-to-scala-adt?rq=1
// m.addDeserializer(
// classOf[A],
// new StdDeserializer[A](classOf[A]) {
// def deserialize(jp: JsonParser, ctxt: DeserializationContext): A = {
// val tb = new TokenBuffer(jp, ctxt)
// tb.copyCurrentStructure(jp)
// val firstParser = tb.asParser
// firstParser.nextToken
// val curNode = firstParser.getCodec.readTree[JsonNode](firstParser)
// val objectParser = tb.asParser
// objectParser.nextToken()
// if (curNode.has("i")) {
// objectParser.readValueAs[B](classOf[B])
// } else if (curNode.has("s1")) {
// objectParser.readValueAs[C](classOf[C])
// } else ???
// }
// }
// )
// m.addDeserializer(
// classOf[LL],
// new StdDeserializer[LL](classOf[LL]) {
// def deserialize(jp: JsonParser, ctxt: DeserializationContext): LL = {
// val tb = new TokenBuffer(jp, ctxt)
// tb.copyCurrentStructure(jp)
// val firstParser = tb.asParser
// firstParser.nextToken
// val curNode = firstParser.getCodec.readTree[JsonNode](firstParser)
// val objectParser = tb.asParser
// objectParser.nextToken()
// if (curNode.has("c")) {
// objectParser.readValueAs[Node](classOf[Node])
// } else{
// End
// }
// }
// }
// )
// mapper.registerModule(m)
//
// val jacksonType = new TypeReference[Common.Data] {}
//
// Common.bench[String](duration)(
// mapper.readValue[Seq[Common.Data]](_, jacksonType),
// mapper.writeValueAsString(_)
// )
// }
}
44 changes: 37 additions & 7 deletions bench/src-native/Main.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,48 @@ object Main{
import Hierarchy._
import Recursive._
def main(args: Array[String]): Unit = {
for(duration <- Seq(2500, 5000, 10000, 10000, 10000, 10000)){
val allResults = collection.mutable.Buffer.empty[(String, Int)]
for ((duration, save) <- Seq(2500 -> false, 5000 -> false, 10000 -> true, 10000 -> true, 10000 -> true)) {
println("RUN NATIVE: " + duration)
println()

Common.upickleDefault(duration)
Common.upickleDefaultByteArray(duration)
Common.upickleDefaultBinary(duration)
val results = Seq(
Common.upickleDefault(duration),
Common.upickleDefaultByteArray(duration),
Common.upickleDefaultBinary(duration),

Common.upickleDefaultCached(duration)
Common.upickleDefaultByteArrayCached(duration)
Common.upickleDefaultBinaryCached(duration)
Common.integers(duration),
Common.integersByteArray(duration),
Common.integersBinary(duration),

Common.doubles(duration),
Common.doublesByteArray(duration),
Common.doublesBinary(duration),

Common.sequences(duration),
Common.sequencesByteArray(duration),
Common.sequencesBinary(duration),

Common.shortStrings(duration),
Common.shortStringsByteArray(duration),
Common.shortStringsBinary(duration),

Common.longStrings(duration),
Common.longStringsByteArray(duration),
Common.longStringsBinary(duration),

Common.unicodeStrings(duration),
Common.unicodeStringsByteArray(duration),
Common.unicodeStringsBinary(duration),

Common.caseClasses(duration),
Common.caseClassesByteArray(duration),
Common.caseClassesBinary(duration)
)
println()
if (save) allResults.appendAll(results.flatten)
println()
}
Common.prettyPrintResults(allResults)
}
}
Loading