implements PR-07.1

This commit is contained in:
2026-03-24 13:42:31 +00:00
parent a84dece9f6
commit b91a3cea34
2 changed files with 75 additions and 1 deletions
@@ -2,6 +2,7 @@ package p.studio.compiler.backend.irvm;
import org.junit.jupiter.api.Test;
import p.studio.compiler.backend.bytecode.BytecodeEmitter;
import p.studio.compiler.backend.bytecode.BytecodeModule;
import p.studio.compiler.backend.bytecode.BytecodePreloadVerifierService;
import p.studio.utilities.structures.ReadOnlyList;
@@ -174,6 +175,79 @@ class OptimizeIRVMServiceTest {
new BytecodePreloadVerifierService().verify(emitted);
}
@Test
void unreachableInstructionEliminationPassMustPreserveJumpSpanWhenTargetIsRemapped() {
final var jumpSpan = new BytecodeModule.SourceSpan(7, 10, 12);
final var removedSpan = new BytecodeModule.SourceSpan(7, 13, 14);
final var retSpan = new BytecodeModule.SourceSpan(7, 15, 16);
final var service = new OptimizeIRVMService(new IRVMValidator(), List.of(
OptimizeIRVMService.unreachableInstructionEliminationPass()));
final var input = singleFunctionProgram(
ReadOnlyList.from(
new IRVMInstruction(IRVMOp.JMP, 8),
new IRVMInstruction(IRVMOp.HALT, null),
new IRVMInstruction(IRVMOp.RET, null)),
ReadOnlyList.from(
BytecodeEmitter.Operation.jmp(8, jumpSpan),
BytecodeEmitter.Operation.halt(removedSpan),
BytecodeEmitter.Operation.ret(retSpan)));
final var optimized = service.optimize(input);
final var firstOperation = optimized.coherentEmissionPlan().functions().getFirst().operations().getFirst();
final var secondOperation = optimized.coherentEmissionPlan().functions().getFirst().operations().get(1);
assertEquals(2, optimized.module().functions().getFirst().instructions().size());
assertEquals(BytecodeEmitter.OperationKind.JMP, firstOperation.kind());
assertEquals(6, firstOperation.immediate());
assertEquals(jumpSpan, firstOperation.span());
assertEquals(retSpan, secondOperation.span());
}
@Test
void normalizeRedundantJumpTargetsPassMustPreserveJumpSpanAfterRewrite() {
final var firstJumpSpan = new BytecodeModule.SourceSpan(9, 20, 24);
final var secondJumpSpan = new BytecodeModule.SourceSpan(9, 25, 28);
final var service = new OptimizeIRVMService(new IRVMValidator(), List.of(
OptimizeIRVMService.normalizeRedundantJumpTargetsPass()));
final var input = singleFunctionProgram(
ReadOnlyList.from(
new IRVMInstruction(IRVMOp.JMP, 6),
new IRVMInstruction(IRVMOp.JMP, 12),
new IRVMInstruction(IRVMOp.RET, null)),
ReadOnlyList.from(
BytecodeEmitter.Operation.jmp(6, firstJumpSpan),
BytecodeEmitter.Operation.jmp(12, secondJumpSpan),
BytecodeEmitter.Operation.ret()));
final var optimized = service.optimize(input);
final var firstOperation = optimized.coherentEmissionPlan().functions().getFirst().operations().getFirst();
assertEquals(BytecodeEmitter.OperationKind.JMP, firstOperation.kind());
assertEquals(12, firstOperation.immediate());
assertEquals(firstJumpSpan, firstOperation.span());
}
@Test
void simplifyJumpToNextPcPassMustPreserveSpanOnSurvivingOperation() {
final var retSpan = new BytecodeModule.SourceSpan(11, 40, 41);
final var service = new OptimizeIRVMService(new IRVMValidator(), List.of(
OptimizeIRVMService.simplifyJumpToNextPcPass()));
final var input = singleFunctionProgram(
ReadOnlyList.from(
new IRVMInstruction(IRVMOp.JMP, 6),
new IRVMInstruction(IRVMOp.RET, null)),
ReadOnlyList.from(
BytecodeEmitter.Operation.jmp(6, new BytecodeModule.SourceSpan(11, 35, 39)),
BytecodeEmitter.Operation.ret(retSpan)));
final var optimized = service.optimize(input);
final var onlyOperation = optimized.coherentEmissionPlan().functions().getFirst().operations().getFirst();
assertEquals(1, optimized.module().functions().getFirst().instructions().size());
assertEquals(BytecodeEmitter.OperationKind.RET, onlyOperation.kind());
assertEquals(retSpan, onlyOperation.span());
}
private OptimizeIRVMService.IRVMPass namedPass(
final String name,
final List<String> order,