1
0
Fork 0
qmk_firmware/quantum
Purdea Andrei 6c2c3c13e9
Various fixes to how timer differences are calculated (#8585)
* tmk_core/common: Fixing TIMER_DIFF macro to calculate difference correctly after the timer wraps.

Let's go through an example, using the following macro:

If the first timer read is 0xe4 and the second one is 0x32, the timer wrapped.
If the timer would have had more bits, it's new value would have been 0x132,
and the correct difference in time is 0x132 - 0xe4 = 0x4e

old code TIMER_DIFF_8(0x32, 0xe4) = 0xff - 0xe4 + 0x32 = 0x4d, which is wrong.
new code TIMER_DIFF_8(0x32, 0xe4) = 0xff + 1 - 0xe4 + 0x32 = 0x4e, which is correct.

This also gives a chance for a smart compiler to optimize the code using normal
integer overflow.

For example on AVR, the following C code:
uint8_t __attribute__ ((noinline)) test(uint8_t current_timer, uint8_t start_timer)
{
    return TIMER_DIFF_8(current_timer, start_timer);
}
With the original code, it gets translated to the following list of instructions:
00004c6e <test>:
    4c6e:       98 2f           mov     r25, r24
    4c70:       86 1b           sub     r24, r22
    4c72:       96 17           cp      r25, r22
    4c74:       08 f4           brcc    .+2             ; 0x4c78 <test+0xa>
    4c76:       81 50           subi    r24, 0x01       ; 1
    4c78:       08 95           ret
But with this commit, it gets translated to a single instruction:
00004c40 <test>:
    4c40:       86 1b           sub     r24, r22
    4c42:       08 95           ret

This unfortunately doesn't always work so nicely, for example the following C code:
int __attribute__ ((noinline)) test(uint8_t current_timer, uint8_t start_timer)
{
    return TIMER_DIFF_8(current_timer, start_timer);
}
(Note: return type changed to int)
With the original code it gets translated to:
00004c6e <test>:
    4c6e:       28 2f           mov     r18, r24
    4c70:       30 e0           ldi     r19, 0x00       ; 0
    4c72:       46 2f           mov     r20, r22
    4c74:       50 e0           ldi     r21, 0x00       ; 0
    4c76:       86 17           cp      r24, r22
    4c78:       20 f0           brcs    .+8             ; 0x4c82 <test+0x14>
    4c7a:       c9 01           movw    r24, r18
    4c7c:       84 1b           sub     r24, r20
    4c7e:       95 0b           sbc     r25, r21
    4c80:       08 95           ret
    4c82:       c9 01           movw    r24, r18
    4c84:       84 1b           sub     r24, r20
    4c86:       95 0b           sbc     r25, r21
    4c88:       81 50           subi    r24, 0x01       ; 1
    4c8a:       9f 4f           sbci    r25, 0xFF       ; 255
    4c8c:       08 95           ret
Wth this commit it gets translated to:
00004c40 <test>:
    4c40:       28 2f           mov     r18, r24
    4c42:       30 e0           ldi     r19, 0x00       ; 0
    4c44:       46 2f           mov     r20, r22
    4c46:       50 e0           ldi     r21, 0x00       ; 0
    4c48:       86 17           cp      r24, r22
    4c4a:       20 f0           brcs    .+8             ; 0x4c54 <test+0x14>
    4c4c:       c9 01           movw    r24, r18
    4c4e:       84 1b           sub     r24, r20
    4c50:       95 0b           sbc     r25, r21
    4c52:       08 95           ret
    4c54:       c9 01           movw    r24, r18
    4c56:       84 1b           sub     r24, r20
    4c58:       95 0b           sbc     r25, r21
    4c5a:       93 95           inc     r25
    4c5c:       08 95           ret
There is not much performance improvement in this case, however at least with this
commit it functions correctly.

Note: The following commit will improve compiler output for the latter example.

* tmk_core/common: Improve code generation for TIMER_DIFF* macros

Because of integer promotion the compiler is having a hard time generating
efficient code to calculate TIMER_DIFF* macros in some situations.
In the below example, the return value is "int", and this is causing the
trouble.

Example C code:

int __attribute__ ((noinline)) test(uint8_t current_timer, uint8_t start_timer)
{
    return TIMER_DIFF_8(current_timer, start_timer);
}

BEFORE: (with -Os)

00004c40 <test>:
    4c40:       28 2f           mov     r18, r24
    4c42:       30 e0           ldi     r19, 0x00       ; 0
    4c44:       46 2f           mov     r20, r22
    4c46:       50 e0           ldi     r21, 0x00       ; 0
    4c48:       86 17           cp      r24, r22
    4c4a:       20 f0           brcs    .+8             ; 0x4c54 <test+0x14>
    4c4c:       c9 01           movw    r24, r18
    4c4e:       84 1b           sub     r24, r20
    4c50:       95 0b           sbc     r25, r21
    4c52:       08 95           ret
    4c54:       c9 01           movw    r24, r18
    4c56:       84 1b           sub     r24, r20
    4c58:       95 0b           sbc     r25, r21
    4c5a:       93 95           inc     r25
    4c5c:       08 95           ret

AFTER: (with -Os)

00004c40 <test>:
    4c40:       86 1b           sub     r24, r22
    4c42:       90 e0           ldi     r25, 0x00       ; 0
    4c44:       08 95           ret

Note: the example is showing -Os but improvements can be seen at all optimization levels,
including -O0. We never use -O0, but I tested it to make sure that no extra code is
generated in that case.OA

* quantum/debounce: Fix custom wrapping timers in eager_pr and eager_pk debounce algorithms

Please see the below simulated sequence of events:
Column A is the 16-bit value returned by read_timer();
Column B is the value returned by custom_wrap_timer_read();
Column C is the original code: (timer_read() % MAX_DEBOUNCE)

    A,     B,     C
65530,    19,    30
65531,    20,    31
65532,    21,    32
65533,    22,    33
65534,    23,    34
65535,    24,    35
    0     25,     0
    1,    26,     1
    2,    27,     2
    3,    28,     3
    4,    29,     4
    5,    30,     5

read_timer() wraps about every 1.09 seconds, and so debouncing might
fail at these times without this commit.

* quantum/debounce/eager_pr and eager_pk: modifications for code readability according to code review.

* quantum/debounce/eager_pr and eager_pk: modifications for code readability according to code review. (2)
2020-04-11 10:14:28 +10:00
..
api clang-format changes 2019-08-30 15:01:52 -07:00
audio format code according to conventions [skip ci] 2020-03-30 20:52:13 +00:00
backlight Initial arm->chibios pass - simplify some platform logic (#8450) 2020-03-21 16:20:04 +11:00
debounce Various fixes to how timer differences are calculated (#8585) 2020-04-11 10:14:28 +10:00
keymap_extras Add Greek keymap (#8636) 2020-04-05 00:56:20 -07:00
process_keycode Rename UC_OSX (and related constants) to UC_MAC (#8589) 2020-03-31 18:28:43 +02:00
rgb_matrix_animations RGB matrix effect - left-right gradient (#7742) 2020-01-07 21:25:17 +00:00
rgb_matrix_runners clang-format changes 2019-08-30 15:01:52 -07:00
serial_link 2020 February 29 Breaking Changes Update (#8064) 2020-02-29 11:59:30 -08:00
split_common Run clang-format manually to fix recently changed files (#8552) 2020-03-25 14:39:53 +11:00
stm32 2020 February 29 Breaking Changes Update (#8064) 2020-02-29 11:59:30 -08:00
template Fix compile issues related to NO_ACTION_MACRO/FUNCTION and LTO_ENABLE (#8663) 2020-04-09 00:18:30 +01:00
tools Backlight abstraction and other changes (#439) 2016-06-23 22:18:20 -04:00
visualizer 2020 February 29 Breaking Changes Update (#8064) 2020-02-29 11:59:30 -08:00
api.c clang-format changes 2019-08-30 15:01:52 -07:00
api.h clang-format changes 2019-08-30 15:01:52 -07:00
color.c Run clang-format manually to fix recently changed files (#7934) 2020-01-19 16:30:34 +00:00
color.h Use White channel on RGBW LEDs (#7678) 2019-12-31 16:33:49 +00:00
config_common.h Initial support for ATtiny85 (#8632) 2020-04-02 22:23:57 +01:00
debounce.h Removed #include "matrix.h" from debounce.h 2019-01-26 22:44:33 +11:00
dip_switch.c Run clang-format manually to fix recently changed files 2019-11-17 08:25:58 -08:00
dip_switch.h Add Dip Switch as a core feature (#6140) 2019-09-03 08:34:31 -07:00
dynamic_keymap.c format code according to conventions [skip ci] 2020-03-14 14:08:48 +00:00
dynamic_keymap.h clang-format changes 2019-08-30 15:01:52 -07:00
dynamic_macro.h [Core] Convert Dynamic Macro to a Core Feature (#5948) 2019-11-04 22:59:13 -08:00
encoder.c 2020 February 29 Breaking Changes Update (#8064) 2020-02-29 11:59:30 -08:00
encoder.h Added encoder support to split common code (#5477) 2019-04-03 16:01:17 -07:00
fauxclicky.c clang-format changes 2019-08-30 15:01:52 -07:00
fauxclicky.h clang-format changes 2019-08-30 15:01:52 -07:00
keycode_config.c clang-format changes 2019-08-30 15:01:52 -07:00
keycode_config.h clang-format changes 2019-08-30 15:01:52 -07:00
keymap.h clang-format changes 2019-08-30 15:01:52 -07:00
keymap_common.c Strip out features to allow minimum firmware sizes (#8645) 2020-04-01 21:06:22 +01:00
led_matrix.c clang-format changes 2019-08-30 15:01:52 -07:00
led_matrix_drivers.c clang-format changes 2019-08-30 15:01:52 -07:00
led_tables.c Remove unused LED_BREATHING_TABLE 2020-03-06 22:29:01 -08:00
led_tables.h Remove unused LED_BREATHING_TABLE 2020-03-06 22:29:01 -08:00
ledmatrix.h clang-format changes 2019-08-30 15:01:52 -07:00
matrix.c Allow 30us matrix delay to be keyboard/user overridable (#8216) 2020-02-21 14:49:33 +11:00
matrix_common.c Allow 30us matrix delay to be keyboard/user overridable (#8216) 2020-02-21 14:49:33 +11:00
mcu_selection.mk Initial support for ATtiny85 (#8632) 2020-04-02 22:23:57 +01:00
pincontrol.h clang-format changes 2019-08-30 15:01:52 -07:00
pointing_device.c clang-format changes 2019-08-30 15:01:52 -07:00
pointing_device.h clang-format changes 2019-08-30 15:01:52 -07:00
quantum.c Strip out features to allow minimum firmware sizes (#8645) 2020-04-01 21:06:22 +01:00
quantum.h Add Post Processing to process_record (#4892) 2020-03-23 00:29:05 +11:00
quantum_keycodes.h Rename UC_OSX (and related constants) to UC_MAC (#8589) 2020-03-31 18:28:43 +02:00
rgb.h clang-format changes 2019-08-30 15:01:52 -07:00
rgb_matrix.c Run clang-format manually to fix recently changed files (#8552) 2020-03-25 14:39:53 +11:00
rgb_matrix.h Relocate RGB keycode processing (#7508) 2019-12-16 12:27:53 -08:00
rgb_matrix_drivers.c Use White channel on RGBW LEDs (#7678) 2019-12-31 16:33:49 +00:00
rgb_matrix_types.h clang-format changes 2019-08-30 15:01:52 -07:00
rgblight.c format code according to conventions [skip ci] 2020-03-10 20:24:13 +00:00
rgblight.h format code according to conventions [skip ci] 2020-03-10 20:24:13 +00:00
rgblight_breathe_table.h clang-format changes 2019-08-30 15:01:52 -07:00
rgblight_list.h clang-format changes 2019-08-30 15:01:52 -07:00
rgblight_modes.h clang-format changes 2019-08-30 15:01:52 -07:00
rgblight_post_config.h clang-format changes 2019-08-30 15:01:52 -07:00
send_string_keycodes.h Add support for delays in send_string. (#8244) 2020-02-27 20:38:19 +11:00
variable_trace.c clang-format changes 2019-08-30 15:01:52 -07:00
variable_trace.h clang-format changes 2019-08-30 15:01:52 -07:00
velocikey.c clang-format changes 2019-08-30 15:01:52 -07:00
velocikey.h clang-format changes 2019-08-30 15:01:52 -07:00
via.c Configurable VIA layout options default value (#8707) 2020-04-06 20:27:44 +01:00
via.h Configurable VIA layout options default value (#8707) 2020-04-06 20:27:44 +01:00
wpm.c Run clang-format manually to fix recently changed files (#8552) 2020-03-25 14:39:53 +11:00
wpm.h Run clang-format manually to fix recently changed files (#8552) 2020-03-25 14:39:53 +11:00