new test main with code directly (fixes)
This commit is contained in:
+73
@@ -0,0 +1,73 @@
|
||||
package p.studio.compiler.backend.irvm;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.OptionalInt;
|
||||
|
||||
final class IRVMIntrinsicRegistry {
|
||||
private static final Map<IntrinsicKey, Integer> FINAL_ID_BY_INTRINSIC = createRegistry();
|
||||
|
||||
private IRVMIntrinsicRegistry() {
|
||||
}
|
||||
|
||||
static OptionalInt resolveFinalId(
|
||||
final String canonicalName,
|
||||
final long canonicalVersion) {
|
||||
if (canonicalName == null || canonicalName.isBlank()) {
|
||||
return OptionalInt.empty();
|
||||
}
|
||||
final var resolved = FINAL_ID_BY_INTRINSIC.get(new IntrinsicKey(canonicalName, canonicalVersion));
|
||||
if (resolved == null) {
|
||||
return OptionalInt.empty();
|
||||
}
|
||||
return OptionalInt.of(resolved);
|
||||
}
|
||||
|
||||
private static Map<IntrinsicKey, Integer> createRegistry() {
|
||||
final var registry = new HashMap<IntrinsicKey, Integer>();
|
||||
register(registry, "vec2.dot", 1, 0x1000);
|
||||
register(registry, "vec2.length", 1, 0x1001);
|
||||
|
||||
register(registry, "input.pad", 1, 0x2000);
|
||||
register(registry, "input.touch", 1, 0x2001);
|
||||
|
||||
register(registry, "input.pad.up", 1, 0x2010);
|
||||
register(registry, "input.pad.down", 1, 0x2011);
|
||||
register(registry, "input.pad.left", 1, 0x2012);
|
||||
register(registry, "input.pad.right", 1, 0x2013);
|
||||
register(registry, "input.pad.a", 1, 0x2014);
|
||||
register(registry, "input.pad.b", 1, 0x2015);
|
||||
register(registry, "input.pad.x", 1, 0x2016);
|
||||
register(registry, "input.pad.y", 1, 0x2017);
|
||||
register(registry, "input.pad.l", 1, 0x2018);
|
||||
register(registry, "input.pad.r", 1, 0x2019);
|
||||
register(registry, "input.pad.start", 1, 0x201A);
|
||||
register(registry, "input.pad.select", 1, 0x201B);
|
||||
|
||||
register(registry, "input.touch.button", 1, 0x2020);
|
||||
register(registry, "input.touch.x", 1, 0x2021);
|
||||
register(registry, "input.touch.y", 1, 0x2022);
|
||||
|
||||
register(registry, "input.button.pressed", 1, 0x2030);
|
||||
register(registry, "input.button.released", 1, 0x2031);
|
||||
register(registry, "input.button.down", 1, 0x2032);
|
||||
register(registry, "input.button.hold", 1, 0x2033);
|
||||
return Map.copyOf(registry);
|
||||
}
|
||||
|
||||
private static void register(
|
||||
final Map<IntrinsicKey, Integer> registry,
|
||||
final String canonicalName,
|
||||
final long canonicalVersion,
|
||||
final int finalId) {
|
||||
final var previous = registry.put(new IntrinsicKey(canonicalName, canonicalVersion), finalId);
|
||||
if (previous != null && previous != finalId) {
|
||||
throw new IllegalStateException("duplicate intrinsic registry identity: " + canonicalName + "@" + canonicalVersion);
|
||||
}
|
||||
}
|
||||
|
||||
private record IntrinsicKey(
|
||||
String canonicalName,
|
||||
long canonicalVersion) {
|
||||
}
|
||||
}
|
||||
+1
@@ -2,6 +2,7 @@ package p.studio.compiler.backend.irvm;
|
||||
|
||||
public enum IRVMLoweringErrorCode {
|
||||
LOWER_IRVM_EMPTY_EXECUTABLE_INPUT,
|
||||
LOWER_IRVM_ENTRYPOINT_DECLARATION_MISSING,
|
||||
LOWER_IRVM_ENTRYPOINT_MISSING,
|
||||
LOWER_IRVM_ENTRYPOINT_AMBIGUOUS,
|
||||
LOWER_IRVM_MISSING_CALLEE,
|
||||
|
||||
+1
-1
@@ -173,7 +173,7 @@ public class IRVMValidator {
|
||||
if (inHeight < pops) {
|
||||
throw new IRVMValidationException(
|
||||
IRVMValidationErrorCode.MARSHAL_VERIFY_PRECHECK_STACK_UNDERFLOW,
|
||||
"stack underflow",
|
||||
"stack underflow. need=%d have=%d".formatted(pops, inHeight),
|
||||
functionIndex,
|
||||
pc);
|
||||
}
|
||||
|
||||
+38
-9
@@ -42,7 +42,7 @@ public class LowerToIRVMService {
|
||||
"IRBackend has no executable functions");
|
||||
}
|
||||
|
||||
final var ordered = orderFunctions(backend.getExecutableFunctions());
|
||||
final var ordered = orderFunctions(backend);
|
||||
final var funcIdByCallableId = new HashMap<CallableId, Integer>();
|
||||
for (var i = 0; i < ordered.size(); i++) {
|
||||
final var fn = ordered.get(i);
|
||||
@@ -145,9 +145,31 @@ public class LowerToIRVMService {
|
||||
IRVMLoweringErrorCode.LOWER_IRVM_INVALID_INTRINSIC_ID,
|
||||
"invalid intrinsic id: " + intrinsic.intrinsicId());
|
||||
}
|
||||
instructions.add(new IRVMInstruction(IRVMOp.INTRINSIC, intrinsicIndex));
|
||||
final var canonicalIntrinsic = backend.getIntrinsicPool().get(intrinsicIndex);
|
||||
if (!canonicalIntrinsic.canonicalName().equals(intrinsic.canonicalName())
|
||||
|| canonicalIntrinsic.canonicalVersion() != intrinsic.canonicalVersion()) {
|
||||
throw loweringError(
|
||||
fn,
|
||||
instr,
|
||||
IRVMLoweringErrorCode.LOWER_IRVM_INVALID_INTRINSIC_ID,
|
||||
"intrinsic identity mismatch between callsite and pool: call=%s@%d pool=%s@%d".formatted(
|
||||
intrinsic.canonicalName(),
|
||||
intrinsic.canonicalVersion(),
|
||||
canonicalIntrinsic.canonicalName(),
|
||||
canonicalIntrinsic.canonicalVersion()));
|
||||
}
|
||||
final var finalIntrinsicId = IRVMIntrinsicRegistry
|
||||
.resolveFinalId(canonicalIntrinsic.canonicalName(), canonicalIntrinsic.canonicalVersion())
|
||||
.orElseThrow(() -> loweringError(
|
||||
fn,
|
||||
instr,
|
||||
IRVMLoweringErrorCode.LOWER_IRVM_INVALID_INTRINSIC_ID,
|
||||
"unknown VM-owned intrinsic identity: %s@%d".formatted(
|
||||
canonicalIntrinsic.canonicalName(),
|
||||
canonicalIntrinsic.canonicalVersion())));
|
||||
instructions.add(new IRVMInstruction(IRVMOp.INTRINSIC, finalIntrinsicId));
|
||||
operations.add(BytecodeEmitter.Operation.intrinsic(
|
||||
intrinsicIndex,
|
||||
finalIntrinsicId,
|
||||
instr.expectedArgSlots(),
|
||||
instr.expectedRetSlots(),
|
||||
sourceSpan));
|
||||
@@ -231,22 +253,29 @@ public class LowerToIRVMService {
|
||||
return program;
|
||||
}
|
||||
|
||||
private ReadOnlyList<IRBackendExecutableFunction> orderFunctions(
|
||||
final ReadOnlyList<IRBackendExecutableFunction> functions) {
|
||||
final var sorted = new ArrayList<>(functions.asList());
|
||||
private ReadOnlyList<IRBackendExecutableFunction> orderFunctions(final IRBackend backend) {
|
||||
final var entryPointCallableName = backend.getEntryPointCallableName();
|
||||
if (entryPointCallableName == null || entryPointCallableName.isBlank()) {
|
||||
throw new IRVMLoweringException(
|
||||
IRVMLoweringErrorCode.LOWER_IRVM_ENTRYPOINT_DECLARATION_MISSING,
|
||||
"frontend IRBackend entrypoint declaration is missing");
|
||||
}
|
||||
final var sorted = new ArrayList<>(backend.getExecutableFunctions().asList());
|
||||
sorted.sort(FUNCTION_ORDER);
|
||||
final var entrypoints = sorted.stream()
|
||||
.filter(candidate -> "main".equals(candidate.callableName()))
|
||||
.filter(candidate -> entryPointCallableName.equals(candidate.callableName()))
|
||||
.toList();
|
||||
if (entrypoints.isEmpty()) {
|
||||
throw new IRVMLoweringException(
|
||||
IRVMLoweringErrorCode.LOWER_IRVM_ENTRYPOINT_MISSING,
|
||||
"missing entrypoint callable 'main'");
|
||||
"missing entrypoint callable '%s'".formatted(entryPointCallableName));
|
||||
}
|
||||
if (entrypoints.size() > 1) {
|
||||
throw new IRVMLoweringException(
|
||||
IRVMLoweringErrorCode.LOWER_IRVM_ENTRYPOINT_AMBIGUOUS,
|
||||
"ambiguous entrypoint: found %d callables named 'main'".formatted(entrypoints.size()));
|
||||
"ambiguous entrypoint: found %d callables named '%s'".formatted(
|
||||
entrypoints.size(),
|
||||
entryPointCallableName));
|
||||
}
|
||||
final var entrypoint = entrypoints.getFirst();
|
||||
final var ordered = new ArrayList<IRBackendExecutableFunction>(sorted.size());
|
||||
|
||||
+1
@@ -21,6 +21,7 @@ public class BuilderPipelineContext {
|
||||
public IRVMProgram optimizedIrvm;
|
||||
public BytecodeModule bytecodeModule;
|
||||
public byte[] bytecodeBytes;
|
||||
public Path bytecodeArtifactPath;
|
||||
|
||||
private BuilderPipelineContext(
|
||||
final BuilderPipelineConfig config,
|
||||
|
||||
+2
-1
@@ -23,7 +23,8 @@ public class BuilderPipelineService {
|
||||
new OptimizeIRVMPipelineStage(),
|
||||
new EmitBytecodePipelineStage(),
|
||||
new LinkBytecodePipelineStage(),
|
||||
new VerifyBytecodePipelineStage()
|
||||
new VerifyBytecodePipelineStage(),
|
||||
new WriteBytecodeArtifactPipelineStage()
|
||||
);
|
||||
INSTANCE = new BuilderPipelineService(stages);
|
||||
}
|
||||
|
||||
+72
@@ -0,0 +1,72 @@
|
||||
package p.studio.compiler.workspaces.stages;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import p.studio.compiler.messages.BuildingIssueSink;
|
||||
import p.studio.compiler.models.BuilderPipelineContext;
|
||||
import p.studio.compiler.workspaces.PipelineStage;
|
||||
import p.studio.utilities.logs.LogAggregator;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.StandardOpenOption;
|
||||
|
||||
@Slf4j
|
||||
public class WriteBytecodeArtifactPipelineStage implements PipelineStage {
|
||||
private static final String OUTPUT_DIR = "build";
|
||||
private static final String OUTPUT_FILE = "program.pbx";
|
||||
|
||||
@Override
|
||||
public BuildingIssueSink run(final BuilderPipelineContext ctx, final LogAggregator logs) {
|
||||
if (ctx.rootProjectPathCanon == null) {
|
||||
return BuildingIssueSink.empty()
|
||||
.report(builder -> builder
|
||||
.error(true)
|
||||
.phase("BACKEND_WRITE_ARTIFACT")
|
||||
.code("MARSHAL_FORMAT_STAGE_INPUT_MISSING")
|
||||
.message("[BUILD]: root project path is missing before WriteBytecodeArtifact stage"));
|
||||
}
|
||||
|
||||
final var bytes = resolveBytes(ctx);
|
||||
if (bytes == null || bytes.length == 0) {
|
||||
return BuildingIssueSink.empty()
|
||||
.report(builder -> builder
|
||||
.error(true)
|
||||
.phase("BACKEND_WRITE_ARTIFACT")
|
||||
.code("MARSHAL_FORMAT_STAGE_INPUT_MISSING")
|
||||
.message("[BUILD]: bytecode bytes are missing before WriteBytecodeArtifact stage"));
|
||||
}
|
||||
|
||||
final var outputDir = ctx.rootProjectPathCanon.resolve(OUTPUT_DIR);
|
||||
final var outputPath = outputDir.resolve(OUTPUT_FILE);
|
||||
try {
|
||||
Files.createDirectories(outputDir);
|
||||
Files.write(
|
||||
outputPath,
|
||||
bytes,
|
||||
StandardOpenOption.CREATE,
|
||||
StandardOpenOption.TRUNCATE_EXISTING,
|
||||
StandardOpenOption.WRITE);
|
||||
ctx.bytecodeArtifactPath = outputPath;
|
||||
logs.using(log).info("[BUILD]: wrote bytecode artifact to " + outputPath);
|
||||
return BuildingIssueSink.empty();
|
||||
} catch (IOException e) {
|
||||
return BuildingIssueSink.empty()
|
||||
.report(builder -> builder
|
||||
.error(true)
|
||||
.phase("BACKEND_WRITE_ARTIFACT")
|
||||
.code("MARSHAL_ARTIFACT_WRITE_FAILED")
|
||||
.message("[BUILD]: failed to write bytecode artifact: " + outputPath)
|
||||
.exception(e));
|
||||
}
|
||||
}
|
||||
|
||||
private byte[] resolveBytes(final BuilderPipelineContext ctx) {
|
||||
if (ctx.bytecodeBytes != null && ctx.bytecodeBytes.length > 0) {
|
||||
return ctx.bytecodeBytes;
|
||||
}
|
||||
if (ctx.bytecodeModule != null) {
|
||||
return ctx.bytecodeModule.serialize();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user