Skip to content
Open
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
18 changes: 12 additions & 6 deletions client/src/Uorc/Client.lex.tex
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
\importmodule{Uorc.Core.Resources}
\importmodule{Uorc.Wire.Frame}
\importmodule{Uorc.Wire.Word}
\importmodule{Uorc.Wire.Text}
\importmodule{Uorc.Wire.Portfolio}
\importmodule{Uorc.Search.Identity}
\importmodule{Uorc.Search.Schedule}
\importmodule{Uorc.Search.Effort}
Expand Down Expand Up @@ -107,7 +109,7 @@
name: rawLength,
parameters: [n : Nat],
result: Nat,
body: ((prim multiply 2 (prim length (Uorc.Codec.Archive::number n) : Nat) : Nat) + (n + 41)),
body: ((prim subtract (prim length (Uorc.Codec.Archive::preimage 0x00 n 0x) : Nat) (prim length (Uorc.Codec.Archive::number 0) : Nat) : Nat) + ((prim length (Uorc.Codec.Archive::number n) : Nat) + (n + (Uorc.Wire.Word::digestBytes)))),
axioms: []
}

Expand All @@ -117,7 +119,7 @@
result: Nat,
body: (match fuel
| Nat.zero => acc
| Nat.succ m => (let b : Nat := (Uorc.Codec.Archive::byteAt data at); (printableFrom m data (at + 1) (if ((((b =? 9) || (b =? 10)) || (b =? 13)) || ((32 <=? b) && (b <? 127))) then (acc + 1) else acc)))),
| Nat.succ m => (let b : Nat := (Uorc.Codec.Archive::byteAt data at); (printableFrom m data (at + 1) (if (Uorc.Wire.Text::printable b) then (acc + 1) else acc)))),
axioms: [Quot.sound, propext],
recursive_argument: fuel
}
Expand Down Expand Up @@ -228,7 +230,7 @@
name: v04Pair,
parameters: [fam : Nat],
result: Bytes,
body: (if (fam =? 0) then 0xffff010000ffff0f0000 else (if (fam =? 1) then 0xffff010000ffff070000 else (if (fam =? 2) then 0xffff078000ffff0f0000 else 0xffff0f0000ffff070000))),
body: (if (fam =? (Uorc.Wire.Portfolio::familySmall)) then 0xffff010000ffff0f0000 else (if (fam =? (Uorc.Wire.Portfolio::familyMid)) then 0xffff010000ffff070000 else (if (fam =? (Uorc.Wire.Portfolio::familyX86)) then 0xffff078000ffff0f0000 else 0xffff0f0000ffff070000))),
axioms: []
}
definition{
Expand Down Expand Up @@ -355,14 +357,18 @@
recursive_argument: scheduled
}

definition{name: pageWorkersPerGiB, parameters: [], result: Nat, body: 2, axioms: []}

definition{
name: hostMemory,
parameters: [],
result: Nat,
body: 536870912,
body: (prim quotient (Uorc.Wire.Word::power (Uorc.Wire.Word::power (Uorc.Wire.Word::bitRange) ((Uorc.Wire.Word::bitRange) + (Uorc.Wire.Word::byteBits))) (1 + (Uorc.Wire.Word::bitRange))) (pageWorkersPerGiB) 0 : Nat),
axioms: []
}

definition{name: hostKeepsTables, parameters: [], result: Bool, body: true, axioms: []}

definition{
name: tableBytes,
parameters: [tb : Nat, mb : Nat, profile : Nat],
Expand All @@ -376,7 +382,7 @@
name: pageBytes,
parameters: [n : Nat, held : Nat, modelled : Nat, profile : Nat, tb : Nat],
result: Nat,
body: (let mb : Nat := (Uorc.Codec.NcmEncode::mbOf modelled profile); (let tables : Nat := (tableBytes tb mb profile); ((prim multiply 2 tables : Nat) + ((prim multiply 2 n : Nat) + held)))),
body: (let mb : Nat := (Uorc.Codec.NcmEncode::mbOf modelled profile); (let tables : Nat := (tableBytes tb mb profile); (tables + ((if (hostKeepsTables) then tables else 0) + (n + (n + held)))))),
axioms: []
}

