Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-27 22:17:45 +02:00
Code Issues Projects Releases Wiki Activity

Cache optimization

Browse Source
This commit is contained in:
themode 2022-03-30 16:50:08 +02:00
parent 37243b6369
commit bc0cb57c61
1 changed files with 17 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/net/minestom/server/instance/palette/FlexiblePalette.java
View File

@ -16,18 +16,6 @@ import java.util.function.IntUnaryOperator;
*/ */
final class FlexiblePalette implements SpecializedPalette, Cloneable { final class FlexiblePalette implements SpecializedPalette, Cloneable {
private static final ThreadLocal<int[]> WRITE_CACHE = ThreadLocal.withInitial(() -> new int[4096]); private static final ThreadLocal<int[]> WRITE_CACHE = ThreadLocal.withInitial(() -> new int[4096]);
private static final int[] MAGIC_MASKS;
private static final int[] VALUES_PER_LONG;
static {
final int entries = 16;
MAGIC_MASKS = new int[entries];
VALUES_PER_LONG = new int[entries];
for (int i = 1; i < entries; i++) {
MAGIC_MASKS[i] = Integer.MAX_VALUE >> (31 - i);
VALUES_PER_LONG[i] = Long.SIZE / i;
}
}
// Specific to this palette type // Specific to this palette type
private final AdaptivePalette adaptivePalette; private final AdaptivePalette adaptivePalette;
@ -51,7 +39,7 @@ final class FlexiblePalette implements SpecializedPalette, Cloneable {
this.valueToPaletteMap.put(0, 0); this.valueToPaletteMap.put(0, 0);
this.valueToPaletteMap.defaultReturnValue(-1); this.valueToPaletteMap.defaultReturnValue(-1);
final int valuesPerLong = VALUES_PER_LONG[bitsPerEntry]; final int valuesPerLong = 64 / bitsPerEntry;
this.values = new long[(maxSize() + valuesPerLong - 1) / valuesPerLong]; this.values = new long[(maxSize() + valuesPerLong - 1) / valuesPerLong];
} }
@ -61,13 +49,12 @@ final class FlexiblePalette implements SpecializedPalette, Cloneable {
@Override @Override
public int get(int x, int y, int z) { public int get(int x, int y, int z) {
final long[] values = this.values;
final int bitsPerEntry = this.bitsPerEntry; final int bitsPerEntry = this.bitsPerEntry;
final int valuesPerLong = VALUES_PER_LONG[bitsPerEntry]; final int sectionIndex = getSectionIndex(x, y, z);
final int sectionIdentifier = getSectionIndex(x, y, z); final int valuesPerLong = 64 / bitsPerEntry;
final int index = sectionIdentifier / valuesPerLong; final int index = sectionIndex / valuesPerLong;
final int bitIndex = sectionIdentifier % valuesPerLong * bitsPerEntry; final int bitIndex = (sectionIndex - index * valuesPerLong) * bitsPerEntry;
final short value = (short) (values[index] >> bitIndex & MAGIC_MASKS[bitsPerEntry]); final int value = (int) (values[index] >> bitIndex) & ((1 << bitsPerEntry) - 1);
// Change to palette value and return // Change to palette value and return
return hasPalette() ? paletteToValueList.getInt(value) : value; return hasPalette() ? paletteToValueList.getInt(value) : value;
} }
@ -86,15 +73,15 @@ final class FlexiblePalette implements SpecializedPalette, Cloneable {
public void set(int x, int y, int z, int value) { public void set(int x, int y, int z, int value) {
value = getPaletteIndex(value); value = getPaletteIndex(value);
final int bitsPerEntry = this.bitsPerEntry; final int bitsPerEntry = this.bitsPerEntry;
final int valuesPerLong = VALUES_PER_LONG[bitsPerEntry];
final long[] values = this.values; final long[] values = this.values;
// Change to palette value // Change to palette value
final int valuesPerLong = 64 / bitsPerEntry;
final int sectionIndex = getSectionIndex(x, y, z); final int sectionIndex = getSectionIndex(x, y, z);
final int index = sectionIndex / valuesPerLong; final int index = sectionIndex / valuesPerLong;
final int bitIndex = (sectionIndex % valuesPerLong) * bitsPerEntry; final int bitIndex = (sectionIndex - index * valuesPerLong) * bitsPerEntry;
long block = values[index]; final long block = values[index];
final long clear = MAGIC_MASKS[bitsPerEntry]; final long clear = (1L << bitsPerEntry) - 1;
final long oldBlock = block >> bitIndex & clear; final long oldBlock = block >> bitIndex & clear;
if (oldBlock == value) if (oldBlock == value)
return; // Trying to place the same block return; // Trying to place the same block
@ -116,7 +103,7 @@ final class FlexiblePalette implements SpecializedPalette, Cloneable {
} }
value = getPaletteIndex(value); value = getPaletteIndex(value);
final int bitsPerEntry = this.bitsPerEntry; final int bitsPerEntry = this.bitsPerEntry;
final int valuesPerLong = VALUES_PER_LONG[bitsPerEntry]; final int valuesPerLong = 64 / bitsPerEntry;
final long[] values = this.values; final long[] values = this.values;
long block = 0; long block = 0;
for (int i = 0; i < valuesPerLong; i++) for (int i = 0; i < valuesPerLong; i++)
@ -127,7 +114,7 @@ final class FlexiblePalette implements SpecializedPalette, Cloneable {
@Override @Override
public void setAll(@NotNull EntrySupplier supplier) { public void setAll(@NotNull EntrySupplier supplier) {
int[] cache = sizeCache(maxSize()); int[] cache = WRITE_CACHE.get();
final int dimension = dimension(); final int dimension = dimension();
// Fill cache with values // Fill cache with values
int fillValue = -1; int fillValue = -1;
@ -172,7 +159,7 @@ final class FlexiblePalette implements SpecializedPalette, Cloneable {
@Override @Override
public void replaceAll(@NotNull EntryFunction function) { public void replaceAll(@NotNull EntryFunction function) {
int[] cache = sizeCache(maxSize()); int[] cache = WRITE_CACHE.get();
AtomicInteger arrayIndex = new AtomicInteger(); AtomicInteger arrayIndex = new AtomicInteger();
AtomicInteger count = new AtomicInteger(); AtomicInteger count = new AtomicInteger();
getAll((x, y, z, value) -> { getAll((x, y, z, value) -> {
@ -235,8 +222,8 @@ final class FlexiblePalette implements SpecializedPalette, Cloneable {
final long[] values = this.values; final long[] values = this.values;
final int dimension = this.dimension(); final int dimension = this.dimension();
final int bitsPerEntry = this.bitsPerEntry; final int bitsPerEntry = this.bitsPerEntry;
final int magicMask = MAGIC_MASKS[bitsPerEntry]; final int magicMask = (1 << bitsPerEntry) - 1;
final int valuesPerLong = VALUES_PER_LONG[bitsPerEntry]; final int valuesPerLong = 64 / bitsPerEntry;
final int size = maxSize(); final int size = maxSize();
final int dimensionMinus = dimension - 1; final int dimensionMinus = dimension - 1;
final int[] ids = hasPalette() ? paletteToValueList.elements() : null; final int[] ids = hasPalette() ? paletteToValueList.elements() : null;
@ -277,9 +264,9 @@ final class FlexiblePalette implements SpecializedPalette, Cloneable {
final int size = maxSize(); final int size = maxSize();
assert paletteValues.length >= size; assert paletteValues.length >= size;
final int bitsPerEntry = this.bitsPerEntry; final int bitsPerEntry = this.bitsPerEntry;
final int valuesPerLong = VALUES_PER_LONG[bitsPerEntry]; final int valuesPerLong = 64 / bitsPerEntry;
final long[] values = this.values; final long[] values = this.values;
final int magicMask = MAGIC_MASKS[bitsPerEntry]; final int magicMask = (1 << bitsPerEntry) - 1;
for (int i = 0; i < values.length; i++) { for (int i = 0; i < values.length; i++) {
long block = values[i]; long block = values[i];
int index = i * valuesPerLong; int index = i * valuesPerLong;
@ -333,15 +320,6 @@ final class FlexiblePalette implements SpecializedPalette, Cloneable {
return y << (dimensionBitCount << 1) | z << dimensionBitCount | x; return y << (dimensionBitCount << 1) | z << dimensionBitCount | x;
} }
static int[] sizeCache(int size) {
int[] cache = WRITE_CACHE.get();
if (cache.length < size) {
cache = new int[size];
WRITE_CACHE.set(cache);
}
return cache;
}
static int maxPaletteSize(int bitsPerEntry) { static int maxPaletteSize(int bitsPerEntry) {
return 1 << bitsPerEntry; return 1 << bitsPerEntry;
} }