From 61e4bb5200c0c16c58237b0eb273d17292f0ccb1 Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Tue, 15 Oct 2024 15:15:46 +0200 Subject: [PATCH] wasm gc: improve gradle plugin settings --- core/build.gradle.kts | 10 ++-- samples/benchmark/build.gradle.kts | 2 +- .../src/main/webapp/teavm-wasm-gc.html | 6 ++- tools/deobfuscator-wasm-gc/build.gradle.kts | 2 +- .../org/teavm/gradle/TeaVMExtensionImpl.java | 5 +- .../java/org/teavm/gradle/TeaVMPlugin.java | 2 + .../gradle/api/TeaVMWasmGCConfiguration.java | 2 + .../gradle/tasks/CopyWasmGCRuntimeTask.java | 33 +++++++++++- .../gradle/tasks/GenerateJavaScriptTask.java | 25 ++------- .../gradle/tasks/GenerateWasmGCTask.java | 14 +++++ .../org/teavm/gradle/tasks/TaskUtils.java | 53 +++++++++++++++++++ .../junit/WebAssemblyGCPlatformSupport.java | 2 +- 12 files changed, 124 insertions(+), 32 deletions(-) create mode 100644 tools/gradle/src/main/java/org/teavm/gradle/tasks/TaskUtils.java diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 6d86f3bbef..fe36dce623 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -50,7 +50,7 @@ val jsOutputPackageDir = jsOutputDir.map { it.dir("org/teavm/backend/wasm") } val jsInputDir = layout.projectDirectory.dir("src/main/js/wasm-gc-runtime") val jsInput = jsInputDir.file("runtime.js") -fun registerRuntimeTasks(taskName: String, wrapperType: String, outputName: String) { +fun registerRuntimeTasks(taskName: String, wrapperType: String, outputName: String, module: Boolean) { val generateTask by tasks.register("generate${taskName}Runtime") { dependsOn(tasks.npmInstall) val wrapperFile = jsInputDir.file(wrapperType) @@ -80,7 +80,9 @@ fun registerRuntimeTasks(taskName: String, wrapperType: String, outputName: Stri args.addAll(provider { listOf( "--", - "-m", "--module", "--toplevel", + "-m", "--toplevel", + *(if (module) arrayOf("--module") else emptyArray()), + "--mangle", "reserved=['TeaVM']", inputFiles.singleFile.absolutePath, "-o", outputFile.get().asFile.absolutePath ) @@ -93,8 +95,8 @@ fun registerRuntimeTasks(taskName: String, wrapperType: String, outputName: Stri } } -registerRuntimeTasks("Simple", "simple-wrapper.js", "wasm-gc-runtime") -registerRuntimeTasks("Module", "module-wrapper.js", "wasm-gc-module-runtime") +registerRuntimeTasks("Simple", "simple-wrapper.js", "wasm-gc-runtime", module = false) +registerRuntimeTasks("Module", "module-wrapper.js", "wasm-gc-module-runtime", module = true) teavmPublish { artifactId = "teavm-core" diff --git a/samples/benchmark/build.gradle.kts b/samples/benchmark/build.gradle.kts index 6144fa8660..f03677dbf7 100644 --- a/samples/benchmark/build.gradle.kts +++ b/samples/benchmark/build.gradle.kts @@ -54,7 +54,7 @@ teavm { wasmGC { addedToWebApp = true mainClass = "org.teavm.samples.benchmark.teavm.BenchmarkStarter" - sourceMap = true + debugInformation = true } wasm { addedToWebApp = true diff --git a/samples/benchmark/src/main/webapp/teavm-wasm-gc.html b/samples/benchmark/src/main/webapp/teavm-wasm-gc.html index 5676d49fe8..e14770eaa1 100644 --- a/samples/benchmark/src/main/webapp/teavm-wasm-gc.html +++ b/samples/benchmark/src/main/webapp/teavm-wasm-gc.html @@ -22,7 +22,11 @@ diff --git a/tools/deobfuscator-wasm-gc/build.gradle.kts b/tools/deobfuscator-wasm-gc/build.gradle.kts index aae25913c3..d4e6004771 100644 --- a/tools/deobfuscator-wasm-gc/build.gradle.kts +++ b/tools/deobfuscator-wasm-gc/build.gradle.kts @@ -43,7 +43,7 @@ val generateWasm by tasks.register("generateWasm") { args( "org.teavm.tooling.deobfuscate.wasmgc.DeobfuscatorFactory", layout.buildDirectory.dir("teavm").get().asFile.absolutePath, - "deobfuscator.wasm" + "org/teavm/backend/wasm/deobfuscator.wasm" ) } diff --git a/tools/gradle/src/main/java/org/teavm/gradle/TeaVMExtensionImpl.java b/tools/gradle/src/main/java/org/teavm/gradle/TeaVMExtensionImpl.java index e494c7b3eb..318b162b1a 100644 --- a/tools/gradle/src/main/java/org/teavm/gradle/TeaVMExtensionImpl.java +++ b/tools/gradle/src/main/java/org/teavm/gradle/TeaVMExtensionImpl.java @@ -80,7 +80,7 @@ private void setupJsDefaults() { .orElse(OptimizationLevel.BALANCED)); js.getSourceFilePolicy().convention(property("js.sourceFilePolicy") .map(SourceFilePolicy::valueOf) - .orElse(SourceFilePolicy.DO_NOTHING)); + .orElse(SourceFilePolicy.LINK_LOCAL_FILES)); js.getDevServer().getStackDeobfuscated().convention(property("js.devServer.stackDeobfuscated") .map(Boolean::parseBoolean)); js.getDevServer().getIndicator().convention(property("js.devServer.indicator").map(Boolean::parseBoolean)); @@ -120,6 +120,9 @@ private void setupWasmGCDefaults() { wasmGC.getDebugInfoLevel().convention(property("wasm-gc.debugInformation.level") .map(v -> WasmDebugInfoLevel.valueOf(v.toUpperCase())).orElse(WasmDebugInfoLevel.DEOBFUSCATION)); wasmGC.getSourceMap().convention(property("wasm-gc.sourceMap").map(Boolean::parseBoolean).orElse(false)); + wasmGC.getSourceFilePolicy().convention(property("wasm-gc.sourceFilePolicy") + .map(SourceFilePolicy::valueOf) + .orElse(SourceFilePolicy.LINK_LOCAL_FILES)); } private void setupWasiDefaults() { diff --git a/tools/gradle/src/main/java/org/teavm/gradle/TeaVMPlugin.java b/tools/gradle/src/main/java/org/teavm/gradle/TeaVMPlugin.java index 263f932420..4bde61bff2 100644 --- a/tools/gradle/src/main/java/org/teavm/gradle/TeaVMPlugin.java +++ b/tools/gradle/src/main/java/org/teavm/gradle/TeaVMPlugin.java @@ -226,6 +226,8 @@ private void registerWasmGCTask(Project project, Configuration configuration) { task.getObfuscated().convention(wasmGC.getObfuscated()); task.getStrict().convention(wasmGC.getStrict()); task.getSourceMap().convention(wasmGC.getSourceMap()); + task.getSourceFilePolicy().convention(wasmGC.getSourceFilePolicy()); + setupSources(task.getSourceFiles(), project); }); project.getTasks().create(WASM_GC_COPY_RUNTIME_TASK_NAME, CopyWasmGCRuntimeTask.class, task -> { task.setGroup(TASK_GROUP); diff --git a/tools/gradle/src/main/java/org/teavm/gradle/api/TeaVMWasmGCConfiguration.java b/tools/gradle/src/main/java/org/teavm/gradle/api/TeaVMWasmGCConfiguration.java index f4e73bdba4..f11d89e4e3 100644 --- a/tools/gradle/src/main/java/org/teavm/gradle/api/TeaVMWasmGCConfiguration.java +++ b/tools/gradle/src/main/java/org/teavm/gradle/api/TeaVMWasmGCConfiguration.java @@ -33,4 +33,6 @@ public interface TeaVMWasmGCConfiguration extends TeaVMCommonConfiguration, TeaV Property getDebugInfoLevel(); Property getSourceMap(); + + Property getSourceFilePolicy(); } diff --git a/tools/gradle/src/main/java/org/teavm/gradle/tasks/CopyWasmGCRuntimeTask.java b/tools/gradle/src/main/java/org/teavm/gradle/tasks/CopyWasmGCRuntimeTask.java index 70adf99460..0969beda89 100644 --- a/tools/gradle/src/main/java/org/teavm/gradle/tasks/CopyWasmGCRuntimeTask.java +++ b/tools/gradle/src/main/java/org/teavm/gradle/tasks/CopyWasmGCRuntimeTask.java @@ -20,20 +20,51 @@ import java.nio.file.StandardCopyOption; import org.gradle.api.DefaultTask; import org.gradle.api.file.RegularFileProperty; +import org.gradle.api.provider.Property; +import org.gradle.api.tasks.Input; import org.gradle.api.tasks.OutputFile; import org.gradle.api.tasks.TaskAction; public abstract class CopyWasmGCRuntimeTask extends DefaultTask { + public CopyWasmGCRuntimeTask() { + getModular().convention(false); + getObfuscated().convention(true); + } + + @Input + public abstract Property getModular(); + + @Input + public abstract Property getObfuscated(); + @OutputFile public abstract RegularFileProperty getOutputFile(); + @OutputFile + public abstract RegularFileProperty getDeobfuscator(); + @TaskAction public void copyRuntime() throws IOException { - var resourceName = "org/teavm/backend/wasm/wasm-gc-runtime.min.js"; + var name = new StringBuilder("wasm-gc"); + if (getModular().get()) { + name.append("-modular"); + } + if (getObfuscated().get()) { + name.append("-min"); + } + var resourceName = "org/teavm/backend/wasm/" + name + ".js"; var classLoader = CopyWasmGCRuntimeTask.class.getClassLoader(); var output = getOutputFile().get().getAsFile(); try (var input = classLoader.getResourceAsStream(resourceName)) { Files.copy(input, output.toPath(), StandardCopyOption.REPLACE_EXISTING); } + + if (getDeobfuscator().isPresent()) { + resourceName = "org/teavm/backend/wasm/deobfuscator.wasm"; + output = getDeobfuscator().get().getAsFile(); + try (var input = classLoader.getResourceAsStream(resourceName)) { + Files.copy(input, output.toPath(), StandardCopyOption.REPLACE_EXISTING); + } + } } } diff --git a/tools/gradle/src/main/java/org/teavm/gradle/tasks/GenerateJavaScriptTask.java b/tools/gradle/src/main/java/org/teavm/gradle/tasks/GenerateJavaScriptTask.java index fe74365d39..3922a0b87e 100644 --- a/tools/gradle/src/main/java/org/teavm/gradle/tasks/GenerateJavaScriptTask.java +++ b/tools/gradle/src/main/java/org/teavm/gradle/tasks/GenerateJavaScriptTask.java @@ -22,7 +22,6 @@ import org.gradle.api.tasks.Optional; import org.teavm.gradle.api.JSModuleType; import org.teavm.gradle.api.SourceFilePolicy; -import org.teavm.tooling.TeaVMSourceFilePolicy; import org.teavm.tooling.TeaVMTargetType; import org.teavm.tooling.builder.BuildStrategy; @@ -32,7 +31,7 @@ public GenerateJavaScriptTask() { getStrict().convention(false); getModuleType().convention(JSModuleType.UMD); getSourceMap().convention(false); - getSourceFilePolicy().convention(SourceFilePolicy.DO_NOTHING); + getSourceFilePolicy().convention(SourceFilePolicy.LINK_LOCAL_FILES); getEntryPointName().convention("main"); } @@ -91,25 +90,7 @@ protected void setupBuilder(BuildStrategy builder) { } builder.setSourceMapsFileGenerated(getSourceMap().get()); builder.setEntryPointName(getEntryPointName().get()); - for (var file : getSourceFiles()) { - if (file.isFile()) { - if (file.getName().endsWith(".jar") || file.getName().endsWith(".zip")) { - builder.addSourcesJar(file.getAbsolutePath()); - } - } else if (file.isDirectory()) { - builder.addSourcesDirectory(file.getAbsolutePath()); - } - } - switch (getSourceFilePolicy().get()) { - case DO_NOTHING: - builder.setSourceFilePolicy(TeaVMSourceFilePolicy.DO_NOTHING); - break; - case COPY: - builder.setSourceFilePolicy(TeaVMSourceFilePolicy.COPY); - break; - case LINK_LOCAL_FILES: - builder.setSourceFilePolicy(TeaVMSourceFilePolicy.LINK_LOCAL_FILES); - break; - } + TaskUtils.applySourceFiles(getSourceFiles(), builder); + TaskUtils.applySourceFilePolicy(getSourceFilePolicy(), builder); } } diff --git a/tools/gradle/src/main/java/org/teavm/gradle/tasks/GenerateWasmGCTask.java b/tools/gradle/src/main/java/org/teavm/gradle/tasks/GenerateWasmGCTask.java index e524e3d75f..62d60ccc1e 100644 --- a/tools/gradle/src/main/java/org/teavm/gradle/tasks/GenerateWasmGCTask.java +++ b/tools/gradle/src/main/java/org/teavm/gradle/tasks/GenerateWasmGCTask.java @@ -15,8 +15,12 @@ */ package org.teavm.gradle.tasks; +import org.gradle.api.file.ConfigurableFileCollection; import org.gradle.api.provider.Property; import org.gradle.api.tasks.Input; +import org.gradle.api.tasks.InputFiles; +import org.gradle.api.tasks.Optional; +import org.teavm.gradle.api.SourceFilePolicy; import org.teavm.gradle.api.WasmDebugInfoLevel; import org.teavm.gradle.api.WasmDebugInfoLocation; import org.teavm.tooling.TeaVMTargetType; @@ -30,6 +34,7 @@ public GenerateWasmGCTask() { getDebugInfoLevel().convention(WasmDebugInfoLevel.DEOBFUSCATION); getDebugInfoLocation().convention(WasmDebugInfoLocation.EXTERNAL); getSourceMap().convention(false); + getSourceFilePolicy().convention(SourceFilePolicy.LINK_LOCAL_FILES); } @Input @@ -50,6 +55,13 @@ public GenerateWasmGCTask() { @Input public abstract Property getSourceMap(); + @InputFiles + public abstract ConfigurableFileCollection getSourceFiles(); + + @Input + @Optional + public abstract Property getSourceFilePolicy(); + @Override protected void setupBuilder(BuildStrategy builder) { builder.setStrict(getStrict().get()); @@ -73,5 +85,7 @@ protected void setupBuilder(BuildStrategy builder) { break; } builder.setTargetType(TeaVMTargetType.WEBASSEMBLY_GC); + TaskUtils.applySourceFiles(getSourceFiles(), builder); + TaskUtils.applySourceFilePolicy(getSourceFilePolicy(), builder); } } diff --git a/tools/gradle/src/main/java/org/teavm/gradle/tasks/TaskUtils.java b/tools/gradle/src/main/java/org/teavm/gradle/tasks/TaskUtils.java new file mode 100644 index 0000000000..507968732e --- /dev/null +++ b/tools/gradle/src/main/java/org/teavm/gradle/tasks/TaskUtils.java @@ -0,0 +1,53 @@ +/* + * Copyright 2024 konsoletyper. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.teavm.gradle.tasks; + +import org.gradle.api.file.ConfigurableFileCollection; +import org.gradle.api.provider.Property; +import org.teavm.gradle.api.SourceFilePolicy; +import org.teavm.tooling.TeaVMSourceFilePolicy; +import org.teavm.tooling.builder.BuildStrategy; + +final class TaskUtils { + private TaskUtils() { + } + + static void applySourceFiles(ConfigurableFileCollection sourceFiles, BuildStrategy builder) { + for (var file : sourceFiles) { + if (file.isFile()) { + if (file.getName().endsWith(".jar") || file.getName().endsWith(".zip")) { + builder.addSourcesJar(file.getAbsolutePath()); + } + } else if (file.isDirectory()) { + builder.addSourcesDirectory(file.getAbsolutePath()); + } + } + } + + static void applySourceFilePolicy(Property policy, BuildStrategy builder) { + switch (policy.get()) { + case DO_NOTHING: + builder.setSourceFilePolicy(TeaVMSourceFilePolicy.DO_NOTHING); + break; + case COPY: + builder.setSourceFilePolicy(TeaVMSourceFilePolicy.COPY); + break; + case LINK_LOCAL_FILES: + builder.setSourceFilePolicy(TeaVMSourceFilePolicy.LINK_LOCAL_FILES); + break; + } + } +} diff --git a/tools/junit/src/main/java/org/teavm/junit/WebAssemblyGCPlatformSupport.java b/tools/junit/src/main/java/org/teavm/junit/WebAssemblyGCPlatformSupport.java index a83e29a119..6901b07055 100644 --- a/tools/junit/src/main/java/org/teavm/junit/WebAssemblyGCPlatformSupport.java +++ b/tools/junit/src/main/java/org/teavm/junit/WebAssemblyGCPlatformSupport.java @@ -169,7 +169,7 @@ void additionalOutput(File outputPath, File outputPathForMethod, TeaVMTestConfig getExtension() + "-deobfuscator.wasm"); try { TestUtil.resourceToFile("org/teavm/backend/wasm/wasm-gc-runtime.js", testPath, Map.of()); - TestUtil.resourceToFile("deobfuscator.wasm", testDeobfuscatorPath, Map.of()); + TestUtil.resourceToFile("org/teavm/backend/wasm/deobfuscator.wasm", testDeobfuscatorPath, Map.of()); } catch (IOException e) { throw new RuntimeException(e); }