Skip to content

Optimize multicore critical section impl #797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MabezDev merged 10 commits into from
Sep 21, 2023
Merged

Optimize multicore critical section impl #797

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fff6a77
Optimize multicore critical section impl
bugadani Sep 18, 2023
0f3c2bf
Assert reserved bits, explain bit choices, remove redundant checks
bugadani Sep 19, 2023
66d5c78
Don't assume the bit reads as 0
bugadani Sep 19, 2023
d79e973
Simplify code generated for thread_id()
bugadani Sep 19, 2023
0900d2f
Use non-0 value for unlocked
bugadani Sep 19, 2023
6ec59a9
Optimise release
bugadani Sep 19, 2023
7771844
Assume reserved bits read as 0
bugadani Sep 19, 2023
e10dceb
Add changelog entry
bugadani Sep 19, 2023
21c8b52
Clean up warning
bugadani Sep 19, 2023
aab8e77
Fix direct boot ld
bugadani Sep 20, 2023
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
Prev Previous commit
Next Next commit
Optimise release
  • Loading branch information
@bugadani
bugadani committed Sep 19, 2023
commit 6ec59a9efb5a65ec69b735b9e3ee7ea9a9b26e9e
38 changes: 14 additions & 24 deletions esp-hal-common/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,22 +229,18 @@ mod critical_section_impl {
tkn
}

unsafe fn release(mut token: critical_section::RawRestoreState) {
unsafe fn release(token: critical_section::RawRestoreState) {
#[cfg(multi_core)]
{
use super::multicore::{LockKind, MULTICORE_LOCK};
use super::multicore::MULTICORE_LOCK;

debug_assert!(MULTICORE_LOCK.is_owned_by_current_thread());

let lock_kind = if token & REENTRY_FLAG != 0 {
// We must only write 0 to the reserved bits
token = token & !REENTRY_FLAG;
LockKind::Reentry
} else {
LockKind::Lock
};
if token & REENTRY_FLAG != 0 {
return;
}

MULTICORE_LOCK.unlock(lock_kind);
MULTICORE_LOCK.unlock();
}

const RESERVED_MASK: u32 = 0b1111_1111_1111_1000_1111_0000_0000_0000;
Expand Down Expand Up @@ -285,21 +281,18 @@ mod critical_section_impl {
tkn
}

unsafe fn release(mut token: critical_section::RawRestoreState) {
unsafe fn release(token: critical_section::RawRestoreState) {
#[cfg(multi_core)]
{
use super::multicore::{LockKind, MULTICORE_LOCK};
use super::multicore::MULTICORE_LOCK;

debug_assert!(MULTICORE_LOCK.is_owned_by_current_thread());

let lock_kind = if token & REENTRY_FLAG != 0 {
token = token & !REENTRY_FLAG;
LockKind::Reentry
} else {
LockKind::Lock
};
if token & REENTRY_FLAG != 0 {
return;
}

MULTICORE_LOCK.unlock(lock_kind);
MULTICORE_LOCK.unlock();
}

if token != 0 {
Expand Down Expand Up @@ -373,11 +366,8 @@ mod critical_section_impl {
.is_ok()
}

pub(super) fn unlock(&self, kind: LockKind) {
match kind {
LockKind::Lock => self.owner.store(UNUSED_THREAD_ID_VALUE, Ordering::Release),
LockKind::Reentry => {}
}
pub(super) fn unlock(&self) {
self.owner.store(UNUSED_THREAD_ID_VALUE, Ordering::Release);
}
}
}
Expand Down