Skip to content

Commit

Permalink
Bump sprot sizes to fix build (#1601)
Browse files Browse the repository at this point in the history
#1597 bumped `syn` and `proc-macro2`.  For some reason, this slightly changes
the size of the `sprot` task, so `master` is not building for me right now:

```console
Error: task sprot: needs 47360 bytes of flash but max-sizes limits it to 47328
```

[Last time I investigated](https://matrix.to/#/!jxnlDLnJsVaIRstnrt:oxide.computer/$pCYj2H5LWUDkQwx_svMii1GZiOkXxpHA26BOjJzXPBA?via=oxide.computer&via=unix.house&via=matrix.org),
I came to the conclusion that bumping `proc-macro2` caused LLVM functions to be
emitted in a different order, which changed inlining behavior, which pushed one
task over the size limit (and there were literally no changes in the generated
LLVM IR).
  • Loading branch information
mkeeter authored Jan 29, 2024
1 parent 02cc434 commit 65e7bc6
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion app/lpc55xpresso/app-sprot.toml
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ task-slots = ["swd"]
[tasks.sprot]
name = "drv-lpc55-sprot-server"
priority = 6
max-sizes = {flash = 47328, ram = 32768}
max-sizes = {flash = 47360, ram = 32768}
uses = ["flexcomm8", "bootrom"]
features = ["spi0"]
start = true
Expand Down
2 changes: 1 addition & 1 deletion app/oxide-rot-1/app-dev.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ task-slots = ["syscon_driver"]
[tasks.sprot]
name = "drv-lpc55-sprot-server"
priority = 6
max-sizes = {flash = 47328, ram = 32768}
max-sizes = {flash = 47360, ram = 32768}
uses = ["flexcomm8", "bootrom"]
features = ["spi0"]
start = true
Expand Down
2 changes: 1 addition & 1 deletion app/oxide-rot-1/app.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ task-slots = ["syscon_driver"]
[tasks.sprot]
name = "drv-lpc55-sprot-server"
priority = 6
max-sizes = {flash = 47328, ram = 32768}
max-sizes = {flash = 47360, ram = 32768}
uses = ["flexcomm8", "bootrom"]
features = ["spi0"]
start = true
Expand Down
2 changes: 1 addition & 1 deletion app/rot-carrier/app.toml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ task-slots = ["syscon_driver"]
[tasks.sprot]
name = "drv-lpc55-sprot-server"
priority = 6
max-sizes = {flash = 47328, ram = 32768}
max-sizes = {flash = 47360, ram = 32768}
uses = ["flexcomm8", "bootrom"]
features = ["spi0"]
start = true
Expand Down

0 comments on commit 65e7bc6

Please sign in to comment.