Skip to content

Speedup ProtoWriteType.from #2879

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
merged 3 commits into from
Dec 13, 2024
Merged

Speedup ProtoWriteType.from #2879

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c01156
Add map-related protobuf benchmark
fzhinkin Dec 11, 2024
2aa911c
Reimplement ProtoWireType lookup
fzhinkin Dec 11, 2024
3b6ab74
Embed masking into ProtoWireType.from
fzhinkin Dec 11, 2024
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
32 changes: 32 additions & 0 deletions benchmark/src/jmh/kotlin/kotlinx/benchmarks/protobuf/ProtoMapBenchmark.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
* Copyright 2017-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
*/

package kotlinx.benchmarks.protobuf

import kotlinx.serialization.Serializable
import kotlinx.serialization.encodeToByteArray
import kotlinx.serialization.protobuf.ProtoBuf
import org.openjdk.jmh.annotations.*
import java.util.concurrent.TimeUnit

@Warmup(iterations = 5, time = 1)
@Measurement(iterations = 5, time = 1)
@BenchmarkMode(Mode.Throughput)
@OutputTimeUnit(TimeUnit.MILLISECONDS)
@State(Scope.Benchmark)
@Fork(1)
open class ProtoMapBenchmark {

@Serializable
class Holder(val map: Map<String, Int>)

private val value = Holder((0..128).associateBy { it.toString() })
private val bytes = ProtoBuf.encodeToByteArray(value)

@Benchmark
fun toBytes() = ProtoBuf.encodeToByteArray(Holder.serializer(), value)

@Benchmark
fun fromBytes() = ProtoBuf.decodeFromByteArray(Holder.serializer(), bytes)
}
9 changes: 8 additions & 1 deletion formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/internal/Helpers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,15 @@ internal enum class ProtoWireType(val typeId: Int) {
;

companion object {
private val entryArray = Array(8) { typeId ->
ProtoWireType.entries.find { it.typeId == typeId } ?: INVALID
}

fun from(typeId: Int): ProtoWireType {
return ProtoWireType.entries.find { it.typeId == typeId } ?: INVALID
if (typeId < 0 || typeId >= entryArray.size) {
return INVALID
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From an optimization perspective it may be valid to not check for typeId<0 (and maybe have a larger array of INVALIDs) to avoid the if check (instead relying on the array check that does this too).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The array bounds check will "give" us ArrayIndexOutOfBounds, not the ProtoWireType.INVALID :)

Anyway, the implementation was implicitly based on the idea that the only call site extracts 3 least-significant bits from an int before passing it down this methods, so when this method is inlined the compiler can get rid of the if.

return entryArray[typeId]
}
}

Expand Down