Paper/patches/server/0230-Improve-BlockPosition-inlining.patch

64 Zeilen
2.5 KiB
Diff

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Wed, 30 Nov 2016 20:56:58 -0600
Subject: [PATCH] Improve BlockPosition inlining
Normally the JVM can inline virtual getters by having two sets of code, one is the 'optimized' code and the other is the 'deoptimized' code.
If a single type is used 99% of the time, then its worth it to inline, and to revert to 'deoptimized' the 1% of the time we encounter other types.
But if two types are encountered commonly, then the JVM can't inline them both, and the call overhead remains.
This scenario also occurs with BlockPos and MutableBlockPos.
The variables in BlockPos are final, so MutableBlockPos can't modify them.
MutableBlockPos fixes this by adding custom mutable variables, and overriding the getters to access them.
This approach with utility methods that operate on MutableBlockPos and BlockPos.
Specific examples are BlockPosition.up(), and World.isValidLocation().
It makes these simple methods much slower than they need to be.
This should result in an across the board speedup in anything that accesses blocks or does logic with positions.
This is based upon conclusions drawn from inspecting the assenmbly generated bythe JIT compiler on my microbenchmarks.
They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
diff --git a/src/main/java/net/minecraft/core/Vec3i.java b/src/main/java/net/minecraft/core/Vec3i.java
index 9f32861d791f7e4cb39d2ad01f48e1916fc2b4b1..73b3c5f5c037fbe3f588f8f4b0113bef283632a4 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/core/Vec3i.java
+++ b/src/main/java/net/minecraft/core/Vec3i.java
@@ -50,7 +50,7 @@ public class Vec3i implements Comparable<Vec3i> {
2021-06-11 14:02:28 +02:00
}
2021-06-12 23:31:35 +02:00
@Override
2021-06-11 14:02:28 +02:00
- public boolean equals(Object object) {
+ public final boolean equals(Object object) { // Paper
if (this == object) {
return true;
} else if (!(object instanceof Vec3i)) {
@@ -68,7 +68,7 @@ public class Vec3i implements Comparable<Vec3i> {
2021-06-11 14:02:28 +02:00
}
2021-06-12 23:31:35 +02:00
@Override
2021-06-11 14:02:28 +02:00
- public int hashCode() {
+ public final int hashCode() { // Paper
return (this.getY() + this.getZ() * 31) * 31 + this.getX();
}
@@ -81,15 +81,15 @@ public class Vec3i implements Comparable<Vec3i> {
2021-06-12 23:31:35 +02:00
}
2021-06-11 14:02:28 +02:00
}
- public int getX() {
+ public final int getX() { // Paper
return this.x;
}
- public int getY() {
+ public final int getY() { // Paper
return this.y;
}
- public int getZ() {
+ public final int getZ() { // Paper
return this.z;
}