Updates for Xtensa enabled 1.83 compiler #2615

MabezDev · 2024-11-26T17:30:04Z

Thank you for your contribution!

We appreciate the time and effort you've put into this pull request.
To help us review it efficiently, please ensure you've gone through the following checklist:

Submission Checklist 📝

I have updated existing examples or added new ones (if applicable).
I have used cargo xtask fmt-packages command to ensure that all changed code is formatted correctly.
My changes were added to the CHANGELOG.md in the proper section.
I have added necessary changes to user code to the Migration Guide.
My changes are in accordance to the esp-rs API guidelines

Extra:

I have read the CONTRIBUTING.md guide and followed its instructions.

Pull Request Details 📖

Description

Please provide a clear and concise description of your changes, including the motivation behind these changes. The context is crucial for the reviewers.

Testing

Describe how you tested your changes.

esp-hal/src/soc/esp32s3/cpu_control.rs

xtensa-lx-rt/src/exception/asm.rs

.github/workflows/ci.yml

jessebraham · 2024-11-28T13:35:08Z

xtask/src/main.rs

@@ -772,7 +772,7 @@ fn lint_package(path: &Path, args: &[&str], fix: bool) -> Result<()> {
    // build in release to reuse example artifacts
    let cargo_args = builder.arg("--release");
    let cargo_args = if fix {
-        cargo_args.arg("--fix").arg("--lib")
+        cargo_args.arg("--fix").arg("--lib").arg("--allow-dirty")


Thank you, keep forgetting to add this 😅

jessebraham · 2024-12-06T10:22:24Z

Any updates here?

MabezDev · 2024-12-06T10:34:35Z

Nothing yet, the LLVM issue is being looked into still. Our last resort is still available, which is to bump the MSRV.

MabezDev · 2024-12-09T11:11:31Z

Issue is fixed 🎉 , needs to make its way to github and I'll start the release builds

MabezDev · 2024-12-10T16:07:09Z

Well, it's fixed... but we're still in a situation where MSRV is failing because the bug that I found whilst trying to avoid bumping MSRV also affects the MSRV toolchain 🙃.

I think we have a few options here:

Bump MSRV + keep these changes (no more naked fns)
Bump MSRV + revert changes to xtensa lx (back to naked fns)
Backport the patch to $MSRV toolchain and cut a release from there

Thoughts?

bjoernQ · 2024-12-10T17:20:16Z

Getting rid of naked functions sounds best to me.

Not ideal to bump MSRV to 1.83 however.

Not sure how much effort option 3 would be

xtensa-lx-rt/src/exception/asm.rs

MabezDev · 2024-12-17T11:27:06Z

I went for the first option. When CI is green, I'll promote the compiler release to stable and remove the hardcoded versions from the workflows here.

.github/workflows/hil.yml

bjoernQ

LGTM - I also briefly tested with some esp-wifi examples and they still work fine

jessebraham

LGTM, thanks!

jessebraham · 2024-12-17T12:47:24Z

(@bugadani will review this too, please don't merge yet)

bugadani

ASM changes look OK.

Crate MSRVs are still set to 1.79, is that intentional? MSRV bump is also missing from the changelogs - although the label is set, we used to call out these changes.

e.g. in esp-hal:

esp-hal/esp-hal/Cargo.toml

Line 5 in f5c5d5c

rust-version = "1.79.0"

xtensa-lx-rt/src/exception/asm.rs

MabezDev · 2024-12-17T14:22:40Z

Thanks, I always forget about the rust-version field. Should be fixed now, along with some changelog entries.

tommasoclini · 2024-12-17T20:23:05Z

All of my xtensa projects are failing to build, do I have to use the github repo as the source for the esp-hal package? For how long?

bugadani · 2024-12-17T21:58:49Z

Please kindly downgrade your compiler with espup install --toolchain 1.82.0.1 until we resolve this incompatibility.

tommasoclini · 2024-12-18T05:28:28Z

Please kindly downgrade your compiler with espup install --toolchain 1.82.0.1 until we resolve this incompatibility.

Thx, I didn't know I could install different versions of tool chains with espup.

MabezDev added the skip-changelog No changelog modification needed label Nov 26, 2024

bugadani reviewed Nov 26, 2024

View reviewed changes

esp-hal/src/soc/esp32s3/cpu_control.rs Outdated Show resolved Hide resolved

bjoernQ reviewed Nov 28, 2024

View reviewed changes

xtensa-lx-rt/src/exception/asm.rs Outdated Show resolved Hide resolved

MabezDev force-pushed the compiler-test branch from 2b680a0 to a6c5233 Compare November 28, 2024 11:41

MabezDev changed the title ~~Test Xtensa enabled 1.83 compiler~~ Updates for Xtensa enabled 1.83 compiler Nov 28, 2024

MabezDev commented Nov 28, 2024

View reviewed changes

.github/workflows/ci.yml Outdated Show resolved Hide resolved

jessebraham reviewed Nov 28, 2024

View reviewed changes

MabezDev force-pushed the compiler-test branch 2 times, most recently from 8bf4031 to 41a877b Compare December 9, 2024 11:14

bugadani reviewed Dec 10, 2024

View reviewed changes

xtensa-lx-rt/src/exception/asm.rs Outdated Show resolved Hide resolved

MabezDev mentioned this pull request Dec 11, 2024

[RFC] MSRV policy going forward #2736

Open

MabezDev added 9 commits December 17, 2024 10:42

test ci

e23dae7

fix ci with new compiler

386cae2

god bless clippy fix

80cca59

refmuts

5f82eb8

clippy

a561bc4

tests work

d32d257

use new compiler

bf86181

use new compiler

4030bfc

bump MSRV of esp-hal and crates that depend on esp-hal

e145858

MabezDev force-pushed the compiler-test branch from 0f2ddfd to e145858 Compare December 17, 2024 10:48

MabezDev added 2 commits December 17, 2024 10:49

fix eyesore

bbcaa44

clippy again

6ad228b

MabezDev marked this pull request as ready for review December 17, 2024 11:24

bugadani reviewed Dec 17, 2024

View reviewed changes

.github/workflows/hil.yml Outdated Show resolved Hide resolved

remove hardcoded compiler version

f5c5d5c

MabezDev force-pushed the compiler-test branch from 28497a0 to f5c5d5c Compare December 17, 2024 12:02

bjoernQ approved these changes Dec 17, 2024

View reviewed changes

jessebraham approved these changes Dec 17, 2024

View reviewed changes

bugadani requested changes Dec 17, 2024

View reviewed changes

bugadani reviewed Dec 17, 2024

View reviewed changes

xtensa-lx-rt/src/exception/asm.rs Show resolved Hide resolved

bump rust-version as well

f922900

bugadani approved these changes Dec 17, 2024

View reviewed changes

note MSRV bump in changelog

84eac23

MabezDev force-pushed the compiler-test branch from 253d3bc to 84eac23 Compare December 17, 2024 14:27

jessebraham enabled auto-merge December 17, 2024 14:40

jessebraham added this pull request to the merge queue Dec 17, 2024

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 17, 2024

bugadani added this pull request to the merge queue Dec 17, 2024

Merged via the queue into esp-rs:main with commit 85d30e9 Dec 17, 2024
28 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updates for Xtensa enabled 1.83 compiler #2615

Updates for Xtensa enabled 1.83 compiler #2615

MabezDev commented Nov 26, 2024 •

edited

Loading

jessebraham Nov 28, 2024

jessebraham commented Dec 6, 2024

MabezDev commented Dec 6, 2024

MabezDev commented Dec 9, 2024

MabezDev commented Dec 10, 2024

bjoernQ commented Dec 10, 2024

MabezDev commented Dec 17, 2024

bjoernQ left a comment

jessebraham left a comment

jessebraham commented Dec 17, 2024

bugadani left a comment •

edited

Loading

MabezDev commented Dec 17, 2024

tommasoclini commented Dec 17, 2024

bugadani commented Dec 17, 2024

tommasoclini commented Dec 18, 2024

Updates for Xtensa enabled 1.83 compiler #2615

Updates for Xtensa enabled 1.83 compiler #2615

Conversation

MabezDev commented Nov 26, 2024 • edited Loading

Thank you for your contribution!

Submission Checklist 📝

Extra:

Pull Request Details 📖

Description

Testing

jessebraham Nov 28, 2024

Choose a reason for hiding this comment

jessebraham commented Dec 6, 2024

MabezDev commented Dec 6, 2024

MabezDev commented Dec 9, 2024

MabezDev commented Dec 10, 2024

bjoernQ commented Dec 10, 2024

MabezDev commented Dec 17, 2024

bjoernQ left a comment

Choose a reason for hiding this comment

jessebraham left a comment

Choose a reason for hiding this comment

jessebraham commented Dec 17, 2024

bugadani left a comment • edited Loading

Choose a reason for hiding this comment

MabezDev commented Dec 17, 2024

tommasoclini commented Dec 17, 2024

bugadani commented Dec 17, 2024

tommasoclini commented Dec 18, 2024

MabezDev commented Nov 26, 2024 •

edited

Loading

bugadani left a comment •

edited

Loading