implements PR-05.0.3
This commit is contained in:
+25
-21
@@ -2,6 +2,8 @@ package p.studio.compiler.models;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
import p.studio.compiler.source.identifiers.CallableId;
|
||||
import p.studio.compiler.source.identifiers.IntrinsicId;
|
||||
import p.studio.compiler.source.tables.CallableSignatureRef;
|
||||
import p.studio.compiler.source.tables.CallableTable;
|
||||
import p.studio.compiler.source.tables.IntrinsicReference;
|
||||
@@ -56,24 +58,24 @@ public class IRBackend {
|
||||
requiredCapabilities.addAll(metadata.requiredCapabilities().asList());
|
||||
}
|
||||
|
||||
private int[] reindexCallables(final ReadOnlyList<CallableSignatureRef> localCallableSignatures) {
|
||||
private CallableId[] reindexCallables(final ReadOnlyList<CallableSignatureRef> localCallableSignatures) {
|
||||
if (localCallableSignatures == null || localCallableSignatures.isEmpty()) {
|
||||
return new int[0];
|
||||
return new CallableId[0];
|
||||
}
|
||||
final var remap = new int[localCallableSignatures.size()];
|
||||
final var remap = new CallableId[localCallableSignatures.size()];
|
||||
for (var i = 0; i < localCallableSignatures.size(); i++) {
|
||||
remap[i] = callableTable.register(localCallableSignatures.get(i)).getId();
|
||||
remap[i] = callableTable.register(localCallableSignatures.get(i));
|
||||
}
|
||||
return remap;
|
||||
}
|
||||
|
||||
private IRBackendExecutableFunction remapExecutableFunction(
|
||||
final IRBackendExecutableFunction function,
|
||||
final int[] callableRemap,
|
||||
final int[] intrinsicRemap) {
|
||||
final CallableId[] callableRemap,
|
||||
final IntrinsicId[] intrinsicRemap) {
|
||||
final var remappedInstructions = new ArrayList<IRBackendExecutableFunction.Instruction>(function.instructions().size());
|
||||
for (final var instruction : function.instructions()) {
|
||||
final Integer remappedCallee;
|
||||
final CallableId remappedCallee;
|
||||
if (instruction.calleeCallableId() == null) {
|
||||
remappedCallee = null;
|
||||
} else {
|
||||
@@ -117,34 +119,36 @@ public class IRBackend {
|
||||
function.span());
|
||||
}
|
||||
|
||||
private int remapCallableId(
|
||||
final int localCallableId,
|
||||
final int[] callableRemap,
|
||||
private CallableId remapCallableId(
|
||||
final CallableId localCallableId,
|
||||
final CallableId[] callableRemap,
|
||||
final String label) {
|
||||
if (localCallableId < 0 || localCallableId >= callableRemap.length) {
|
||||
final var localIndex = localCallableId.getIndex();
|
||||
if (localIndex < 0 || localIndex >= callableRemap.length) {
|
||||
throw new IllegalArgumentException("invalid local " + label + " callable id: " + localCallableId);
|
||||
}
|
||||
return callableRemap[localCallableId];
|
||||
return callableRemap[localIndex];
|
||||
}
|
||||
|
||||
private int[] reindexIntrinsics(final ReadOnlyList<IntrinsicReference> localIntrinsicPool) {
|
||||
private IntrinsicId[] reindexIntrinsics(final ReadOnlyList<IntrinsicReference> localIntrinsicPool) {
|
||||
if (localIntrinsicPool == null || localIntrinsicPool.isEmpty()) {
|
||||
return new int[0];
|
||||
return new IntrinsicId[0];
|
||||
}
|
||||
final var remap = new int[localIntrinsicPool.size()];
|
||||
final var remap = new IntrinsicId[localIntrinsicPool.size()];
|
||||
for (var i = 0; i < localIntrinsicPool.size(); i++) {
|
||||
remap[i] = intrinsicTable.register(localIntrinsicPool.get(i)).getId();
|
||||
remap[i] = intrinsicTable.register(localIntrinsicPool.get(i));
|
||||
}
|
||||
return remap;
|
||||
}
|
||||
|
||||
private int remapIntrinsicId(
|
||||
final int localIntrinsicId,
|
||||
final int[] intrinsicRemap) {
|
||||
if (localIntrinsicId < 0 || localIntrinsicId >= intrinsicRemap.length) {
|
||||
private IntrinsicId remapIntrinsicId(
|
||||
final IntrinsicId localIntrinsicId,
|
||||
final IntrinsicId[] intrinsicRemap) {
|
||||
final var localIndex = localIntrinsicId.getIndex();
|
||||
if (localIndex < 0 || localIndex >= intrinsicRemap.length) {
|
||||
throw new IllegalArgumentException("invalid local intrinsic id: " + localIntrinsicId);
|
||||
}
|
||||
return intrinsicRemap[localIntrinsicId];
|
||||
return intrinsicRemap[localIndex];
|
||||
}
|
||||
|
||||
private ReadOnlyList<CallableSignatureRef> emitCallableSignatures() {
|
||||
|
||||
+21
-9
@@ -1,7 +1,9 @@
|
||||
package p.studio.compiler.models;
|
||||
|
||||
import p.studio.compiler.source.Span;
|
||||
import p.studio.compiler.source.identifiers.CallableId;
|
||||
import p.studio.compiler.source.identifiers.FileId;
|
||||
import p.studio.compiler.source.identifiers.IntrinsicId;
|
||||
import p.studio.utilities.structures.ReadOnlyList;
|
||||
|
||||
import java.util.Objects;
|
||||
@@ -10,7 +12,7 @@ public record IRBackendExecutableFunction(
|
||||
FileId fileId,
|
||||
String moduleKey,
|
||||
String callableName,
|
||||
int callableId,
|
||||
CallableId callableId,
|
||||
int sourceStart,
|
||||
int sourceEnd,
|
||||
int paramSlots,
|
||||
@@ -27,9 +29,11 @@ public record IRBackendExecutableFunction(
|
||||
if (callableName.isBlank()) {
|
||||
throw new IllegalArgumentException("callableName must not be blank");
|
||||
}
|
||||
if (callableId < 0) {
|
||||
throw new IllegalArgumentException("callableId must be non-negative");
|
||||
callableId = Objects.requireNonNull(callableId, "callableId");
|
||||
if (callableId.isNone()) {
|
||||
throw new IllegalArgumentException("callableId must not be none");
|
||||
}
|
||||
callableId.getIndex();
|
||||
if (sourceStart < 0 || sourceEnd < 0 || sourceEnd < sourceStart) {
|
||||
throw new IllegalArgumentException("invalid source span bounds");
|
||||
}
|
||||
@@ -50,7 +54,7 @@ public record IRBackendExecutableFunction(
|
||||
InstructionKind kind,
|
||||
String calleeModuleKey,
|
||||
String calleeCallableName,
|
||||
Integer calleeCallableId,
|
||||
CallableId calleeCallableId,
|
||||
HostCallMetadata hostCall,
|
||||
IntrinsicCallMetadata intrinsicCall,
|
||||
String label,
|
||||
@@ -62,7 +66,7 @@ public record IRBackendExecutableFunction(
|
||||
final InstructionKind kind,
|
||||
final String calleeModuleKey,
|
||||
final String calleeCallableName,
|
||||
final Integer calleeCallableId,
|
||||
final CallableId calleeCallableId,
|
||||
final HostCallMetadata hostCall,
|
||||
final IntrinsicCallMetadata intrinsicCall,
|
||||
final Span span) {
|
||||
@@ -73,7 +77,7 @@ public record IRBackendExecutableFunction(
|
||||
final InstructionKind kind,
|
||||
final String calleeModuleKey,
|
||||
final String calleeCallableName,
|
||||
final Integer calleeCallableId,
|
||||
final CallableId calleeCallableId,
|
||||
final HostCallMetadata hostCall,
|
||||
final IntrinsicCallMetadata intrinsicCall,
|
||||
final Integer expectedArgSlots,
|
||||
@@ -111,8 +115,11 @@ public record IRBackendExecutableFunction(
|
||||
calleeCallableName = calleeCallableName == null ? "" : calleeCallableName;
|
||||
label = label == null ? "" : label;
|
||||
targetLabel = targetLabel == null ? "" : targetLabel;
|
||||
if (calleeCallableId != null && calleeCallableId < 0) {
|
||||
throw new IllegalArgumentException("calleeCallableId must be non-negative");
|
||||
if (calleeCallableId != null && calleeCallableId.isNone()) {
|
||||
throw new IllegalArgumentException("calleeCallableId must not be none");
|
||||
}
|
||||
if (calleeCallableId != null) {
|
||||
calleeCallableId.getIndex();
|
||||
}
|
||||
if (expectedArgSlots != null && expectedArgSlots < 0) {
|
||||
throw new IllegalArgumentException("expectedArgSlots must be non-negative");
|
||||
@@ -224,7 +231,7 @@ public record IRBackendExecutableFunction(
|
||||
public record IntrinsicCallMetadata(
|
||||
String canonicalName,
|
||||
long canonicalVersion,
|
||||
int intrinsicId) {
|
||||
IntrinsicId intrinsicId) {
|
||||
public IntrinsicCallMetadata {
|
||||
canonicalName = Objects.requireNonNull(canonicalName, "canonicalName");
|
||||
if (canonicalName.isBlank()) {
|
||||
@@ -233,6 +240,11 @@ public record IRBackendExecutableFunction(
|
||||
if (canonicalVersion < 0) {
|
||||
throw new IllegalArgumentException("canonicalVersion must be non-negative");
|
||||
}
|
||||
intrinsicId = Objects.requireNonNull(intrinsicId, "intrinsicId");
|
||||
if (intrinsicId.isNone()) {
|
||||
throw new IllegalArgumentException("intrinsicId must not be none");
|
||||
}
|
||||
intrinsicId.getIndex();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+12
-10
@@ -2,7 +2,9 @@ package p.studio.compiler.models;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import p.studio.compiler.source.Span;
|
||||
import p.studio.compiler.source.identifiers.CallableId;
|
||||
import p.studio.compiler.source.identifiers.FileId;
|
||||
import p.studio.compiler.source.identifiers.IntrinsicId;
|
||||
import p.studio.compiler.source.tables.CallableSignatureRef;
|
||||
import p.studio.compiler.source.tables.IntrinsicReference;
|
||||
import p.studio.utilities.structures.ReadOnlyList;
|
||||
@@ -27,7 +29,7 @@ class IRBackendExecutableContractTest {
|
||||
IRBackendExecutableFunction.InstructionKind.CALL_FUNC,
|
||||
"app/main",
|
||||
"foo",
|
||||
7,
|
||||
new CallableId(7),
|
||||
null,
|
||||
null,
|
||||
Span.none());
|
||||
@@ -40,7 +42,7 @@ class IRBackendExecutableContractTest {
|
||||
new FileId(1),
|
||||
"app",
|
||||
"main",
|
||||
1,
|
||||
new CallableId(1),
|
||||
10,
|
||||
5,
|
||||
0,
|
||||
@@ -54,7 +56,7 @@ class IRBackendExecutableContractTest {
|
||||
new FileId(1),
|
||||
"app",
|
||||
"main",
|
||||
1,
|
||||
new CallableId(1),
|
||||
0,
|
||||
10,
|
||||
0,
|
||||
@@ -72,7 +74,7 @@ class IRBackendExecutableContractTest {
|
||||
IRBackendExecutableFunction.InstructionKind.CALL_FUNC,
|
||||
"app/main",
|
||||
"foo",
|
||||
1,
|
||||
new CallableId(1),
|
||||
new IRBackendExecutableFunction.HostCallMetadata("gfx", "draw", 1, 0, 0),
|
||||
null,
|
||||
Span.none()));
|
||||
@@ -123,7 +125,7 @@ class IRBackendExecutableContractTest {
|
||||
new FileId(1),
|
||||
"app/main",
|
||||
"entry",
|
||||
0,
|
||||
new CallableId(0),
|
||||
0,
|
||||
10,
|
||||
0,
|
||||
@@ -149,7 +151,7 @@ class IRBackendExecutableContractTest {
|
||||
new FileId(2),
|
||||
"app/main",
|
||||
"aux",
|
||||
0,
|
||||
new CallableId(0),
|
||||
11,
|
||||
20,
|
||||
0,
|
||||
@@ -189,7 +191,7 @@ class IRBackendExecutableContractTest {
|
||||
new FileId(1),
|
||||
"app/main",
|
||||
"entry",
|
||||
0,
|
||||
new CallableId(0),
|
||||
0,
|
||||
10,
|
||||
0,
|
||||
@@ -201,7 +203,7 @@ class IRBackendExecutableContractTest {
|
||||
"",
|
||||
"",
|
||||
null,
|
||||
new IRBackendExecutableFunction.IntrinsicCallMetadata("core.color.pack", 1, 0),
|
||||
new IRBackendExecutableFunction.IntrinsicCallMetadata("core.color.pack", 1, new IntrinsicId(0)),
|
||||
Span.none())),
|
||||
Span.none())),
|
||||
IRReservedMetadata.empty(),
|
||||
@@ -214,7 +216,7 @@ class IRBackendExecutableContractTest {
|
||||
new FileId(2),
|
||||
"app/main",
|
||||
"aux",
|
||||
0,
|
||||
new CallableId(0),
|
||||
11,
|
||||
20,
|
||||
0,
|
||||
@@ -226,7 +228,7 @@ class IRBackendExecutableContractTest {
|
||||
"",
|
||||
"",
|
||||
null,
|
||||
new IRBackendExecutableFunction.IntrinsicCallMetadata("core.color.pack", 1, 0),
|
||||
new IRBackendExecutableFunction.IntrinsicCallMetadata("core.color.pack", 1, new IntrinsicId(0)),
|
||||
Span.none())),
|
||||
Span.none())),
|
||||
IRReservedMetadata.empty(),
|
||||
|
||||
Reference in New Issue
Block a user