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

[Wasm] Run wasm test using all available VMs: V8 & SpiderMonkey for now

Browse Source 
Also, add a new directive, `WASM_FAILS_IN`, to specify VMs where a test is expected to fail for now.

#KT-56166 Fixed
This commit is contained in:
Zalim Bashorov
2023-01-27 02:27:09 +01:00
parent 885381dd63
commit b02279de14
16 changed files with 89 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxWasmJsInterop/defaultValues.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WASM_FAILS_IN: SM
// FILE: defaultValues.js
function foo(x1 = "d1", x2 = "d2", x3 = "d3", x4 = "d4", x5 = "d5") {
return `${x1} ${x2} ${x3} ${x4} ${x5}`;
compiler/testData/codegen/boxWasmJsInterop/externalTypeOperators.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// WITH_STDLIB
// WASM_FAILS_IN: SM
// FILE: externals.js
const primitives1 = [3.14, "Test string 1", true, Symbol("symbol"), 131283889534859707199254740992n];
compiler/testData/codegen/boxWasmJsInterop/externals.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WASM_FAILS_IN: SM
// FILE: externals.js
function createObject() {
return {
compiler/testData/codegen/boxWasmJsInterop/functionTypes.kt
Vendored
+1
View File
@@ -1,5 +1,6 @@
// Char issues
// IGNORE_BACKEND: JS_IR
// WASM_FAILS_IN: SM
// MODULE: main
// FILE: externals.js
compiler/testData/codegen/boxWasmJsInterop/jsExport.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JS_IR, JS
// WASM_FAILS_IN: SM
// MODULE: main
// FILE: externals.kt
compiler/testData/codegen/boxWasmJsInterop/jsToKotlinAdapters.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JS_IR, JS
// WASM_FAILS_IN: SM
inline fun checkNPE(body: () -> Unit) {
var throwed = false
compiler/testData/codegen/boxWasmJsInterop/kotlinToJsAdapters.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JS_IR, JS
// WASM_FAILS_IN: SM
@JsFun("(x) => { if (x !== 'abc') throw 'error' }")
external fun notNullString(x: String)
compiler/testData/codegen/boxWasmJsInterop/types.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WASM_FAILS_IN: SM
// FILE: externals.js
// -- Strings --
compiler/testData/codegen/boxWasmJsInterop/vararg.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// IGNORE_BACKEND_K2: JS_IR
// WASM_FAILS_IN: SM
// Partial copy of js/js.translator/testData/box/native/vararg.kt
// With some additions for concrete number types, strings and function references
js/js.tests/test/org/jetbrains/kotlin/js/testOld/BasicWasmBoxTest.kt
+39 -13
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
import org.jetbrains.kotlin.js.config.JSConfigurationKeys
import org.jetbrains.kotlin.js.config.JsConfig
import org.jetbrains.kotlin.js.facade.TranslationUnit
import org.jetbrains.kotlin.js.testOld.engines.ExternalTool
import org.jetbrains.kotlin.js.testOld.engines.WasmVM
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtNamedFunction
@@ -200,7 +200,7 @@ abstract class BasicWasmBoxTest(
val testJs = if (debugMode >= DebugMode.DEBUG) testJsVerbose else testJsQuiet
fun writeToFilesAndRunD8Test(name: String, res: WasmCompilerResult) {
fun writeToFilesAndRunTest(name: String, res: WasmCompilerResult) {
val dir = File(outputDirBase, name)
dir.mkdirs()
@@ -249,19 +249,45 @@ abstract class BasicWasmBoxTest(
File(dir, mjsFile.name).writeText(mjsFile.readText())
}
ExternalTool(System.getProperty("javascript.engine.path.V8"))
.run(
"--experimental-wasm-gc",
*jsFilesBefore.map { File(it).absolutePath }.toTypedArray(),
"--module",
"./${entryMjs}",
*jsFilesAfter.map { File(it).absolutePath }.toTypedArray(),
workingDirectory = dir
)
val failsIn = InTextDirectivesUtils.findListWithPrefixes(file.readText(), "// WASM_FAILS_IN: ")
val exceptions = listOf(WasmVM.V8, WasmVM.SpiderMonkey).mapNotNull map@{ vm ->
try {
if (debugMode >= DebugMode.DEBUG) {
println(" ------ Run in ${vm.name}" + if (vm.shortName in failsIn) " (expected to fail)" else "")
}
vm.run(
"./${entryMjs}",
jsFilesBefore.map { File(it).absolutePath },
jsFilesAfter.map { File(it).absolutePath },
workingDirectory = dir
)
if (vm.shortName in failsIn) {
return@map AssertionError("The test expected to fail in ${vm.name}. Please update the testdata.")
}
} catch (e: Throwable) {
if (vm.shortName !in failsIn) {
return@map e
}
}
null
}
when (exceptions.size) {
0 -> {} // Everything OK
1 -> {
throw exceptions.single()
}
else -> {
throw AssertionError("Failed with several exceptions. Look at suppressed exceptions below.").apply {
exceptions.forEach { addSuppressed(it) }
}
}
}
}
writeToFilesAndRunD8Test("d8", compilerResult)
writeToFilesAndRunD8Test("d8-dce", compilerResultWithDCE)
writeToFilesAndRunTest("dev", compilerResult)
writeToFilesAndRunTest("dce", compilerResultWithDCE)
}
}
js/js.tests/test/org/jetbrains/kotlin/js/testOld/engines/SpiderMonkey.kt
+36 -14
View File
@@ -11,14 +11,46 @@ import java.io.InputStreamReader
import java.lang.Boolean.getBoolean
import kotlin.test.fail
private val toolLogsEnabled: Boolean = getBoolean("kotlin.js.test.verbose")
val toolLogsEnabled: Boolean = getBoolean("kotlin.js.test.verbose")
internal sealed class WasmVM(val shortName: String) {
val name: String = javaClass.simpleName
protected val tool = ExternalTool(System.getProperty("javascript.engine.path.$name"))
class ExternalTool(val path: String) {
abstract fun run(entryMjs: String, jsFilesBefore: List<String>, jsFilesAfter: List<String>, workingDirectory: File?)
object V8 : WasmVM("V8") {
override fun run(entryMjs: String, jsFilesBefore: List<String>, jsFilesAfter: List<String>, workingDirectory: File?) {
tool.run(
"--experimental-wasm-gc",
*jsFilesBefore.toTypedArray(),
"--module",
entryMjs,
*jsFilesAfter.toTypedArray(),
workingDirectory = workingDirectory
)
}
}
object SpiderMonkey : WasmVM("SM") {
override fun run(entryMjs: String, jsFilesBefore: List<String>, jsFilesAfter: List<String>, workingDirectory: File?) {
tool.run(
"--wasm-verbose",
"--wasm-gc",
"--wasm-function-references",
*jsFilesBefore.flatMap { listOf("-f", it) }.toTypedArray(),
"--module=$entryMjs",
*jsFilesAfter.flatMap { listOf("-f", it) }.toTypedArray(),
workingDirectory = workingDirectory
)
}
}
}
internal class ExternalTool(val path: String) {
fun run(vararg arguments: String, workingDirectory: File? = null) {
val command = arrayOf(path, *arguments)
val processBuilder = ProcessBuilder(*command)
.redirectErrorStream(true)
val processBuilder = ProcessBuilder(*command).redirectErrorStream(true)
if (workingDirectory != null) {
processBuilder.directory(workingDirectory)
@@ -51,13 +83,3 @@ class ExternalTool(val path: String) {
private fun escapeShellArgument(arg: String): String =
"'${arg.replace("'", "'\\''")}'"
class SpiderMonkeyEngine(
jsShellPath: String = System.getProperty("javascript.engine.path.SpiderMonkey")
) {
private val jsShell = ExternalTool(jsShellPath)
fun runFile(file: String) {
jsShell.run("--wasm-gc", file)
}
}
js/js.translator/testData/box/native/castToNativeClassChecked.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WASM_FAILS_IN: SM
// EXPECTED_REACHABLE_NODES: 1283
// FILE: castToNativeClassChecked.kt
external abstract class S() {
js/js.translator/testData/box/native/castToNativeInterface.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WASM_FAILS_IN: SM
// EXPECTED_REACHABLE_NODES: 1282
// FILE: castToNativeInterface.kt
external interface I {
js/js.translator/testData/box/native/castToTypeParamBoundedByNativeInterface.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WASM_FAILS_IN: SM
// EXPECTED_REACHABLE_NODES: 1284
// FILE: castToTypeParamBoundedByNativeInterface.kt
external interface I {
js/js.translator/testData/box/native/passMemberOrExtFromNative.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WASM_FAILS_IN: SM
// EXPECTED_REACHABLE_NODES: 1285
package foo
js/js.translator/testData/box/native/passTopLevelOrLocalFunctionToNative.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// WASM_FAILS_IN: SM
// EXPECTED_REACHABLE_NODES: 1284
package foo