feat(pbs): add linked collections and bidirectional snapshots
Implement SDK linked<T> with forward and reverse Cursor snapshots, trusted compiler integration, and neutral FIELDS_PUBLISH producer support. Pin the tested runtime revision and include specs, editor and installed knowledge coverage, conformance fixtures, and DSC-0091 lessons and evidence.
This commit is contained in:
+274
@@ -0,0 +1,274 @@
|
||||
package p.studio.compiler.backend.irvm;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.io.TempDir;
|
||||
import java.nio.file.*;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
class PbsLinkedTest {
|
||||
static void compile(String name, String source) throws Exception {
|
||||
PbsListCursorTest.compileCollection("linked", name, source);
|
||||
}
|
||||
static void probe(String name, String body) throws Exception {
|
||||
compile(name,"declare service Probe {fn main()->int {"+body+"}}");
|
||||
}
|
||||
@Test void allOperationsPreserveBothDirectionsAndLogicalSize() throws Exception {
|
||||
probe("basic","""
|
||||
let values:linked<int>=new linked();let alias=values;
|
||||
if values.first().hasSome() or values.last().hasSome() {return 0;}
|
||||
if values.removeFirst().hasSome() or values.removeLast().hasSome() {return 0;}
|
||||
values.clear();values.add(20);values.addFirst(1);values.insert(1,2);
|
||||
values.insert(3,22);values[1]=42;
|
||||
if (alias.size() as int)!=4 {return 0;}
|
||||
if (values.first() else 0)!=1 or (values.last() else 0)!=22 {return 0;}
|
||||
if (values.removeAt(1) else 0)!=42 {return 0;}
|
||||
if (values.removeFirst() else 0)!=1 {return 0;}
|
||||
if (values.removeLast() else 0)!=22 {return 0;}
|
||||
if (values.first() else 0)!=20 or (values.last() else 0)!=20 {return 0;}
|
||||
if (values.removeLast() else 0)!=20 {return 0;}
|
||||
if (values.size() as int)!=0 or values.first().hasSome() {return 0;}
|
||||
values.addFirst(42);if (values.removeFirst() else 0)!=42 {return 0;}
|
||||
values.add(7);values.clear();values.add(42);return alias[0] else 0;
|
||||
""");
|
||||
probe("links","""
|
||||
let values=new linked<int>();
|
||||
for i:int from 0 until 16 {values.add(i);}
|
||||
values.insert(8,90);values.insert(0,91);values.insert(18,92);
|
||||
values.removeAt(9);values.removeFirst();values.removeLast();
|
||||
let forward=values.cursor();let backward=values.reverseCursor();
|
||||
for i:int from 0 until 16 {
|
||||
if (values[i] else -1)!=i {return 0;}
|
||||
if (forward.current() else -1)!=i {return 0;}
|
||||
if (backward.current() else -1)!=(15-i) {return 0;}
|
||||
forward.next();backward.next();
|
||||
}
|
||||
if forward.hasNext() or backward.hasNext() {return 0;}
|
||||
if (values.size() as int)!=16 {return 0;}return 42;
|
||||
""");
|
||||
probe("construction","""
|
||||
let values:linked<int>=new linked();
|
||||
let diamond:linked<int>=new linked<>();
|
||||
let maybe:optional (linked<int>)=some(new linked());
|
||||
if let owner=maybe {if (owner.size() as int)!=0 {return 0;}} else {return 0;}
|
||||
let index:int=0;values.insert(index,42);let at:long=0;return values[at] else 0;
|
||||
""");
|
||||
probe("long-size","""
|
||||
let maximum:long=9223372036854775807;
|
||||
if _linkedNextSize(maximum-1)!=maximum {return 0;}
|
||||
let beyondArray:long=4294967296;
|
||||
if _linkedNextSize(beyondArray-1)!=beyondArray {return 0;}
|
||||
return 42;
|
||||
""");
|
||||
}
|
||||
@Test void snapshotsHaveTheSharedStatesAndStayIndependentInBothOrders() throws Exception {
|
||||
for (var method:new String[]{"cursor","reverseCursor"}) {
|
||||
probe("empty-"+method,"let values=new linked<int>();let cursor=values."+method+"();values.add(42);cursor.next();cursor.next();if cursor.hasNext() or cursor.current().hasSome() {return 0;}return 42;");
|
||||
probe("single-"+method,"let values=new linked<int>();values.add(42);let cursor=values."+method+"();values.clear();cursor.next();cursor.next();if cursor.hasNext() {return 0;}return cursor.current() else 0;");
|
||||
}
|
||||
probe("snapshot","""
|
||||
let values=new linked<int>();values.add(20);values.add(22);values.add(20);
|
||||
let forward=values.cursor();let reverse=values.reverseCursor();
|
||||
values[0]=99;values.insert(1,7);values.removeAt(2);values.addFirst(3);
|
||||
values.removeFirst();values.removeLast();values.clear();values.add(100);
|
||||
if (forward.current() else 0)!=20 or (reverse.current() else 0)!=20 {return 0;}
|
||||
if forward.hasNext()==false or reverse.hasNext()==false {return 0;}
|
||||
forward.next();reverse.next();
|
||||
if (forward.current() else 0)!=22 or (reverse.current() else 0)!=22 {return 0;}
|
||||
forward.next();reverse.next();forward.next();reverse.next();
|
||||
if forward.hasNext() or reverse.hasNext() {return 0;}
|
||||
return (forward.current() else 0)+(reverse.current() else 0)+2;
|
||||
""");
|
||||
probe("false-present","""
|
||||
let values=new linked<bool>();values.add(false);
|
||||
let cursor=values.reverseCursor();values.clear();
|
||||
if let value=cursor.current() {if value==false {return 42;}}return 0;
|
||||
""");
|
||||
}
|
||||
@Test void identityAndFullGroupsSurviveAllMutations() throws Exception {
|
||||
compile("optional-field","""
|
||||
declare struct Payload(pub value:optional int);
|
||||
declare service Probe {fn main()->int {
|
||||
let values=new linked<Payload>();values.add(new Payload(some(42)));
|
||||
let cursor=values.cursor();values.clear();
|
||||
if let item=cursor.current() {return item.value else 0;}return 0;
|
||||
}}
|
||||
""");
|
||||
compile("identity","""
|
||||
declare struct Item(pub mut value:int);
|
||||
declare service Probe {fn main()->int {
|
||||
let item=new Item(20);let other=new Item(20);let values=new linked<Item>();
|
||||
values.add(item);values.add(other);values.add(item);
|
||||
let cursor=values.reverseCursor();values.removeAt(1);values.clear();item.value=22;
|
||||
if let first=cursor.current() {if first!=item {return 0;}} else {return 0;}
|
||||
cursor.next();if let middle=cursor.current() {if middle==item {return 0;}} else {return 0;}
|
||||
cursor.next();if let last=cursor.current() {return last.value+other.value;}return 0;
|
||||
}}
|
||||
""");
|
||||
probe("tuple","""
|
||||
let values=new linked<(left:int,right:int)>();
|
||||
values.add((left:1,right:2));values.addFirst((left:3,right:4));
|
||||
values[1]=(left:20,right:22);values.removeFirst();
|
||||
let cursor=values.reverseCursor();values.clear();
|
||||
if let value=cursor.current() {return value.left+value.right;}return 0;
|
||||
""");
|
||||
probe("nested-array","""
|
||||
let payload:array<int>=[20];let values=new linked<array<int>>();
|
||||
values.add(payload);values.insert(0,payload);values.removeAt(1);
|
||||
let cursor=values.cursor();values.clear();payload[0]=42;
|
||||
if let value=cursor.current() {return value[0] else 0;}return 0;
|
||||
""");
|
||||
compile("function","""
|
||||
fn answer()->int {return 42;}
|
||||
declare service Probe {fn main()->int {
|
||||
let values=new linked<Fn()->int>();values.add(answer);values.addFirst(answer);
|
||||
values.removeLast();let cursor=values.reverseCursor();values.clear();
|
||||
if let call=cursor.current() {return call();}return 0;
|
||||
}}
|
||||
""");
|
||||
compile("contract","""
|
||||
declare contract Reader {fn read()->int;}
|
||||
declare struct Item(pub value:int);
|
||||
implements Reader for Item using item {fn read()->int {return item.value;}}
|
||||
declare service Probe {fn main()->int {
|
||||
let item=new Item(42);let values=new linked<Reader>();values.add(item as Reader);
|
||||
values.addFirst(item as Reader);values.removeAt(1);
|
||||
let cursor=values.reverseCursor();values.clear();
|
||||
if let value=cursor.current() {return value.read();}return 0;
|
||||
}}
|
||||
""");
|
||||
compile("vec2","""
|
||||
[BuiltinType(name="vec2",version=1)] declare builtin type Vector(pub x:float,pub y:float) {}
|
||||
fn nativeProbe()->int {
|
||||
let values=new linked<Vector>();values.add(new Vector(1.0,2.0));
|
||||
values.addFirst(new Vector(20.0,22.0));values.removeLast();
|
||||
let cursor=values.cursor();values.clear();
|
||||
if let value=cursor.current() {return (value.x+value.y) as int;}return 0;
|
||||
}
|
||||
declare service Probe {fn main()->int {return nativeProbe();}}
|
||||
""");
|
||||
String color;
|
||||
try(var stream=getClass().getResourceAsStream("/game/stdlib/1/core/color/main.pbs")) {
|
||||
assertNotNull(stream);color=new String(stream.readAllBytes(),StandardCharsets.UTF_8);
|
||||
}
|
||||
compile("pixel",color+"""
|
||||
[BuiltinType(name="pixel",version=1)] declare builtin type Pixel(pub x:long,pub y:long,pub color:Color) {}
|
||||
fn nativeProbe()->int {
|
||||
let values=new linked<Pixel>();values.add(new Pixel(1,2,BLUE));
|
||||
values.insert(0,new Pixel(20,22,RED));values.removeAt(1);
|
||||
let cursor=values.reverseCursor();values.clear();
|
||||
if let value=cursor.current() {if value.color!=RED {return 0;}return (value.x+value.y) as int;}return 0;
|
||||
}
|
||||
declare service Probe {fn main()->int {return nativeProbe();}}
|
||||
""");
|
||||
}
|
||||
@Test void evaluationAndNamedApplicationPreserveSourceOrder() throws Exception {
|
||||
compile("evaluation","""
|
||||
declare struct Effects(pub mut count:int,pub values:linked<int>) {
|
||||
fn receiver()->linked<int> {this.count=this.count*10+1;return this.values;}
|
||||
fn index()->int {this.count=this.count*10+2;return 0;}
|
||||
fn value()->int {this.count=this.count*10+3;return 42;}
|
||||
}
|
||||
declare service Probe {fn main()->int {
|
||||
let values=new linked<int>();values.add(0);let effects=new Effects(0,values);
|
||||
effects.receiver()[effects.index()]=effects.value();if effects.count!=123 {return 0;}
|
||||
effects.count=0;effects.receiver().insert apply (value:effects.value(),index:effects.index());
|
||||
if effects.count!=132 {return 0;}
|
||||
let index:int=1;values.removeAt apply index;return values[0] else 0;
|
||||
}}
|
||||
""");
|
||||
}
|
||||
@Test void invalidIndicesAndGrowthCannotTruncateOrWrap() throws Exception {
|
||||
var cases=java.util.Map.of(
|
||||
"fault-read","let values=new linked<int>();return values[0] else 0;",
|
||||
"fault-write","let values=new linked<int>();values[0]=42;return 0;",
|
||||
"fault-remove","let values=new linked<int>();values.removeAt(0);return 0;",
|
||||
"fault-negative","let values=new linked<int>();values.add(1);return values[-1] else 0;",
|
||||
"fault-insert","let values=new linked<int>();values.insert(1,42);return 0;",
|
||||
"fault-long-index","let values=new linked<int>();values.add(42);let index:long=4294967296;return values[index] else 0;",
|
||||
"fault-overflow","_linkedNextSize(9223372036854775807);return 0;");
|
||||
for(var item:cases.entrySet())probe(item.getKey(),item.getValue());
|
||||
}
|
||||
@Test void resourceFixturesExposeEveryMutationBoundary() throws Exception {
|
||||
var operations=java.util.Map.of("insert","values.insert(12,42);","add","values.add(42);",
|
||||
"addFirst","values.addFirst(42);","remove","let previous=values.removeAt(12);",
|
||||
"removeFirst","let previous=values.removeFirst();","removeLast","let previous=values.removeLast();",
|
||||
"replace","values[12]=42;","clear","values.clear();",
|
||||
"cursor","let snapshot=values.cursor();","reverseCursor","let snapshot=values.reverseCursor();");
|
||||
for(var operation:operations.entrySet())compile("refusal-"+operation.getKey(),"""
|
||||
fn mutationMarker() {let marker:int=314160;}
|
||||
fn completedMarker() {let marker:int=314161;}
|
||||
fn performSecond(values:linked<int>) {OPERATION}
|
||||
fn descend(values:linked<int>,depth:int) {if depth>0 {descend(values,depth-1);} else {performSecond(values);}}
|
||||
fn perform(values:linked<int>) {descend(values,24);}
|
||||
declare service Probe {fn main()->int {
|
||||
let values=new linked<int>();for i:int from 0 until 32 {values.add(i);}
|
||||
mutationMarker();perform(values);completedMarker();return 42;
|
||||
}}
|
||||
""".replace("OPERATION",operation.getValue()));
|
||||
}
|
||||
@Test void snapshotsReleaseOriginalNodesAndConsumedPrefixesAtNormalSafepoints() throws Exception {
|
||||
compile("gc","""
|
||||
declare struct Item(pub value:int);declare struct Garbage();
|
||||
fn collect() {let marker:int=314159;}
|
||||
fn makeCursor()->Cursor<Item> {
|
||||
let values=new linked<Item>();for i:int from 0 until 1200 {values.add(new Item(i));}
|
||||
let cursor=values.cursor();values.removeAt(600);values.removeFirst();values.removeLast();values.clear();
|
||||
return cursor;
|
||||
}
|
||||
fn useCursor() {
|
||||
let cursor=makeCursor();collect();
|
||||
for i:int from 0 until 1199 {cursor.next();}collect();
|
||||
for i:int from 0 until 1200 {cursor.next();}collect();
|
||||
if let item=cursor.current() {if item.value!=1199 {let failure=1/0;}} else {let failure=1/0;}
|
||||
}
|
||||
declare service Probe {fn main()->int {
|
||||
useCursor();for i:int from 0 until 1200 {let discarded=new Garbage();}collect();return 42;
|
||||
}}
|
||||
""");
|
||||
}
|
||||
@Test void removedPayloadsAndDoubleLinkedCyclesBecomeCollectible() throws Exception {
|
||||
compile("gc-collection","""
|
||||
declare struct Item(pub value:int);declare struct Garbage();
|
||||
fn collect() {let marker:int=314159;}
|
||||
fn pressure() {for i:int from 0 until 1200 {let garbage=new Garbage();}}
|
||||
fn create()->linked<Item> {
|
||||
let values=new linked<Item>();for i:int from 0 until 1200 {values.add(new Item(i));}return values;
|
||||
}
|
||||
fn discard(values:linked<Item>) {values.removeAt(600);values.removeFirst();values.removeLast();}
|
||||
fn useCollection() {
|
||||
let values=create();collect();discard(values);pressure();collect();values.clear();pressure();collect();
|
||||
if (values.size() as int)!=0 {let failure=1/0;}
|
||||
}
|
||||
declare service Probe {fn main()->int {useCollection();pressure();collect();return 42;}}
|
||||
""");
|
||||
}
|
||||
@Test void realSdkImportsAndReexportsCompile(@TempDir Path root) throws Exception {
|
||||
Files.createDirectories(root.resolve("src/facade"));
|
||||
Files.writeString(root.resolve("prometeu.json"),"""
|
||||
{"name":"app","version":"1.0.0","language":"pbs","stdlib":"1","target":"Game","dependencies":[]}
|
||||
""");
|
||||
Files.writeString(root.resolve("src/mod.barrel"),"pub fn frame() -> void;");
|
||||
Files.writeString(root.resolve("src/facade/mod.barrel"),"pub struct Items<T>;pub contract Walk<T>;");
|
||||
Files.writeString(root.resolve("src/facade/main.pbs"),"import {linked as Items,Cursor as Walk} from @sdk:collections;");
|
||||
Files.writeString(root.resolve("src/main.pbs"),"""
|
||||
import {Items,Walk} from @app:facade;
|
||||
[Frame] fn frame() -> void {
|
||||
let values:Items<int>=new Items();values.add(20);values.add(22);
|
||||
let cursor:Walk<int>=values.reverseCursor();values.clear();
|
||||
let total:int=0;
|
||||
while true {
|
||||
if let value=cursor.current() {total=total+value;} else {break;}
|
||||
if cursor.hasNext() {cursor.next();} else {break;}
|
||||
}
|
||||
if total!=42 {let failure=1/0;}
|
||||
}
|
||||
""");
|
||||
var compiled=p.studio.compiler.workspaces.BuilderPipelineService.INSTANCE.compile(
|
||||
p.studio.compiler.models.BuilderPipelineContext.fromConfig(new p.studio.compiler.messages.BuilderPipelineConfig(false,root.toString())),
|
||||
p.studio.utilities.logs.LogAggregator.stdout());
|
||||
assertFalse(compiled.diagnostics().stream().anyMatch(d->d.isError()),compiled.diagnostics().toString());
|
||||
assertTrue(compiled.bytecodeBytes().length>0);
|
||||
Files.write(Path.of(System.getProperty("pbs.registryConformanceDirectory")).resolve("pbs-linked-imports.pbx"),compiled.bytecodeBytes());
|
||||
}
|
||||
}
|
||||
+7
-4
@@ -18,6 +18,9 @@ import static org.junit.jupiter.api.Assertions.*;
|
||||
class PbsListCursorTest {
|
||||
private static Path directory() { return Path.of(System.getProperty("pbs.registryConformanceDirectory")); }
|
||||
static BytecodeModule compile(String name,String source) throws Exception {
|
||||
return compileCollection("list", name, source);
|
||||
}
|
||||
static BytecodeModule compileCollection(String collection,String name,String source) throws Exception {
|
||||
var diagnostics=DiagnosticSink.empty();var id=new FileId(0);var sdkId=new FileId(1);
|
||||
String sdk;
|
||||
try(var stream=PbsListCursorTest.class.getResourceAsStream("/game/stdlib/1/sdk/collections/main.pbs")) {
|
||||
@@ -33,14 +36,14 @@ class PbsListCursorTest {
|
||||
.intrinsicPool(file.intrinsicPool()).callableSignatures(file.callableSignatures()).build();
|
||||
var program=new LowerToIRVMService().lower(backend);
|
||||
var module=new BytecodeEmitter().emit(program.coherentEmissionPlan());
|
||||
if(name.equals("gc"))module=PbsStructuredValuesTest.withTestSafepoint(module);
|
||||
if(name.startsWith("gc"))module=PbsStructuredValuesTest.withTestSafepoint(module);
|
||||
new BytecodePreloadVerifierService().verify(module);
|
||||
Files.createDirectories(directory());Files.write(directory().resolve("pbs-list-"+name+".pbx"),module.serialize());
|
||||
if(!name.equals("gc")&&!name.startsWith("refusal-")) {
|
||||
Files.createDirectories(directory());Files.write(directory().resolve("pbs-"+collection+"-"+name+".pbx"),module.serialize());
|
||||
if(!name.startsWith("gc")&&!name.startsWith("refusal-")) {
|
||||
var optimized=new OptimizeIRVMService().optimize(new LowerToIRVMService().lower(backend));
|
||||
var optimizedModule=new BytecodeEmitter().emit(optimized.coherentEmissionPlan());
|
||||
new BytecodePreloadVerifierService().verify(optimizedModule);
|
||||
Files.write(directory().resolve("pbs-list-"+name+"-optimized.pbx"),optimizedModule.serialize());
|
||||
Files.write(directory().resolve("pbs-"+collection+"-"+name+"-optimized.pbx"),optimizedModule.serialize());
|
||||
}
|
||||
return module;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user