[K/N][perf] Fix running benchmarks with custom native build type

kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt

@@ -47,6 +47,9 @@ internal val Project.nativeJson: String
 internal val Project.jvmJson: String
     get() = project.property("jvmJson") as String
 
+internal val Project.buildType: NativeBuildType
+    get() = (findProperty("nativeBuildType") as String?)?.let { NativeBuildType.valueOf(it) } ?: NativeBuildType.RELEASE
+
 internal val Project.commonBenchmarkProperties: Map<String, Any>
     get() = mapOf(
             "cpu" to System.getProperty("os.arch"),
@@ -63,7 +66,7 @@ open class BenchmarkExtension @Inject constructor(val project: Project) {
     var compileTasks: List<String> = emptyList()
     var linkerOpts: Collection<String> = emptyList()
     var compilerOpts: List<String> = emptyList()
-    var buildType: NativeBuildType = NativeBuildType.RELEASE
+    var buildType: NativeBuildType = project.buildType
     var repeatingType: BenchmarkRepeatingType = BenchmarkRepeatingType.INTERNAL
     var cleanBeforeRunTask: String? = "konanRun"
 

kotlin-native/performance/cinterop/build.gradle.kts

@@ -10,8 +10,6 @@ plugins {
     id("benchmarking")
 }
 
-val defaultBuildType = NativeBuildType.RELEASE
-
 benchmark {
     applicationName = "Cinterop"
     commonSrcDirs = listOf("../../tools/benchmarks/shared/src/main/kotlin/report", "src/main/kotlin", "../shared/src/main/kotlin")
@@ -19,7 +17,6 @@ benchmark {
     nativeSrcDirs = listOf("src/main/kotlin-native", "../shared/src/main/kotlin-native/common")
     mingwSrcDirs = listOf("src/main/kotlin-native", "../shared/src/main/kotlin-native/mingw")
     posixSrcDirs = listOf("src/main/kotlin-native", "../shared/src/main/kotlin-native/posix")
-    buildType = (findProperty("nativeBuildType") as String?)?.let { NativeBuildType.valueOf(it) } ?: defaultBuildType
 }
 
 val native = kotlin.targets.getByName("native") as KotlinNativeTarget

kotlin-native/performance/numerical/build.gradle.kts

@@ -13,8 +13,6 @@ plugins {
     id("benchmarking")
 }
 
-val defaultBuildType = NativeBuildType.RELEASE
-
 benchmark {
     applicationName = "Numerical"
     commonSrcDirs = listOf("src/main/kotlin", "../../tools/benchmarks/shared/src/main/kotlin/report", "../shared/src/main/kotlin")
@@ -22,7 +20,6 @@ benchmark {
     nativeSrcDirs = listOf("src/main/kotlin-native", "../shared/src/main/kotlin-native/common")
     mingwSrcDirs = listOf("../shared/src/main/kotlin-native/mingw")
     posixSrcDirs = listOf("../shared/src/main/kotlin-native/posix")
-    buildType = (findProperty("nativeBuildType") as String?)?.let { NativeBuildType.valueOf(it) } ?: defaultBuildType
 }
 
 val native = kotlin.targets.getByName("native") as KotlinNativeTarget

kotlin-native/performance/objcinterop/build.gradle.kts

@@ -13,8 +13,6 @@ plugins {
     id("benchmarking")
 }
 
-val defaultBuildType = NativeBuildType.RELEASE
-
 benchmark {
     applicationName = "ObjCInterop"
     commonSrcDirs = listOf("../../tools/benchmarks/shared/src/main/kotlin/report", "src/main/kotlin", "../shared/src/main/kotlin")
@@ -22,7 +20,6 @@ benchmark {
     nativeSrcDirs = listOf("src/main/kotlin-native", "../shared/src/main/kotlin-native/common")
     mingwSrcDirs = listOf("src/main/kotlin-native", "../shared/src/main/kotlin-native/mingw")
     posixSrcDirs = listOf("src/main/kotlin-native", "../shared/src/main/kotlin-native/posix")
-    buildType = (findProperty("nativeBuildType") as String?)?.let { NativeBuildType.valueOf(it) } ?: defaultBuildType
 }
 
 

kotlin-native/performance/ring/build.gradle.kts

@@ -9,8 +9,6 @@ plugins {
     id("benchmarking")
 }
 
-val defaultBuildType = NativeBuildType.RELEASE
-
 benchmark {
     applicationName = "Ring"
     commonSrcDirs = listOf("../../tools/benchmarks/shared/src/main/kotlin/report", "src/main/kotlin", "../shared/src/main/kotlin")
@@ -18,5 +16,4 @@ benchmark {
     nativeSrcDirs = listOf("src/main/kotlin-native", "../shared/src/main/kotlin-native/common")
     mingwSrcDirs = listOf("src/main/kotlin-native", "../shared/src/main/kotlin-native/mingw")
     posixSrcDirs = listOf("src/main/kotlin-native", "../shared/src/main/kotlin-native/posix")
-    buildType = (findProperty("nativeBuildType") as String?)?.let { NativeBuildType.valueOf(it) } ?: defaultBuildType
 }

kotlin-native/performance/startup/build.gradle.kts

@@ -11,8 +11,6 @@ plugins {
     id("benchmarking")
 }
 
-val defaultBuildType = NativeBuildType.RELEASE
-
 benchmark {
     applicationName = "Startup"
     commonSrcDirs = listOf("../../tools/benchmarks/shared/src/main/kotlin/report", "src/main/kotlin", "../shared/src/main/kotlin")
@@ -20,6 +18,5 @@ benchmark {
     nativeSrcDirs = listOf("../shared/src/main/kotlin-native/common")
     mingwSrcDirs = listOf("../shared/src/main/kotlin-native/mingw")
     posixSrcDirs = listOf("../shared/src/main/kotlin-native/posix")
-    buildType = (findProperty("nativeBuildType") as String?)?.let { NativeBuildType.valueOf(it) } ?: defaultBuildType
     repeatingType = BenchmarkRepeatingType.EXTERNAL
 }

kotlin-native/performance/swiftinterop/build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 
 val toolsPath = "../../tools"
 val targetExtension = "Macos"
-val defaultBuildType = NativeBuildType.RELEASE
+
 project.extra["platformManager"] = PlatformManager(projectDir.parentFile.parentFile.absolutePath, false)
 swiftBenchmark {
     applicationName = "swiftInterop"
@@ -19,6 +19,5 @@ swiftBenchmark {
     nativeSrcDirs = listOf("../shared/src/main/kotlin-native/common", "../shared/src/main/kotlin-native/posix")
     swiftSources = listOf("$projectDir/swiftSrc/benchmarks.swift", "$projectDir/swiftSrc/main.swift")
     compileTasks = listOf("compileKotlinNative", "linkBenchmarkReleaseFrameworkNative")
-    buildType = (findProperty("nativeBuildType") as String?)?.let { NativeBuildType.valueOf(it) } ?: defaultBuildType
     cleanBeforeRunTask = "compileKotlinNative"
 }