x86/asm/tsc: Save an instruction in DECLARE_ARGS users
A message that is not in the archive (sent off-list or not yet received): [email protected]
tip-bot for George Spelvin
merge botCommit-ID: 5a33fcb8d991209bac0a266ab499e4b53d116cdd Gitweb: http://git.kernel.org/tip/5a33fcb8d991209bac0a266ab499e4b53d116cdd Author: George Spelvin <[email protected]> AuthorDate: Thu, 25 Jun 2015 18:44:13 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 6 Jul 2015 15:23:30 +0200
x86/asm/tsc: Save an instruction in DECLARE_ARGS users
Before, the code to do RDTSC looked like:
rdtsc
shl $0x20, %rdx
mov %eax, %eax
or %rdx, %rax
The "mov %eax, %eax" is required to clear the high 32 bits of RAX.
By declaring low and high as 64-bit variables, the code is simplified to:
rdtsc
shl $0x20,%rdx
or %rdx,%rax
Yes, it's a 2-byte instruction that's not on a critical path, but there are principles to be upheld.
Every user of EAX_EDX_RET has been checked. I tried to check users of EAX_EDX_ARGS, but there weren't any, so I deleted it to be safe.
( There's no benefit to making "high" 64 bits, but it was the
simplest way to proceed. )
Signed-off-by George Spelvin <[email protected]>
Signed-off-by Borislav Petkov <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Brian Gerst <[email protected]>
Cc Denys Vlasenko <[email protected]>
Cc H. Peter Anvin <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/include/asm/msr.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
arch/x86/include/asm/msr.h +3 -4
@@ -47,14 +47,13 @@ static inline unsigned long long native_read_tscp(unsigned int *aux)* it means rax *or* rdx. */ #ifdef CONFIG_X86_64 -#define DECLARE_ARGS (val, low, high) unsigned low, high -#define EAX_EDX_VAL (val, low, high) ((low) | ((u64)(high) << 32)) -#define EAX_EDX_ARGS (val, low, high) "a" (low), "d" (high) +/* Using 64-bit values saves one instruction clearing the high half of low */ +#define DECLARE_ARGS (val, low, high) unsigned long low, high +#define EAX_EDX_VAL (val, low, high) ((low) | (high) << 32)#define EAX_EDX_RET (val, low, high) "=a" (low), "=d" (high)#else #define DECLARE_ARGS (val, low, high) unsigned long long val#define EAX_EDX_VAL (val, low, high) (val) -#define EAX_EDX_ARGS (val, low, high) "A" (val)#define EAX_EDX_RET (val, low, high) "=A" (val)#endif