Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf updates from Ingo Molnar:
 "This tree includes some late late perf items that missed the first
  round:

  tools:

   - Bash auto completion improvements, now we can auto complete the
     tools long options, tracepoint event names, etc, from Namhyung Kim.

   - Look up thread using tid instead of pid in 'perf sched'.

   - Move global variables into a perf_kvm struct, from David Ahern.

   - Hists refactorings, preparatory for improved 'diff' command, from
     Jiri Olsa.

   - Hists refactorings, preparatory for event group viewieng work, from
     Namhyung Kim.

   - Remove double negation on optional feature macro definitions, from
     Namhyung Kim.

   - Remove several cases of needless global variables, on most
     builtins.

   - misc fixes

  kernel:

   - sysfs support for IBS on AMD CPUs, from Robert Richter.

   - Support for an upcoming Intel CPU, the Xeon-Phi / Knights Corner
     HPC blade PMU, from Vince Weaver.

   - misc fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (46 commits)
  perf: Fix perf_cgroup_switch for sw-events
  perf: Clarify perf_cpu_context::active_pmu usage by renaming it to ::unique_pmu
  perf/AMD/IBS: Add sysfs support
  perf hists: Add more helpers for hist entry stat
  perf hists: Move he->stat.nr_events initialization to a template
  perf hists: Introduce struct he_stat
  perf diff: Removing the total_period argument from output code
  perf tool: Add hpp interface to enable/disable hpp column
  perf tools: Removing hists pair argument from output path
  perf hists: Separate overhead and baseline columns
  perf diff: Refactor diff displacement possition info
  perf hists: Add struct hists pointer to struct hist_entry
  perf tools: Complete tracepoint event names
  perf/x86: Add support for Intel Xeon-Phi Knights Corner PMU
  perf evlist: Remove some unused methods
  perf evlist: Introduce add_newtp method
  perf kvm: Move global variables into a perf_kvm struct
  perf tools: Convert to BACKTRACE_SUPPORT
  perf tools: Long option completion support for each subcommands
  perf tools: Complete long option names of perf command
  ...

1 files changed, 42 insertions, 48 deletions

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 1be843aa1546..fb9625083a2e 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -24,7 +24,6 @@ static u64			last_timestamp;
 static u64                      nr_unordered;
 extern const struct option      record_options[];
 static bool                     no_callchain;
-static bool                     show_full_info;
 static bool                     system_wide;
 static const char               *cpu_list;
 static DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);
@@ -473,8 +472,6 @@ static int cleanup_scripting(void)
         return scripting_ops->stop_script();
 }
 
-static const char *input_name;
-
 static int process_sample_event(struct perf_tool *tool __maybe_unused,
                                 union perf_event *event,
                                 struct perf_sample *sample,
@@ -1156,20 +1153,40 @@ out:
         return n_args;
 }
 
-static const char * const script_usage[] = {
-        "perf script [<options>]",
-        "perf script [<options>] record <script> [<record-options>] <command>",
-        "perf script [<options>] report <script> [script-args]",
-        "perf script [<options>] <script> [<record-options>] <command>",
-        "perf script [<options>] <top-script> [script-args]",
-        NULL
-};
+static int have_cmd(int argc, const char **argv)
+{
+        char **__argv = malloc(sizeof(const char *) * argc);
+
+        if (!__argv) {
+                pr_err("malloc failed\n");
+                return -1;
+        }
+
+        memcpy(__argv, argv, sizeof(const char *) * argc);
+        argc = parse_options(argc, (const char **)__argv, record_options,
+                             NULL, PARSE_OPT_STOP_AT_NON_OPTION);
+        free(__argv);
 
-static const struct option options[] = {
+        system_wide = (argc == 0);
+
+        return 0;
+}
+
+int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused)
+{
+        bool show_full_info = false;
+        const char *input_name = NULL;
+        char *rec_script_path = NULL;
+        char *rep_script_path = NULL;
+        struct perf_session *session;
+        char *script_path = NULL;
+        const char **__argv;
+        int i, j, err;
+        const struct option options[] = {
         OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
                     "dump raw trace in ASCII"),
         OPT_INCR('v', "verbose", &verbose,
-                    "be more verbose (show symbol address, etc)"),
+                 "be more verbose (show symbol address, etc)"),
         OPT_BOOLEAN('L', "Latency", &latency_format,
                     "show latency attributes (irqs/preemption disabled, etc)"),
         OPT_CALLBACK_NOOPT('l', "list", NULL, NULL, "list available scripts",
@@ -1179,8 +1196,7 @@ static const struct option options[] = {
                      parse_scriptname),
         OPT_STRING('g', "gen-script", &generate_script_lang, "lang",
                    "generate perf-script.xx script in specified language"),
-        OPT_STRING('i', "input", &input_name, "file",
-                    "input file name"),
+        OPT_STRING('i', "input", &input_name, "file", "input file name"),
         OPT_BOOLEAN('d', "debug-mode", &debug_mode,
                    "do various checks like samples ordering and lost events"),
         OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name,
@@ -1195,10 +1211,9 @@ static const struct option options[] = {
                      "comma separated output fields prepend with 'type:'. "
                      "Valid types: hw,sw,trace,raw. "
                      "Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso,"
-                     "addr,symoff",
-                     parse_output_fields),
+                     "addr,symoff", parse_output_fields),
         OPT_BOOLEAN('a', "all-cpus", &system_wide,
-                     "system-wide collection from all CPUs"),
+                    "system-wide collection from all CPUs"),
         OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",
                    "only consider these symbols"),
         OPT_STRING('C', "cpu", &cpu_list, "cpu", "list of cpus to profile"),
@@ -1208,37 +1223,16 @@ static const struct option options[] = {
                     "display extended information from perf.data file"),
         OPT_BOOLEAN('\0', "show-kernel-path", &symbol_conf.show_kernel_path,
                     "Show the path of [kernel.kallsyms]"),
-
         OPT_END()
-};
-
-static int have_cmd(int argc, const char **argv)
-{
-        char **__argv = malloc(sizeof(const char *) * argc);
-
-        if (!__argv) {
-                pr_err("malloc failed\n");
-                return -1;
-        }
-
-        memcpy(__argv, argv, sizeof(const char *) * argc);
-        argc = parse_options(argc, (const char **)__argv, record_options,
-                             NULL, PARSE_OPT_STOP_AT_NON_OPTION);
-        free(__argv);
-
-        system_wide = (argc == 0);
-
-        return 0;
-}
-
-int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused)
-{
-        char *rec_script_path = NULL;
-        char *rep_script_path = NULL;
-        struct perf_session *session;
-        char *script_path = NULL;
-        const char **__argv;
-        int i, j, err;
+        };
+        const char * const script_usage[] = {
+                "perf script [<options>]",
+                "perf script [<options>] record <script> [<record-options>] <command>",
+                "perf script [<options>] report <script> [script-args]",
+                "perf script [<options>] <script> [<record-options>] <command>",
+                "perf script [<options>] <top-script> [script-args]",
+                NULL
+        };
 
         setup_scripting();