From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Apr 2016 21:38:58 -0400 Subject: [PATCH] Optimize DataBits Remove Debug checks as these are super hot and causing noticeable hits Before: http://i.imgur.com/nQsMzAE.png After: http://i.imgur.com/nJ46crB.png Optimize redundant converting of static fields into an unsigned long each call by precomputing it in ctor diff --git a/src/main/java/net/minecraft/util/SimpleBitStorage.java b/src/main/java/net/minecraft/util/SimpleBitStorage.java index ebfc546d258b92ee02e0e726b9d4dbff6a671d51..6426d6c2c31ead49444fe56e2230266290fa79dd 100644 --- a/src/main/java/net/minecraft/util/SimpleBitStorage.java +++ b/src/main/java/net/minecraft/util/SimpleBitStorage.java @@ -11,8 +11,8 @@ public class SimpleBitStorage implements BitStorage { private final long mask; private final int size; private final int valuesPerLong; - private final int divideMul; - private final int divideAdd; + private final int divideMul; private final long divideMulUnsigned; // Paper - referenced in b(int) with 2 Integer.toUnsignedLong calls + private final int divideAdd; private final long divideAddUnsigned; // Paper private final int divideShift; public SimpleBitStorage(int elementBits, int size, int[] is) { @@ -56,8 +56,8 @@ public class SimpleBitStorage implements BitStorage { this.mask = (1L << elementBits) - 1L; this.valuesPerLong = (char)(64 / elementBits); int i = 3 * (this.valuesPerLong - 1); - this.divideMul = MAGIC[i + 0]; - this.divideAdd = MAGIC[i + 1]; + this.divideMul = MAGIC[i + 0]; this.divideMulUnsigned = Integer.toUnsignedLong(this.divideMul); // Paper + this.divideAdd = MAGIC[i + 1]; this.divideAddUnsigned = Integer.toUnsignedLong(this.divideAdd); // Paper this.divideShift = MAGIC[i + 2]; int j = (size + this.valuesPerLong - 1) / this.valuesPerLong; if (data != null) { @@ -73,15 +73,15 @@ public class SimpleBitStorage implements BitStorage { } private int cellIndex(int index) { - long l = Integer.toUnsignedLong(this.divideMul); - long m = Integer.toUnsignedLong(this.divideAdd); - return (int)((long)index * l + m >> 32 >> this.divideShift); + //long l = Integer.toUnsignedLong(this.divideMul); // Paper + //long m = Integer.toUnsignedLong(this.divideAdd); // Paper + return (int) ((long) index * this.divideMulUnsigned + this.divideAddUnsigned >> 32 >> this.divideShift); // Paper } @Override - public int getAndSet(int index, int value) { - Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index); - Validate.inclusiveBetween(0L, this.mask, (long)value); + public final int getAndSet(int index, int value) { // Paper - make final for inline + //Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index); // Paper + //Validate.inclusiveBetween(0L, this.mask, (long)value); // Paper int i = this.cellIndex(index); long l = this.data[i]; int j = (index - i * this.valuesPerLong) * this.bits; @@ -91,9 +91,9 @@ public class SimpleBitStorage implements BitStorage { } @Override - public void set(int index, int value) { - Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index); - Validate.inclusiveBetween(0L, this.mask, (long)value); + public final void set(int index, int value) { // Paper - make final for inline + //Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index); // Paper + //Validate.inclusiveBetween(0L, this.mask, (long)value); // Paper int i = this.cellIndex(index); long l = this.data[i]; int j = (index - i * this.valuesPerLong) * this.bits; @@ -101,8 +101,8 @@ public class SimpleBitStorage implements BitStorage { } @Override - public int get(int index) { - Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index); + public final int get(int index) { // Paper - make final for inline + //Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index); int i = this.cellIndex(index); long l = this.data[i]; int j = (index - i * this.valuesPerLong) * this.bits; diff --git a/src/main/java/net/minecraft/util/ZeroBitStorage.java b/src/main/java/net/minecraft/util/ZeroBitStorage.java index 172e7a0761724cc802387e613258830a0defb04a..9686ce7536c9924b1b2aced4f013f46759cbc72e 100644 --- a/src/main/java/net/minecraft/util/ZeroBitStorage.java +++ b/src/main/java/net/minecraft/util/ZeroBitStorage.java @@ -13,21 +13,21 @@ public class ZeroBitStorage implements BitStorage { } @Override - public int getAndSet(int index, int value) { - Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index); - Validate.inclusiveBetween(0L, 0L, (long)value); + public final int getAndSet(int index, int value) { // Paper - make final for inline + //Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index); // Paper + //Validate.inclusiveBetween(0L, 0L, (long)value); // Paper return 0; } @Override - public void set(int index, int value) { - Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index); - Validate.inclusiveBetween(0L, 0L, (long)value); + public final void set(int index, int value) { // Paper - make final for inline + //Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index); // Paper + //Validate.inclusiveBetween(0L, 0L, (long)value); // Paper } @Override - public int get(int index) { - Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index); + public final int get(int index) { // Paper - make final for inline + //Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index); // Paper return 0; }