Expand Down Expand Up @@ -559,7 +565,7 @@
result: (List Bytes),
body: (match window
| List.nil => (nil Bytes)
| List.cons oldest rest => (if ((Uorc.Codec.Archive::windowCount (cons oldest rest)) <=? 2) then (cons oldest rest) else (recentWindow rest))),
| List.cons oldest rest => (if ((Uorc.Codec.Archive::windowCount (cons oldest rest)) <=? (Uorc.Wire.Portfolio::v04WindowFrames)) then (cons oldest rest) else (recentWindow rest))),
axioms: [],
recursive_argument: window
}
Expand Down
10 changes: 8 additions & 2 deletions crates/uorc/src/performance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -426,8 +426,14 @@ mod tests {
fn page_worker_is_the_pages_host_rule() {
let per_gib = stated("../../src/Uorc/Page.lex.tex", "pageWorker", "workersPerGiB");
assert_eq!(super::WORKERS_PER_GIB, per_gib);
let client = stated("../../client/src/Uorc/Client.lex.tex", "hostMemory", "");
assert_eq!(super::PAGE_WORKER.memory, client);
// the client states the same workers per GiB and gives a worker
// 1 GiB over them (`Client.hostMemory`)
let client = stated(
"../../client/src/Uorc/Client.lex.tex",
"pageWorkersPerGiB",
"",
);
assert_eq!(super::WORKERS_PER_GIB, client);
let gate = stated("../../src/Uorc/Page.lex.tex", "workerMemory", "threshold");
assert_eq!(super::PAGE_WORKER.memory, gate << 20);
let threads = stated("../../src/Uorc/Page.lex.tex", "pageWorker", "frameThreads");
Expand Down
31 changes: 3 additions & 28 deletions model/figures.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# any listing the implementation no longer holds; the writer never raises a count.

schema = "uorc/figures/1"
sites = 3716
sites = 3705
under_facets = 7

[[item]]
Expand All @@ -24,49 +24,24 @@ values = { "2" = 1, "3" = 1, "4" = 1, "4096" = 1, "65536" = 1 }

[[item]]
file = "client/src/Uorc/Client.lex.tex"
item = "hostMemory"
values = { "536870912" = 1 }

[[item]]
file = "client/src/Uorc/Client.lex.tex"
item = "pageBytes"
values = { "2" = 2 }
item = "pageWorkersPerGiB"
values = { "2" = 1 }

[[item]]
file = "client/src/Uorc/Client.lex.tex"
item = "policy"
values = { "64" = 1 }

[[item]]
file = "client/src/Uorc/Client.lex.tex"
item = "printableFrom"
values = { "9" = 1, "10" = 1, "13" = 1, "32" = 1, "127" = 1 }

[[item]]
file = "client/src/Uorc/Client.lex.tex"
item = "query"
values = { "1048576" = 1, "1099511627776" = 3 }

[[item]]
file = "client/src/Uorc/Client.lex.tex"
item = "rawLength"
values = { "2" = 1, "41" = 1 }

[[item]]
file = "client/src/Uorc/Client.lex.tex"
item = "recentWindow"
values = { "2" = 1 }

[[item]]
file = "client/src/Uorc/Client.lex.tex"
item = "textFrame"
values = { "9" = 1, "10" = 1 }

[[item]]
file = "client/src/Uorc/Client.lex.tex"
item = "v04Pair"
values = { "2" = 1 }

[[item]]
file = "client/src/Uorc/Codec/Archive.lex.tex"
item = "byteAt"
Expand Down
51 changes: 51 additions & 0 deletions src/Uorc/Wire/Portfolio.lex.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
\begin{lexlean}{Uorc.Wire.Portfolio}
\title{Parameters}
\begin{semanticmodule}
definition{name: familySmall, parameters: [], result: Nat, body: 0, axioms: [], executable: true}

definition{
name: familyMid,
parameters: [],
result: Nat,
body: (1 + (familySmall)),
axioms: [],
executable: true
}

definition{
name: familyX86,
parameters: [],
result: Nat,
body: (1 + (familyMid)),
axioms: [],
executable: true
}

definition{
name: familyText,
parameters: [],
result: Nat,
body: (1 + (familyX86)),
axioms: [],
executable: true
}

definition{
name: familyOther,
parameters: [],
result: Nat,
body: (1 + (familyText)),
axioms: [],
executable: true
}

definition{
name: v04WindowFrames,
parameters: [],
result: Nat,
body: (1 + 1),
axioms: [],
executable: true
}
\end{semanticmodule}
\end{lexlean}
63 changes: 63 additions & 0 deletions src/Uorc/Wire/Text.lex.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
\begin{lexlean}{Uorc.Wire.Text}
\importmodule{Uorc.Wire.Word}
\title{Parameters}
\begin{semanticmodule}
definition{
name: asciiRows,
parameters: [],
result: Nat,
body: (Uorc.Wire.Word::power (Uorc.Wire.Word::bitRange) (Uorc.Wire.Word::profileWordBytes)),
axioms: [],
executable: true
}

definition{
name: asciiColumns,
parameters: [],
result: Nat,
body: (Uorc.Wire.Word::power (Uorc.Wire.Word::bitRange) (1 + (Uorc.Wire.Word::bitRange))),
axioms: [],
executable: true
}

definition{
name: graphicFirst,
parameters: [],
result: Nat,
body: (prim multiply (Uorc.Wire.Word::bitRange) (asciiRows) : Nat),
axioms: [],
executable: true
}

definition{
name: asciiDelete,
parameters: [],
result: Nat,
body: (prim subtract (prim multiply (asciiColumns) (asciiRows) : Nat) 1 : Nat),
axioms: [],
executable: true
}

definition{name: horizontalTab, parameters: [], result: Nat, body: 9, axioms: [], executable: true}

definition{name: lineFeed, parameters: [], result: Nat, body: 10, axioms: [], executable: true}

definition{
name: carriageReturn,
parameters: [],
result: Nat,
body: 13,
axioms: [],
executable: true
}

definition{
name: printable,
parameters: [b : Nat],
result: Bool,
body: ((((b =? (horizontalTab)) || (b =? (lineFeed))) || (b =? (carriageReturn))) || (((graphicFirst) <=? b) && (b <? (asciiDelete)))),
axioms: [],
executable: true
}
\end{semanticmodule}
\end{lexlean}
18 changes: 18 additions & 0 deletions src/Uorc/Wire/Word.lex.tex
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,24 @@
executable: true
}

definition{
name: digestBits,
parameters: [],
result: Nat,
body: (power (bitRange) (byteBits)),
axioms: [],
executable: true
}

definition{
name: digestBytes,
parameters: [],
result: Nat,
body: (prim quotient (digestBits) (byteBits) 0 : Nat),
axioms: [],
executable: true
}

definition{
name: littleEndian,
parameters: [fuel : Nat, data : Bytes, at : Nat],
Expand Down
Loading