Merge branch 'master' of https://github.com/celestinechen/fio

[fio.git] / arch / arch-x86.h

diff --git a/arch/arch-x86.h b/arch/arch-x86.h
index 4d7ea49dd1cdde71d004050875a95dc9c4c3ea80..c6bcb54ccf0d36d442401b483a788959a7358709 100644 (file)
--- a/arch/arch-x86.h
+++ b/arch/arch-x86.h
@@ -1,35 +1,40 @@
 #ifndef ARCH_X86_H
 #define ARCH_X86_H
 
-#define ARCH   (arch_i386)
+static inline void do_cpuid(unsigned int *eax, unsigned int *ebx,
+                           unsigned int *ecx, unsigned int *edx)
+{
+       asm volatile("xchgl %%ebx, %1\ncpuid\nxchgl %%ebx, %1"
+               : "=a" (*eax), "=r" (*ebx), "=c" (*ecx), "=d" (*edx)
+               : "0" (*eax)
+               : "memory");
+}
 
-#ifndef __NR_ioprio_set
-#define __NR_ioprio_set                289
-#define __NR_ioprio_get                290
-#endif
+#include "arch-x86-common.h" /* IWYU pragma: export */
 
-#ifndef __NR_fadvise64
-#define __NR_fadvise64         250
-#endif
+#define FIO_ARCH       (arch_x86)
 
-#ifndef __NR_sys_splice
-#define __NR_sys_splice                313
-#define __NR_sys_tee           315
-#define __NR_sys_vmsplice      316
-#endif
+#define        FIO_HUGE_PAGE           4194304
 
-#ifndef __NR_async_exec
-#define __NR_async_exec                325
-#define __NR_async_wait                326
-#define __NR_umem_add          327
-#define __NR_async_thread      328
-#endif
+#define nop            __asm__ __volatile__("rep;nop": : :"memory")
+#define read_barrier() __asm__ __volatile__("": : :"memory")
+#define write_barrier()        __asm__ __volatile__("": : :"memory")
 
-#define        FIO_HUGE_PAGE           4194304
+static inline unsigned long arch_ffz(unsigned long bitmask)
+{
+       __asm__("bsfl %1,%0" :"=r" (bitmask) :"r" (~bitmask));
+       return bitmask;
+}
 
-#define FIO_HAVE_SYSLET
+static inline unsigned long long get_cpu_clock(void)
+{
+       unsigned long long ret;
 
-#define nop            __asm__ __volatile__("rep;nop": : :"memory")
-#define read_barrier() asm volatile ("": : :"memory")
+       __asm__ __volatile__("rdtsc" : "=A" (ret));
+       return ret;
+}
+
+#define ARCH_HAVE_FFZ
+#define ARCH_HAVE_CPU_CLOCK
 
 #endif