1 files changed, 52 insertions, 15 deletions

diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index cf20187eee0a..b079304bd53d 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -4,6 +4,8 @@
 #include <asm/unistd.h>
 
 #if defined(__i386__)
+#define mb()            asm volatile("lock; addl $0,0(%%esp)" ::: "memory")
+#define wmb()           asm volatile("lock; addl $0,0(%%esp)" ::: "memory")
 #define rmb()           asm volatile("lock; addl $0,0(%%esp)" ::: "memory")
 #define cpu_relax()     asm volatile("rep; nop" ::: "memory");
 #define CPUINFO_PROC    "model name"
@@ -13,6 +15,8 @@
 #endif
 
 #if defined(__x86_64__)
+#define mb()            asm volatile("mfence" ::: "memory")
+#define wmb()           asm volatile("sfence" ::: "memory")
 #define rmb()           asm volatile("lfence" ::: "memory")
 #define cpu_relax()     asm volatile("rep; nop" ::: "memory");
 #define CPUINFO_PROC    "model name"
@@ -23,45 +27,61 @@
 
 #ifdef __powerpc__
 #include "../../arch/powerpc/include/uapi/asm/unistd.h"
+#define mb()            asm volatile ("sync" ::: "memory")
+#define wmb()           asm volatile ("sync" ::: "memory")
 #define rmb()           asm volatile ("sync" ::: "memory")
-#define cpu_relax()     asm volatile ("" ::: "memory");
 #define CPUINFO_PROC    "cpu"
 #endif
 
 #ifdef __s390__
+#define mb()            asm volatile("bcr 15,0" ::: "memory")
+#define wmb()           asm volatile("bcr 15,0" ::: "memory")
 #define rmb()           asm volatile("bcr 15,0" ::: "memory")
-#define cpu_relax()     asm volatile("" ::: "memory");
 #endif
 
 #ifdef __sh__
 #if defined(__SH4A__) || defined(__SH5__)
+# define mb()           asm volatile("synco" ::: "memory")
+# define wmb()          asm volatile("synco" ::: "memory")
 # define rmb()          asm volatile("synco" ::: "memory")
 #else
+# define mb()           asm volatile("" ::: "memory")
+# define wmb()          asm volatile("" ::: "memory")
 # define rmb()          asm volatile("" ::: "memory")
 #endif
-#define cpu_relax()     asm volatile("" ::: "memory")
 #define CPUINFO_PROC    "cpu type"
 #endif
 
 #ifdef __hppa__
+#define mb()            asm volatile("" ::: "memory")
+#define wmb()           asm volatile("" ::: "memory")
 #define rmb()           asm volatile("" ::: "memory")
-#define cpu_relax()     asm volatile("" ::: "memory");
 #define CPUINFO_PROC    "cpu"
 #endif
 
 #ifdef __sparc__
+#ifdef __LP64__
+#define mb()            asm volatile("ba,pt %%xcc, 1f\n"        \
+                                     "membar #StoreLoad\n"      \
+                                     "1:\n":::"memory")
+#else
+#define mb()            asm volatile("":::"memory")
+#endif
+#define wmb()           asm volatile("":::"memory")
 #define rmb()           asm volatile("":::"memory")
-#define cpu_relax()     asm volatile("":::"memory")
 #define CPUINFO_PROC    "cpu"
 #endif
 
 #ifdef __alpha__
+#define mb()            asm volatile("mb" ::: "memory")
+#define wmb()           asm volatile("wmb" ::: "memory")
 #define rmb()           asm volatile("mb" ::: "memory")
-#define cpu_relax()     asm volatile("" ::: "memory")
 #define CPUINFO_PROC    "cpu model"
 #endif
 
 #ifdef __ia64__
+#define mb()            asm volatile ("mf" ::: "memory")
+#define wmb()           asm volatile ("mf" ::: "memory")
 #define rmb()           asm volatile ("mf" ::: "memory")
 #define cpu_relax()     asm volatile ("hint @pause" ::: "memory")
 #define CPUINFO_PROC    "model name"
@@ -72,40 +92,55 @@
  * Use the __kuser_memory_barrier helper in the CPU helper page. See
  * arch/arm/kernel/entry-armv.S in the kernel source for details.
  */
+#define mb()            ((void(*)(void))0xffff0fa0)()
+#define wmb()           ((void(*)(void))0xffff0fa0)()
 #define rmb()           ((void(*)(void))0xffff0fa0)()
-#define cpu_relax()     asm volatile("":::"memory")
 #define CPUINFO_PROC    "Processor"
 #endif
 
 #ifdef __aarch64__
-#define rmb()           asm volatile("dmb ld" ::: "memory")
+#define mb()            asm volatile("dmb ish" ::: "memory")
+#define wmb()           asm volatile("dmb ishld" ::: "memory")
+#define rmb()           asm volatile("dmb ishst" ::: "memory")
 #define cpu_relax()     asm volatile("yield" ::: "memory")
 #endif
 
 #ifdef __mips__
-#define rmb()           asm volatile(                                   \
+#define mb()            asm volatile(                                   \
                                 ".set   mips2\n\t"                      \
                                 "sync\n\t"                              \
                                 ".set   mips0"                          \
                                 : /* no output */                       \
                                 : /* no input */                        \
                                 : "memory")
-#define cpu_relax()     asm volatile("" ::: "memory")
+#define wmb()   mb()
+#define rmb()   mb()
 #define CPUINFO_PROC    "cpu model"
 #endif
 
 #ifdef __arc__
+#define mb()            asm volatile("" ::: "memory")
+#define wmb()           asm volatile("" ::: "memory")
 #define rmb()           asm volatile("" ::: "memory")
-#define cpu_relax()     rmb()
 #define CPUINFO_PROC    "Processor"
 #endif
 
 #ifdef __metag__
+#define mb()            asm volatile("" ::: "memory")
+#define wmb()           asm volatile("" ::: "memory")
 #define rmb()           asm volatile("" ::: "memory")
-#define cpu_relax()     asm volatile("" ::: "memory")
 #define CPUINFO_PROC    "CPU"
 #endif
 
+#define barrier() asm volatile ("" ::: "memory")
+
+#ifndef cpu_relax
+#define cpu_relax() barrier()
+#endif
+
+#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
+
+
 #include <time.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -182,7 +217,9 @@ struct ip_callchain {
 struct branch_flags {
         u64 mispred:1;
         u64 predicted:1;
-        u64 reserved:62;
+        u64 in_tx:1;
+        u64 abort:1;
+        u64 reserved:60;
 };
 
 struct branch_entry {
@@ -211,14 +248,13 @@ enum perf_call_graph_mode {
 };
 
 struct perf_record_opts {
-        struct perf_target target;
+        struct target target;
         int          call_graph;
         bool         group;
         bool         inherit_stat;
         bool         no_delay;
         bool         no_inherit;
         bool         no_samples;
-        bool         pipe_output;
         bool         raw_samples;
         bool         sample_address;
         bool         sample_weight;
@@ -231,6 +267,7 @@ struct perf_record_opts {
         u64          default_interval;
         u64          user_interval;
         u16          stack_dump_size;
+        bool         sample_transaction;
 };
 
 #endif