azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/N][Tests] Adjust test signext_zeroext_interop.kt for different cache modes

Browse Source 
^KT-61259
This commit is contained in:
Vladimir Sukharev
2024-02-09 18:20:37 +01:00
committed by Space Team
parent 370f138ad4
commit 0ba509dcd6
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/fileCheck/cinterop/signext_zeroext_interop.kt
Vendored
+7 -3
View File
@@ -36,9 +36,9 @@ int callbackUser(int (*fn)(int, short)) {
import signext_zeroext_interop_input.* import signext_zeroext_interop_input.*
import kotlinx.cinterop.* import kotlinx.cinterop.*
// CHECK-DEFAULTABI: declare zeroext i1 @Kotlin_Char_isHighSurrogate(i16 zeroext){{.*}} // CHECK-DEFAULTABI-CACHE_NO: declare zeroext i1 @Kotlin_Char_isHighSurrogate(i16 zeroext){{.*}}
// CHECK-AAPCS: declare i1 @Kotlin_Char_isHighSurrogate(i16) // CHECK-AAPCS-CACHE_NO: declare i1 @Kotlin_Char_isHighSurrogate(i16)
// CHECK-WINDOWSX64: declare zeroext i1 @Kotlin_Char_isHighSurrogate(i16) // CHECK-WINDOWSX64-CACHE_NO: declare zeroext i1 @Kotlin_Char_isHighSurrogate(i16)
// Check that we pass attributes to functions imported from runtime. // Check that we pass attributes to functions imported from runtime.
// CHECK-LABEL: void @"kfun:#checkRuntimeFunctionImport(){}"() // CHECK-LABEL: void @"kfun:#checkRuntimeFunctionImport(){}"()
@@ -89,6 +89,10 @@ fun box(): String {
return "OK" return "OK"
} }
// CHECK-DEFAULTABI-CACHE_STATIC_ONLY_DIST: declare zeroext i1 @Kotlin_Char_isHighSurrogate(i16 zeroext){{.*}}
// CHECK-AAPCS-CACHE_STATIC_ONLY_DIST: declare i1 @Kotlin_Char_isHighSurrogate(i16)
// CHECK-WINDOWSX64-CACHE_STATIC_ONLY_DIST: declare zeroext i1 @Kotlin_Char_isHighSurrogate(i16)
// CHECK-DEFAULTABI: signext i8 [[CHAR_ID_BRIDGE]](i8 signext %0) // CHECK-DEFAULTABI: signext i8 [[CHAR_ID_BRIDGE]](i8 signext %0)
// CHECK-DEFAULTABI: [[CHAR_ID_PTR:%[0-9]+]] = load i8 (i8)*, i8 (i8)** @{{.*char_id}} // CHECK-DEFAULTABI: [[CHAR_ID_PTR:%[0-9]+]] = load i8 (i8)*, i8 (i8)** @{{.*char_id}}
// CHECK-DEFAULTABI: call signext i8 [[CHAR_ID_PTR]](i8 signext %0) // CHECK-DEFAULTABI: call signext i8 [[CHAR_ID_PTR]](i8 signext %0)
native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/ResultHandler.kt
+4 -1
View File
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.konan.test.blackbox.support.LoggedData
import org.jetbrains.kotlin.konan.test.blackbox.support.TestName import org.jetbrains.kotlin.konan.test.blackbox.support.TestName
import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunCheck.ExecutionTimeout import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunCheck.ExecutionTimeout
import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunCheck.ExitCode import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunCheck.ExitCode
import org.jetbrains.kotlin.konan.test.blackbox.support.settings.CacheMode
import org.jetbrains.kotlin.konan.test.blackbox.support.settings.KotlinNativeTargets import org.jetbrains.kotlin.konan.test.blackbox.support.settings.KotlinNativeTargets
import org.jetbrains.kotlin.konan.test.blackbox.support.settings.OptimizationMode import org.jetbrains.kotlin.konan.test.blackbox.support.settings.OptimizationMode
import org.jetbrains.kotlin.konan.test.blackbox.support.settings.configurables import org.jetbrains.kotlin.konan.test.blackbox.support.settings.configurables
@@ -110,7 +111,9 @@ internal class ResultHandler(
} }
val optimizationMode = check.settings.get<OptimizationMode>().name val optimizationMode = check.settings.get<OptimizationMode>().name
val checkPrefixesWithOptMode = checkPrefixes.map { "$it-$optimizationMode" } val checkPrefixesWithOptMode = checkPrefixes.map { "$it-$optimizationMode" }
val commaSeparatedCheckPrefixes = (checkPrefixes + checkPrefixesWithOptMode).joinToString(",") val cacheMode = check.settings.get<CacheMode>().alias
val checkPrefixesWithCacheMode = checkPrefixes.map { "$it-CACHE_$cacheMode" }
val commaSeparatedCheckPrefixes = (checkPrefixes + checkPrefixesWithOptMode + checkPrefixesWithCacheMode).joinToString(",")
val result = ProcessBuilder( val result = ProcessBuilder(
fileCheckExecutable, fileCheckExecutable,