From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 4 Aug 2020 22:24:15 +0200 Subject: [PATCH] Optimize Pathfinder - Remove Streams / Optimized collections I utilized the IDE to convert streams to non streams code, so shouldn't be any risk of behavior change. Only did minor optimization of the generated code set to remove unnecessary things. I expect us to just drop this patch on next major update and re-apply it with the IDE again and re-apply the collections optimization. Optimize collection by creating a list instead of a set of the key and value. This lets us get faster foreach iteration, as well as avoids map lookups on the values when needed. diff --git a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java index 8519383a9abd45434c1e9888e77548941a80c79c..8aa4ac3a6affbe888d6084a27b668c58dfda6c79 100644 --- a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java +++ b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java @@ -38,9 +38,12 @@ public class PathFinder { if (node == null) { return null; } else { - Map map = positions.stream().collect(Collectors.toMap((pos) -> { - return this.nodeEvaluator.getGoal((double)pos.getX(), (double)pos.getY(), (double)pos.getZ()); - }, Function.identity())); + // Paper start - Perf: remove streams and optimize collection + List> map = Lists.newArrayList(); + for (BlockPos pos : positions) { + map.add(new java.util.AbstractMap.SimpleEntry<>(this.nodeEvaluator.getGoal(pos.getX(), pos.getY(), pos.getZ()), pos)); + } + // Paper end - Perf: remove streams and optimize collection Path path = this.findPath(world.getProfiler(), node, map, followRange, distance, rangeMultiplier); this.nodeEvaluator.done(); return path; @@ -48,18 +51,19 @@ public class PathFinder { } @Nullable - private Path findPath(ProfilerFiller profiler, Node startNode, Map positions, float followRange, int distance, float rangeMultiplier) { + // Paper start - Perf: remove streams and optimize collection + private Path findPath(ProfilerFiller profiler, Node startNode, List> positions, float followRange, int distance, float rangeMultiplier) { profiler.push("find_path"); profiler.markForCharting(MetricCategory.PATH_FINDING); - Set set = positions.keySet(); + // Set set = positions.keySet(); startNode.g = 0.0F; - startNode.h = this.getBestH(startNode, set); + startNode.h = this.getBestH(startNode, positions); // Paper - optimize collection startNode.f = startNode.h; this.openSet.clear(); this.openSet.insert(startNode); - Set set2 = ImmutableSet.of(); + // Set set2 = ImmutableSet.of(); // Paper - unused - diff on change int i = 0; - Set set3 = Sets.newHashSetWithExpectedSize(set.size()); + List> entryList = Lists.newArrayListWithExpectedSize(positions.size()); // Paper - optimize collection int j = (int)((float)this.maxVisitedNodes * rangeMultiplier); while(!this.openSet.isEmpty()) { @@ -71,14 +75,18 @@ public class PathFinder { Node node = this.openSet.pop(); node.closed = true; - for(Target target : set) { + // Paper start - optimize collection + for(int i1 = 0; i1 < positions.size(); i1++) { + final Map.Entry entry = positions.get(i1); + Target target = entry.getKey(); if (node.distanceManhattan(target) <= (float)distance) { target.setReached(); - set3.add(target); + entryList.add(entry); + // Paper end - Perf: remove streams and optimize collection } } - if (!set3.isEmpty()) { + if (!entryList.isEmpty()) { // Paper - Perf: remove streams and optimize collection; rename break; } @@ -93,7 +101,7 @@ public class PathFinder { if (node2.walkedDistance < followRange && (!node2.inOpenSet() || g < node2.g)) { node2.cameFrom = node; node2.g = g; - node2.h = this.getBestH(node2, set) * 1.5F; + node2.h = this.getBestH(node2, positions) * 1.5F; // Paper - Perf: remove streams and optimize collection if (node2.inOpenSet()) { this.openSet.changeCost(node2, node2.g + node2.h); } else { @@ -105,23 +113,32 @@ public class PathFinder { } } - Optional optional = !set3.isEmpty() ? set3.stream().map((node) -> { - return this.reconstructPath(node.getBestNode(), positions.get(node), true); - }).min(Comparator.comparingInt(Path::getNodeCount)) : set.stream().map((target) -> { - return this.reconstructPath(target.getBestNode(), positions.get(target), false); - }).min(Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getNodeCount)); + // Paper start - Perf: remove streams and optimize collection + Path best = null; + boolean entryListIsEmpty = entryList.isEmpty(); + Comparator comparator = entryListIsEmpty ? Comparator.comparingInt(Path::getNodeCount) + : Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getNodeCount); + for (Map.Entry entry : entryListIsEmpty ? positions : entryList) { + Path path = this.reconstructPath(entry.getKey().getBestNode(), entry.getValue(), !entryListIsEmpty); + if (best == null || comparator.compare(path, best) < 0) + best = path; + } profiler.pop(); - return optional.isEmpty() ? null : optional.get(); + return best; + // Paper end - Perf: remove streams and optimize collection } protected float distance(Node a, Node b) { return a.distanceTo(b); } - private float getBestH(Node node, Set targets) { + private float getBestH(Node node, List> targets) { // Paper - Perf: remove streams and optimize collection; Set -> List> float f = Float.MAX_VALUE; - for(Target target : targets) { + // Paper start - Perf: remove streams and optimize collection + for (int i = 0, targetsSize = targets.size(); i < targetsSize; i++) { + final Target target = targets.get(i).getKey(); + // Paper end - Perf: remove streams and optimize collection float g = node.distanceTo(target); target.updateBest(g, node); f = Math.min(g, f);