mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-04 22:14:40 +01:00
206 lines
8.5 KiB
Diff
206 lines
8.5 KiB
Diff
From a6489b7ad504d1f5609ff1cf0e3c86f25eac0ba0 Mon Sep 17 00:00:00 2001
|
|
From: Techcable <Techcable@outlook.com>
|
|
Date: Wed, 30 Nov 2016 20:56:58 -0600
|
|
Subject: [PATCH] Speedup BlockPos by fixing 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 mircorbenchmarks.
|
|
They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
|
|
index 58f8b4b72..98992513d 100644
|
|
--- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
|
|
+++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
|
|
@@ -7,22 +7,22 @@ import javax.annotation.concurrent.Immutable;
|
|
public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
|
|
|
|
public static final BaseBlockPosition ZERO = new BaseBlockPosition(0, 0, 0);
|
|
- private final int a;
|
|
- private final int b;
|
|
- private final int c;
|
|
// Paper start
|
|
+ protected int x;
|
|
+ protected int y;
|
|
+ protected int z;
|
|
public boolean isValidLocation() {
|
|
- return a >= -30000000 && c >= -30000000 && a < 30000000 && c < 30000000 && b >= 0 && b < 256;
|
|
+ return x >= -30000000 && z >= -30000000 && x < 30000000 && z < 30000000 && y >= 0 && y < 256;
|
|
}
|
|
public boolean isInvalidYLocation() {
|
|
- return b < 0 || b >= 256;
|
|
+ return y < 0 || y >= 256;
|
|
}
|
|
// Paper end
|
|
|
|
public BaseBlockPosition(int i, int j, int k) {
|
|
- this.a = i;
|
|
- this.b = j;
|
|
- this.c = k;
|
|
+ this.x = i;
|
|
+ this.y = j;
|
|
+ this.z = k;
|
|
}
|
|
|
|
public BaseBlockPosition(double d0, double d1, double d2) {
|
|
@@ -49,17 +49,19 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
|
|
return this.getY() == baseblockposition.getY() ? (this.getZ() == baseblockposition.getZ() ? this.getX() - baseblockposition.getX() : this.getZ() - baseblockposition.getZ()) : this.getY() - baseblockposition.getY();
|
|
}
|
|
|
|
- public int getX() {
|
|
- return this.a;
|
|
+ // Paper start
|
|
+ public final int getX() {
|
|
+ return this.x;
|
|
}
|
|
|
|
public int getY() {
|
|
- return this.b;
|
|
+ return this.y;
|
|
}
|
|
|
|
public int getZ() {
|
|
- return this.c;
|
|
+ return this.z;
|
|
}
|
|
+ // Paper end
|
|
|
|
public BaseBlockPosition d(BaseBlockPosition baseblockposition) {
|
|
return new BaseBlockPosition(this.getY() * baseblockposition.getZ() - this.getZ() * baseblockposition.getY(), this.getZ() * baseblockposition.getX() - this.getX() * baseblockposition.getZ(), this.getX() * baseblockposition.getY() - this.getY() * baseblockposition.getX());
|
|
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
|
|
index 252e00e16..f769b178c 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockPosition.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
|
|
@@ -207,18 +207,20 @@ public class BlockPosition extends BaseBlockPosition {
|
|
if (this.g == null) {
|
|
this.g = new BlockPosition.MutableBlockPosition(i, j, k);
|
|
return this.g;
|
|
- } else if (this.g.b == l && this.g.c == i1 && this.g.d == j1) {
|
|
+ } else if (this.g.x == l && this.g.y == i1 && this.g.z == j1) { // Paper
|
|
return (BlockPosition.MutableBlockPosition) this.endOfData();
|
|
} else {
|
|
- if (this.g.b < l) {
|
|
- ++this.g.b;
|
|
- } else if (this.g.c < i1) {
|
|
- this.g.b = i; // Paper - Readd line removed by the decompiler
|
|
- ++this.g.c;
|
|
- } else if (this.g.d < j1) {
|
|
- this.g.b = i; // Paper - Readd line removed by the decompiler
|
|
- this.g.c = j; // Paper - Readd line removed by the decompiler
|
|
- ++this.g.d;
|
|
+ // Paper start - use xyz
|
|
+ if (this.g.x < l) {
|
|
+ ++this.g.x;
|
|
+ } else if (this.g.y < i1) {
|
|
+ this.g.x = i; // Paper - Readd line removed by the decompiler
|
|
+ ++this.g.y;
|
|
+ } else if (this.g.z < j1) {
|
|
+ this.g.x = i; // Paper - Readd line removed by the decompiler
|
|
+ this.g.y = j; // Paper - Readd line removed by the decompiler
|
|
+ ++this.g.z;
|
|
+ // Paper end
|
|
}
|
|
|
|
return this.g;
|
|
@@ -338,10 +340,12 @@ public class BlockPosition extends BaseBlockPosition {
|
|
|
|
public static class MutableBlockPosition extends BlockPosition {
|
|
|
|
+ // Paper start - comment out
|
|
+ /*
|
|
protected int b;
|
|
protected int c;
|
|
protected int d;
|
|
- // Paper start
|
|
+
|
|
@Override
|
|
public boolean isValidLocation() {
|
|
return b >= -30000000 && d >= -30000000 && b < 30000000 && d < 30000000 && c >= 0 && c < 256;
|
|
@@ -350,6 +354,7 @@ public class BlockPosition extends BaseBlockPosition {
|
|
public boolean isInvalidYLocation() {
|
|
return c < 0 || c >= 256;
|
|
}
|
|
+ */
|
|
// Paper end
|
|
|
|
public MutableBlockPosition() {
|
|
@@ -361,10 +366,13 @@ public class BlockPosition extends BaseBlockPosition {
|
|
}
|
|
|
|
public MutableBlockPosition(int i, int j, int k) {
|
|
- super(0, 0, 0);
|
|
+ // Paper start
|
|
+ super(i, j, k);
|
|
+ /*
|
|
this.b = i;
|
|
this.c = j;
|
|
- this.d = k;
|
|
+ this.d = k;*/
|
|
+ // Paper end
|
|
}
|
|
|
|
public BlockPosition a(double d0, double d1, double d2) {
|
|
@@ -383,6 +391,8 @@ public class BlockPosition extends BaseBlockPosition {
|
|
return super.a(enumblockrotation).h();
|
|
}
|
|
|
|
+ /*
|
|
+ // Paper start - use parent getters
|
|
public int getX() {
|
|
return this.b;
|
|
}
|
|
@@ -393,13 +403,16 @@ public class BlockPosition extends BaseBlockPosition {
|
|
|
|
public int getZ() {
|
|
return this.d;
|
|
- }
|
|
+ }*/
|
|
+ // Paper end
|
|
|
|
public BlockPosition.MutableBlockPosition setValues(int i, int j, int k) { return c(i, j, k);} // Paper - OBFHELPER
|
|
public BlockPosition.MutableBlockPosition c(int i, int j, int k) {
|
|
- this.b = i;
|
|
- this.c = j;
|
|
- this.d = k;
|
|
+ // Paper start - use xyz
|
|
+ this.x = i;
|
|
+ this.y = j;
|
|
+ this.z = k;
|
|
+ // Paper end
|
|
return this;
|
|
}
|
|
|
|
@@ -417,15 +430,15 @@ public class BlockPosition extends BaseBlockPosition {
|
|
}
|
|
|
|
public BlockPosition.MutableBlockPosition c(EnumDirection enumdirection, int i) {
|
|
- return this.c(this.b + enumdirection.getAdjacentX() * i, this.c + enumdirection.getAdjacentY() * i, this.d + enumdirection.getAdjacentZ() * i);
|
|
+ return this.c(x + enumdirection.getAdjacentX() * i, y + enumdirection.getAdjacentY() * i, z + enumdirection.getAdjacentZ() * i); // Paper - use xyz
|
|
}
|
|
|
|
public BlockPosition.MutableBlockPosition d(int i, int j, int k) {
|
|
- return this.c(this.b + i, this.c + j, this.d + k);
|
|
+ return this.c(x + i, y + j, z + k); // Paper - use xyz
|
|
}
|
|
|
|
public void p(int i) {
|
|
- this.c = i;
|
|
+ this.y = i; // Paper change to y
|
|
}
|
|
|
|
public BlockPosition h() {
|
|
--
|
|
2.18.0
|
|
|