Skip to content

Properly set up kotlinx-benchmark #220

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 1 commit into from
Jun 4, 2025
Merged

Properly set up kotlinx-benchmark #220

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
14 changes: 11 additions & 3 deletions antlr-kotlin-benchmarks/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import com.strumenta.antlrkotlin.gradle.AntlrKotlinTask
import com.strumenta.antlrkotlin.gradle.ext.targetsNative
import kotlinx.benchmark.gradle.JvmBenchmarkTarget
import org.gradle.jvm.tasks.Jar
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask

plugins {
Expand Down Expand Up @@ -37,10 +38,17 @@ strumentaMultiplatform {

kotlin {
js {
nodejs()

// Necessary for using @JsModule
useCommonJs()
}

@OptIn(ExperimentalWasmDsl::class)
wasmJs {
nodejs()
}

mingwX64 {
binaries.configureEach {
// Increase the function's stack size to 2 megabytes
Expand Down Expand Up @@ -86,9 +94,9 @@ benchmark {
jmhVersion = "1.37"
}

// Blocked by https://github.com/Kotlin/kotlinx-benchmark/issues/185
// register("js")
// register("wasmJs")
register("js")
register("wasmJs")
register("mingwX64")
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...arks/src/commonMain/kotlin/org/antlr/v4/kotlinruntime/benchmarks/mysql/MySQLBenchmarks.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import org.antlr.v4.kotlinruntime.benchmarks.readBenchmarkFile
@State(Scope.Benchmark)
@BenchmarkMode(Mode.AverageTime)
@OutputTimeUnit(BenchmarkTimeUnit.MILLISECONDS)
@Warmup(iterations = 4, timeUnit = BenchmarkTimeUnit.MILLISECONDS)
@Measurement(iterations = 8, timeUnit = BenchmarkTimeUnit.MILLISECONDS)
@Warmup(iterations = 4, time = 5, timeUnit = BenchmarkTimeUnit.SECONDS)
@Measurement(iterations = 4, time = 5, timeUnit = BenchmarkTimeUnit.SECONDS)
public class MySQLBenchmarks {
@Suppress("SpellCheckingInspection")
private val charSets = setOf(
Expand Down
92 changes: 0 additions & 92 deletions ...arks/src/commonTest/kotlin/org/antlr/v4/kotlinruntime/benchmarks/ManualMySQLBenchmarks.kt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion antlr-kotlin-benchmarks/src/nativeMain/kotlin/org/antlr/v4/kotlinruntime/benchmarks/IO.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ private val dir: String =

// TODO(Edoardo): this should probably be replaced by a Gradle task,
// but in the meantime it should work consistently
private val basePath = "build/processedResources/$dir/main"
private val basePath = "antlr-kotlin-benchmarks/build/processedResources/$dir/main"

public actual fun readBenchmarkFile(name: String): String {
val path = Path("$basePath$name")
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
kotlin = "2.1.20"
kotlinx-io = "0.7.0"
kotlinx-benchmark = "0.4.13"
kotlinx-benchmark = "0.4.14"
kotlinx-resources = "0.10.0"
antlr4 = "4.13.1"
dokka = "1.9.20"
Expand Down
17 changes: 15 additions & 2 deletions kotlin-js-store/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,14 @@ base64id@2.0.0, base64id@~2.0.0:
resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==

benchmark@*:
version "2.1.4"
resolved "https://registry.yarnpkg.com/benchmark/-/benchmark-2.1.4.tgz#09f3de31c916425d498cc2ee565a0ebf3c2a5629"
integrity sha512-l9MlfN4M1K/H2fbhfMy3B7vJd6AGKJVQn2h6Sg/Yx+KckoUA7ewS5Vv6TjSq18ooE1kS9hhAlQRH3AkXIh/aOQ==
dependencies:
lodash "^4.17.4"
platform "^1.3.3"

binary-extensions@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
Expand Down Expand Up @@ -1208,7 +1216,7 @@ locate-path@^6.0.0:
dependencies:
p-locate "^5.0.0"

lodash@^4.17.15, lodash@^4.17.21:
lodash@^4.17.15, lodash@^4.17.21, lodash@^4.17.4:
version "4.17.21"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
Expand Down Expand Up @@ -1459,6 +1467,11 @@ pkg-dir@^4.2.0:
dependencies:
find-up "^4.0.0"

platform@^1.3.3:
version "1.3.6"
resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.6.tgz#48b4ce983164b209c2d45a107adb31f473a6e7a7"
integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==

punycode@^2.1.0:
version "2.3.1"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
Expand Down Expand Up @@ -1680,7 +1693,7 @@ source-map-loader@5.0.0:
iconv-lite "^0.6.3"
source-map-js "^1.0.2"

source-map-support@0.5.21, source-map-support@~0.5.20:
source-map-support@*, source-map-support@0.5.21, source-map-support@~0.5.20:
version "0.5.21"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
Expand Down
Loading