eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 16:14:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

wasm gc: reduce amount of code generated for initialization of strings

Browse Source
This commit is contained in:
Alexey Andreev 2024-09-26 18:59:44 +02:00
parent 58cef561a3
commit 4d416af7dc
2 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/org/teavm/backend/wasm/WasmGCModuleGenerator.java
View File

@ -193,8 +193,9 @@ public class WasmGCModuleGenerator {
var functionType = declarationsGenerator.functionTypes.of(null); var functionType = declarationsGenerator.functionTypes.of(null);
initializer = new WasmFunction(functionType); initializer = new WasmFunction(functionType);
initializer.setReferenced(true); initializer.setReferenced(true);
initializer.setName("teavm@initializer");
declarationsGenerator.module.functions.add(initializer); declarationsGenerator.module.functions.add(initializer);
initializerRef = new WasmGlobal("teavm@initializer", functionType.getNonNullReference(), initializerRef = new WasmGlobal("teavm@initializerRef", functionType.getNonNullReference(),
new WasmFunctionReference(initializer)); new WasmFunctionReference(initializer));
declarationsGenerator.module.globals.add(initializerRef); declarationsGenerator.module.globals.add(initializerRef);
initializer.getBody().add(new WasmSetGlobal(initializerRef, initializer.getBody().add(new WasmSetGlobal(initializerRef,

54
core/src/main/java/org/teavm/backend/wasm/generate/gc/strings/WasmGCStringPool.java
View File

@ -23,15 +23,27 @@ import org.teavm.backend.wasm.generate.gc.WasmGCInitializerContributor;
import org.teavm.backend.wasm.generate.gc.WasmGCNameProvider; import org.teavm.backend.wasm.generate.gc.WasmGCNameProvider;
import org.teavm.backend.wasm.generate.gc.classes.WasmGCClassInfoProvider; import org.teavm.backend.wasm.generate.gc.classes.WasmGCClassInfoProvider;
import org.teavm.backend.wasm.generate.gc.classes.WasmGCStandardClasses; import org.teavm.backend.wasm.generate.gc.classes.WasmGCStandardClasses;
import org.teavm.backend.wasm.model.WasmArray;
import org.teavm.backend.wasm.model.WasmFunction; import org.teavm.backend.wasm.model.WasmFunction;
import org.teavm.backend.wasm.model.WasmGlobal; import org.teavm.backend.wasm.model.WasmGlobal;
import org.teavm.backend.wasm.model.WasmLocal; import org.teavm.backend.wasm.model.WasmLocal;
import org.teavm.backend.wasm.model.WasmMemorySegment; import org.teavm.backend.wasm.model.WasmMemorySegment;
import org.teavm.backend.wasm.model.WasmModule; import org.teavm.backend.wasm.model.WasmModule;
import org.teavm.backend.wasm.model.WasmType;
import org.teavm.backend.wasm.model.expression.WasmArrayGet;
import org.teavm.backend.wasm.model.expression.WasmArrayLength;
import org.teavm.backend.wasm.model.expression.WasmArrayNewFixed;
import org.teavm.backend.wasm.model.expression.WasmBlock;
import org.teavm.backend.wasm.model.expression.WasmBranch;
import org.teavm.backend.wasm.model.expression.WasmCall; import org.teavm.backend.wasm.model.expression.WasmCall;
import org.teavm.backend.wasm.model.expression.WasmDrop; import org.teavm.backend.wasm.model.expression.WasmDrop;
import org.teavm.backend.wasm.model.expression.WasmGetGlobal; import org.teavm.backend.wasm.model.expression.WasmGetGlobal;
import org.teavm.backend.wasm.model.expression.WasmGetLocal; import org.teavm.backend.wasm.model.expression.WasmGetLocal;
import org.teavm.backend.wasm.model.expression.WasmInt32Constant;
import org.teavm.backend.wasm.model.expression.WasmIntBinary;
import org.teavm.backend.wasm.model.expression.WasmIntBinaryOperation;
import org.teavm.backend.wasm.model.expression.WasmIntType;
import org.teavm.backend.wasm.model.expression.WasmSetLocal;
import org.teavm.backend.wasm.model.expression.WasmStructNewDefault; import org.teavm.backend.wasm.model.expression.WasmStructNewDefault;
import org.teavm.backend.wasm.model.expression.WasmStructSet; import org.teavm.backend.wasm.model.expression.WasmStructSet;
import org.teavm.backend.wasm.render.WasmBinaryWriter; import org.teavm.backend.wasm.render.WasmBinaryWriter;
@ -47,6 +59,8 @@ public class WasmGCStringPool implements WasmGCStringProvider, WasmGCInitializer
private Map<String, WasmGCStringConstant> stringMap = new LinkedHashMap<>(); private Map<String, WasmGCStringConstant> stringMap = new LinkedHashMap<>();
private BaseWasmFunctionRepository functionProvider; private BaseWasmFunctionRepository functionProvider;
private WasmFunction initNextStringFunction; private WasmFunction initNextStringFunction;
private WasmFunction initStringsFunction;
private WasmArray stringsArray;
private WasmGCNameProvider names; private WasmGCNameProvider names;
private WasmFunctionTypes functionTypes; private WasmFunctionTypes functionTypes;
private DependencyInfo dependencyInfo; private DependencyInfo dependencyInfo;
@ -79,9 +93,11 @@ public class WasmGCStringPool implements WasmGCStringProvider, WasmGCInitializer
void.class)); void.class));
function.getBody().add(new WasmCall(internInit)); function.getBody().add(new WasmCall(internInit));
} }
var array = new WasmArrayNewFixed(stringsArray);
for (var str : stringMap.values()) { for (var str : stringMap.values()) {
function.getBody().add(new WasmCall(initNextStringFunction, new WasmGetGlobal(str.global))); array.getElements().add(new WasmGetGlobal(str.global));
} }
function.getBody().add(new WasmCall(initStringsFunction, array));
} }
@Override @Override
@ -89,6 +105,7 @@ public class WasmGCStringPool implements WasmGCStringProvider, WasmGCInitializer
return stringMap.computeIfAbsent(string, s -> { return stringMap.computeIfAbsent(string, s -> {
if (initNextStringFunction == null) { if (initNextStringFunction == null) {
createInitNextStringFunction(); createInitNextStringFunction();
createInitStringsFunction();
} }
binaryWriter.writeLEB(string.length()); binaryWriter.writeLEB(string.length());
writeWTF8(string, binaryWriter); writeWTF8(string, binaryWriter);
@ -120,11 +137,44 @@ public class WasmGCStringPool implements WasmGCStringProvider, WasmGCInitializer
} }
} }
private void createInitStringsFunction() {
stringsArray = new WasmArray(names.topLevel("teavm@stringArray"),
standardClasses.stringClass().getStructure().getNonNullReference().asStorage());
module.types.add(stringsArray);
var function = new WasmFunction(functionTypes.of(null, stringsArray.getNonNullReference()));
function.setName(names.topLevel("teavm@initStrings"));
module.functions.add(function);
var stringsLocal = new WasmLocal(stringsArray.getNonNullReference(), "strings");
var indexLocal = new WasmLocal(WasmType.INT32, "index");
var lengthLocal = new WasmLocal(WasmType.INT32, "length");
function.add(stringsLocal);
function.add(indexLocal);
function.add(lengthLocal);
var length = new WasmArrayLength(new WasmGetLocal(stringsLocal));
function.getBody().add(new WasmSetLocal(lengthLocal, length));
function.getBody().add(new WasmSetLocal(indexLocal, new WasmInt32Constant(0)));
var loop = new WasmBlock(true);
function.getBody().add(loop);
var get = new WasmArrayGet(stringsArray, new WasmGetLocal(stringsLocal), new WasmGetLocal(indexLocal));
loop.getBody().add(new WasmCall(initNextStringFunction, get));
var next = new WasmIntBinary(WasmIntType.INT32, WasmIntBinaryOperation.ADD, new WasmGetLocal(indexLocal),
new WasmInt32Constant(1));
loop.getBody().add(new WasmSetLocal(indexLocal, next));
var compare = new WasmIntBinary(WasmIntType.INT32, WasmIntBinaryOperation.LT_UNSIGNED,
new WasmGetLocal(indexLocal), new WasmGetLocal(lengthLocal));
loop.getBody().add(new WasmBranch(compare, loop));
initStringsFunction = function;
}
private void createInitNextStringFunction() { private void createInitNextStringFunction() {
var stringTypeInfo = standardClasses.stringClass(); var stringTypeInfo = standardClasses.stringClass();
var nextCharArrayFunction = functionProvider.forStaticMethod(new MethodReference(WasmGCSupport.class, var nextCharArrayFunction = functionProvider.forStaticMethod(new MethodReference(WasmGCSupport.class,
"nextCharArray", char[].class)); "nextCharArray", char[].class));
var function = new WasmFunction(functionTypes.of(null, stringTypeInfo.getType())); var function = new WasmFunction(functionTypes.of(null, stringTypeInfo.getStructure().getNonNullReference()));
function.setName(names.topLevel("teavm@initNextString")); function.setName(names.topLevel("teavm@initNextString"));
var stringLocal = new WasmLocal(stringTypeInfo.getType()); var stringLocal = new WasmLocal(stringTypeInfo.getType());