Fix performance regressions in large multi-project builds. (#571)

* Perf improvements to multi-project builds. * Fixes. * More fixes. * Layered mappings fixes * Perf improvements. Undo broken fix. * Fix remap classpath being empty. * Another gradle bug? Either way this is fine and works. * Fix broken test * Final fixes? * Fix and cleanup mixin ap mappings.
2026-03-30 21:05:58 -05:00 · 2022-01-14 19:50:45 +00:00
parent 6fd3d5d021
commit d40241d75a
36 changed files with 1179 additions and 416 deletions
--- a/src/main/java/net/fabricmc/loom/task/PrepareJarRemapTask.java
+++ b/src/main/java/net/fabricmc/loom/task/PrepareJarRemapTask.java
@@ -0,0 +1,108 @@
+/*
+ * This file is part of fabric-loom, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) 2022 FabricMC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package net.fabricmc.loom.task;
+
+import java.nio.file.Path;
+
+import javax.inject.Inject;
+
+import org.gradle.api.file.RegularFileProperty;
+import org.gradle.api.provider.Property;
+import org.gradle.api.tasks.InputFile;
+import org.gradle.api.tasks.TaskAction;
+import org.gradle.workers.WorkAction;
+import org.gradle.workers.WorkParameters;
+import org.gradle.workers.WorkQueue;
+import org.gradle.workers.WorkerExecutor;
+
+import net.fabricmc.loom.task.service.TinyRemapperService;
+import net.fabricmc.loom.util.service.UnsafeWorkQueueHelper;
+import net.fabricmc.tinyremapper.TinyRemapper;
+
+/**
+ * The prepare remap task runs before all other jar remap tasks, should be used to setup tiny remapper.
+ */
+public abstract class PrepareJarRemapTask extends AbstractLoomTask {
+	private final RemapJarTask remapJarTask;
+	@InputFile
+	public abstract RegularFileProperty getInputFile();
+
+	@Inject
+	public PrepareJarRemapTask(RemapJarTask remapJarTask) {
+		this.remapJarTask = remapJarTask;
+
+		getInputFile().set(remapJarTask.getInputFile());
+		// TODO can this be up-to-date when the main task is up-to date?
+		getOutputs().upToDateWhen((o) -> false);
+
+		getProject().getGradle().allprojects(project -> {
+			project.getTasks().configureEach(task -> {
+				if (task instanceof PrepareJarRemapTask otherTask) {
+					if (otherTask == this) return;
+
+					// Ensure that all other prepare tasks inputs have completed
+					dependsOn(otherTask.getInputs());
+					mustRunAfter(otherTask.getInputs());
+				}
+			});
+		});
+	}
+
+	@Inject
+	protected abstract WorkerExecutor getWorkerExecutor();
+
+	@TaskAction
+	public void run() {
+		final WorkQueue workQueue = getWorkerExecutor().noIsolation();
+
+		workQueue.submit(ReadInputsAction.class, params -> {
+			params.getTinyRemapperBuildServiceUuid().set(UnsafeWorkQueueHelper.create(getProject(), remapJarTask.getTinyRemapperService()));
+			params.getInputTagName().set(remapJarTask.getInputTagName());
+			params.getInputFile().set(getInputFile());
+		});
+	}
+
+	public interface ReadInputsParams extends WorkParameters {
+		Property<String> getTinyRemapperBuildServiceUuid();
+		Property<String> getInputTagName();
+		RegularFileProperty getInputFile();
+	}
+
+	public abstract static class ReadInputsAction implements WorkAction<ReadInputsParams> {
+		private final TinyRemapperService tinyRemapperService;
+
+		public ReadInputsAction() {
+			this.tinyRemapperService = UnsafeWorkQueueHelper.get(getParameters().getTinyRemapperBuildServiceUuid(), TinyRemapperService.class);
+		}
+
+		@Override
+		public void execute() {
+			final TinyRemapper tinyRemapper = tinyRemapperService.getTinyRemapperForInputs();
+			final Path inputFile = getParameters().getInputFile().getAsFile().get().toPath();
+
+			tinyRemapper.readInputsAsync(tinyRemapperService.createTag(getParameters().getInputTagName().get()), inputFile);
+		}
+	}
+}