Merge rust-embedded#312

312: Fix timing of asm-based delay implementation r=adamgreig a=jonas-schievink Should fix rust-embedded#236 I've also moved the cycle adjustment into the assembly implementation, since it seems more appropriate there (and this will be useful if we make `cortex-m-asm` its own crate). Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
ovidiusabou · Jan 7, 2021 · 86cd463 · 86cd463
2 parents 1261653 + 5a43c6e
commit 86cd463
Show file tree

Hide file tree

Showing 16 changed files with 9 additions and 8 deletions.
diff --git a/asm/inline.rs b/asm/inline.rs
@@ -52,13 +52,16 @@ pub unsafe fn __cpsie() {
 
 #[inline(always)]
 pub unsafe fn __delay(cyc: u32) {
-    // Use local labels to avoid R_ARM_THM_JUMP8 relocations which fail on thumbv6m.
+    // The loop will normally take 3 to 4 CPU cycles per iteration, but superscalar cores
+    // (eg. Cortex-M7) can potentially do it in 2, so we use that as the lower bound, since delaying
+    // for more cycles is okay.
+    let real_cyc = cyc / 2;
     asm!(
+        // Use local labels to avoid R_ARM_THM_JUMP8 relocations which fail on thumbv6m.
         "1:",
-        "nop",
         "subs {}, #1",
         "bne 1b",
-        in(reg) cyc
+        in(reg) real_cyc
     );
 }
 

diff --git a/bin/thumbv6m-none-eabi-lto.a b/bin/thumbv6m-none-eabi-lto.a
diff --git a/bin/thumbv6m-none-eabi.a b/bin/thumbv6m-none-eabi.a
diff --git a/bin/thumbv7em-none-eabi-lto.a b/bin/thumbv7em-none-eabi-lto.a
diff --git a/bin/thumbv7em-none-eabi.a b/bin/thumbv7em-none-eabi.a
diff --git a/bin/thumbv7em-none-eabihf-lto.a b/bin/thumbv7em-none-eabihf-lto.a
diff --git a/bin/thumbv7em-none-eabihf.a b/bin/thumbv7em-none-eabihf.a
diff --git a/bin/thumbv7m-none-eabi-lto.a b/bin/thumbv7m-none-eabi-lto.a
diff --git a/bin/thumbv7m-none-eabi.a b/bin/thumbv7m-none-eabi.a
diff --git a/bin/thumbv8m.base-none-eabi-lto.a b/bin/thumbv8m.base-none-eabi-lto.a
diff --git a/bin/thumbv8m.base-none-eabi.a b/bin/thumbv8m.base-none-eabi.a
diff --git a/bin/thumbv8m.main-none-eabi-lto.a b/bin/thumbv8m.main-none-eabi-lto.a
diff --git a/bin/thumbv8m.main-none-eabi.a b/bin/thumbv8m.main-none-eabi.a
diff --git a/bin/thumbv8m.main-none-eabihf-lto.a b/bin/thumbv8m.main-none-eabihf-lto.a
diff --git a/bin/thumbv8m.main-none-eabihf.a b/bin/thumbv8m.main-none-eabihf.a
diff --git a/src/asm.rs b/src/asm.rs
@@ -15,7 +15,7 @@ pub fn bkpt() {
     call_asm!(__bkpt());
 }
 
-/// Blocks the program for *at least* `n` instruction cycles
+/// Blocks the program for *at least* `cycles` CPU cycles.
 ///
 /// This is implemented in assembly so its execution time is independent of the optimization
 /// level, however it is dependent on the specific architecture and core configuration.
@@ -25,10 +25,8 @@ pub fn bkpt() {
 /// timer-less initialization of peripherals if and only if accurate timing is not essential. In
 /// any other case please use a more accurate method to produce a delay.
 #[inline]
-pub fn delay(n: u32) {
-    // NOTE(divide by 4) is easier to compute than `/ 3` because it's just a shift (`>> 2`).
-    let real_cyc = n / 4 + 1;
-    call_asm!(__delay(real_cyc: u32));
+pub fn delay(cycles: u32) {
+    call_asm!(__delay(cycles: u32));
 }
 
 /// A no-operation. Useful to prevent delay loops from being optimized away.