Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Sender: Namhyung Kim <namhyung@gmail.com>
From:   Namhyung Kim <namhyung@kernel.org>
To:     Linus Torvalds <torvalds@linux-foundation.org>
Cc:     Arnaldo Carvalho de Melo <acme@kernel.org>,
        Jiri Olsa <jolsa@kernel.org>, Ian Rogers <irogers@google.com>,
        Adrian Hunter <adrian.hunter@intel.com>,
        Ingo Molnar <mingo@kernel.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        LKML <linux-kernel@vger.kernel.org>,
        linux-perf-users@vger.kernel.org
Subject: Re: [GIT PULL] perf tools changes for v6.5
Date:   Wed, 28 Jun 2023 16:22:59 -0700
Message-ID: <20230628232259.2777226-1-namhyung@kernel.org>
In-Reply-To: <20230628215954.1230048-1-namhyung@kernel.org>
References: <20230628215954.1230048-1-namhyung@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Oh, I forgot to mention that it'd create a conflict with the tip tree because
it contains some perf user space changes.

Stephen Rothwell already resolved this like below in the -next tree.

  https://lore.kernel.org/r/CAM9d7ciqQSp3zWNeq-P0r8pGN=6jJBWyxK=LzUz2SYm_kAaG4g@mail.gmail.com

I'm copying it in just case.

Thanks,
Namhyung

---
commit de114f42b7c24d1e8373800e46c3a19b944e4665
Merge: f78f1f477e06 ad5f604e186a
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Wed Jun 28 09:54:39 2023 +1000

    Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git
    
    # Conflicts:
    #       tools/perf/arch/x86/include/arch-tests.h
    #       tools/perf/arch/x86/tests/arch-tests.c

diff --cc tools/perf/arch/x86/include/arch-tests.h
index 93d3b8877baa,df133020d582..2b0684132f06
--- a/tools/perf/arch/x86/include/arch-tests.h
+++ b/tools/perf/arch/x86/include/arch-tests.h
@@@ -11,7 -13,7 +13,8 @@@ int test__intel_pt_pkt_decoder(struct t
  int test__intel_pt_hybrid_compat(struct test_suite *test, int subtest);
  int test__bp_modify(struct test_suite *test, int subtest);
  int test__x86_sample_parsing(struct test_suite *test, int subtest);
+ int test__hybrid(struct test_suite *test, int subtest);
 +int test__amd_ibs_via_core_pmu(struct test_suite *test, int subtest);
  
  extern struct test_suite *arch_tests[];
  
diff --cc tools/perf/arch/x86/tests/Build
index fd02d8181718,394771c00dca..b87f46e5feea
--- a/tools/perf/arch/x86/tests/Build
+++ b/tools/perf/arch/x86/tests/Build
@@@ -3,6 -3,9 +3,10 @@@ perf-$(CONFIG_DWARF_UNWIND) += dwarf-un
  
  perf-y += arch-tests.o
  perf-y += sample-parsing.o
- perf-$(CONFIG_AUXTRACE) += insn-x86.o intel-pt-test.o
+ perf-y += hybrid.o
+ perf-$(CONFIG_AUXTRACE) += intel-pt-test.o
+ ifeq ($(CONFIG_EXTRA_TESTS),y)
+ perf-$(CONFIG_AUXTRACE) += insn-x86.o
+ endif
  perf-$(CONFIG_X86_64) += bp-modify.o
 +perf-y += amd-ibs-via-core-pmu.o
diff --cc tools/perf/arch/x86/tests/arch-tests.c
index b5c85ab8d92e,3f2b90c59f92..9808dc02fe79
--- a/tools/perf/arch/x86/tests/arch-tests.c
+++ b/tools/perf/arch/x86/tests/arch-tests.c
@@@ -22,7 -24,15 +24,16 @@@ struct test_suite suite__intel_pt = 
  DEFINE_SUITE("x86 bp modify", bp_modify);
  #endif
  DEFINE_SUITE("x86 Sample parsing", x86_sample_parsing);
+ static struct test_case hybrid_tests[] = {
+ 	TEST_CASE_REASON("x86 hybrid event parsing", hybrid, "not hybrid"),
+ 	{ .name = NULL, }
+ };
+ 
+ struct test_suite suite__hybrid = {
+ 	.desc = "x86 hybrid",
+ 	.test_cases = hybrid_tests,
+ };
 +DEFINE_SUITE("AMD IBS via core pmu", amd_ibs_via_core_pmu);
  
  struct test_suite *arch_tests[] = {
  #ifdef HAVE_DWARF_UNWIND_SUPPORT
@@@ -36,6 -48,6 +49,7 @@@
  	&suite__bp_modify,
  #endif
  	&suite__x86_sample_parsing,
+ 	&suite__hybrid,
 +	&suite__amd_ibs_via_core_pmu,
  	NULL,
  };