Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 105 additions & 30 deletions bootstrap/s2c-seed.c

Large diffs are not rendered by default.

209 changes: 166 additions & 43 deletions s2/mem.srs

Large diffs are not rendered by default.

49 changes: 48 additions & 1 deletion s2c/main.srs
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ enum S2c.Mode:
// compact: each def that can run in a scratch region and copy its result out (M6a)
def S2c.mem(fs: Coll.List[S2c.File], r: Mem.Report): I64 = r match
case Mem.RulesBad(rel) => S2c.internal("mem", rel)
case Mem.Ok(bs, pf, vs, rs, cs) =>
case Mem.Ok(bs, pf, vs, ms, rs, cs) =>
Console.print("{\"regions\":[")
S2c.jRegions(fs, bs, true)
Console.print("],\"sites\":[")
Expand All @@ -421,6 +421,8 @@ def S2c.mem(fs: Coll.List[S2c.File], r: Mem.Report): I64 = r match
S2c.jParamFrees(fs, pf, Coll.length(bs) == 0)
Console.print("],\"vars\":[")
S2c.jVars(vs, true)
Console.print("],\"moves\":[")
S2c.jMoves(ms, true)
Console.print("],\"total\":{\"once\":")
Console.printI64(once)
Console.print(",\"onceBytes\":")
Expand Down Expand Up @@ -563,6 +565,51 @@ def S2c.jVars(vs: Coll.List[Mem.VarRec], first: Bool): Unit = vs match
Console.print("}")
S2c.jVars(rest, false)

// each move: kind, def (the def of a walk move; the callee of an arg or result move), the node ids it moves from and
// to (a var's id is its vars id), unique (its source is unshared), the regions of both ends, and its region safety:
// safe true with why noStore or outlives, else false with the region pair that fails
def S2c.jMoves(ms: Coll.List[Mem.MoveRec], first: Bool): Unit = ms match
case Coll.Nil => ()
case Coll.Cons(r, rest) =>
val Mem.MoveRec(m, unique, from, to, safe) = r
val Mem.Move(k, d, a, b) = m
S2c.jSep(first)
Console.print("{\"kind\":")
S2c.jMoveK(k)
Console.print(",\"def\":")
S2c.jSym(d)
Console.print(",\"from\":")
Console.printI64(a)
Console.print(",\"to\":")
Console.printI64(b)
val u = if unique then ",\"unique\":true,\"fromRegions\":[" else ",\"unique\":false,\"fromRegions\":["
Console.print(u)
S2c.jInts(from, true)
Console.print("],\"toRegions\":[")
S2c.jInts(to, true)
Console.print("],")
S2c.jSafe(safe)
Console.print("}")
S2c.jMoves(rest, false)

def S2c.jMoveK(k: Mem.MoveK): Unit = k match
case Mem.MBind => Console.print("\"bind\"")
case Mem.MAssign => Console.print("\"assign\"")
case Mem.MPattern => Console.print("\"pattern\"")
case Mem.MField => Console.print("\"field\"")
case Mem.MRet => Console.print("\"ret\"")
case Mem.MArg => Console.print("\"arg\"")
case Mem.MResult => Console.print("\"result\"")

def S2c.jSafe(s: Mem.Safe): Unit = s match
case Mem.NoStore => Console.print("\"safe\":true,\"why\":\"noStore\"")
case Mem.Outlives => Console.print("\"safe\":true,\"why\":\"outlives\"")
case Mem.Shorter(a, b) =>
Console.print("\"safe\":false,\"why\":\"shorter\",\"fromRegion\":")
Console.printI64(a)
Console.print(",\"intoRegion\":")
Console.printI64(b)

def S2c.jWhy7(w: Mem.Why7): Unit = w match
case Mem.NotShared => Console.print("false")
case Mem.ByMulti => Console.print("\"multi\"")
Expand Down
2 changes: 1 addition & 1 deletion tests/s2/mem/bytes.out

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/s2/mem/compact.out

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/s2/mem/cycle.out

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/s2/mem/death.out

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/s2/mem/frees.out

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/s2/mem/inner.out

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/s2/mem/many.out

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions tests/s2/mem/moves.out

Large diffs are not rendered by default.

35 changes: 35 additions & 0 deletions tests/s2/mem/moves.srs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// mem: moves. a (a box of r) is stored into w (a box of t, handled inside r): a field move from a longer-lived region,
// safe. MW.into{r} builds its box in r (the chosen region), from b of t: a field move from a shorter-lived region,
// unsafe. b moves into c (bind), c into MB.get's param (arg), w's field out by a pattern
// MW.local handles q at its top and stores a (of r) into a box of q: q is inside t (MW.local runs in t), t inside r,
// so r outlives q (through two outl steps): safe
enum MB:
case MB(v: I64)

enum MW:
case MW(b: MB)

def MW.get(w: MW): I64 = w match
case MW(b) => MB.get(b)

def MB.get(b: MB): I64 = b match
case MB(v) => v

def MW.into {s: Region} (b: MB): MW = MW(b)

def main(): I64 =
handle io = Srs.Console()
handle r = Srs.Arena()
val a = MB(1)
handle t = Srs.Arena()
val w = MW(a)
val b = MB(2)
val c = b
val u = MW.into{r}(b)
Console.printI64(MW.get(w) + MB.get(c) + MW.get(u) + MW.local(a))
0

def MW.local(x: MB): I64 =
handle q = Srs.Arena()
val w = MW(x)
MW.get(w)
2 changes: 1 addition & 1 deletion tests/s2/mem/once.out

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/s2/mem/reasons.out

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/s2/mem/regions.out

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/s2/mem/reuse.out

Large diffs are not rendered by default.

Loading