From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3237FC04AAF for ; Sat, 18 May 2019 08:51:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 032A420872 for ; Sat, 18 May 2019 08:51:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=zytor.com header.i=@zytor.com header.b="Q+5hS98R" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729411AbfERIvX (ORCPT ); Sat, 18 May 2019 04:51:23 -0400 Received: from terminus.zytor.com ([198.137.202.136]:48237 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726451AbfERIvW (ORCPT ); Sat, 18 May 2019 04:51:22 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id x4I8pAKa1732371 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 18 May 2019 01:51:10 -0700 DKIM-Filter: OpenDKIM Filter v2.11.0 terminus.zytor.com x4I8pAKa1732371 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zytor.com; s=2019041745; t=1558169471; bh=Nq6LqO1MNEwwcI90/cveX6gdF/RX80mWpOL6K8VOhPw=; h=Date:From:Cc:Reply-To:To:Subject:From; b=Q+5hS98RcCmVvvnXVwgqnuzVEQHsPN08i3BBI2lm57T0zixRRJLGypSQoe232D3YG fp48bzTefgt58jU2RrokMJeffodmH7UpN6UwGn/soRHd8YyBrR0yRDCvi202ihwD0Z zmYOu/AyaCCW0zhFpYC6WBg9czIIdQNQ3NMGScqnzvM6RNzGN/NiVUEx6LQJYxdnUz g52X/YZlbWBdQUfQs7Rky+m5Zfda2swdZ9oCTUUwAUchtRQjuAmWib60CXjUIlAYfC ba3VM3WBdHuTbjNdrZ7KwxbK0BZWCpj4e1OzE21vIzweh/TCVFn7S1QlN9UBMvD1zr 2j5v9QlCMy6Kg== Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id x4I8pAPJ1732365; Sat, 18 May 2019 01:51:10 -0700 Date: Sat, 18 May 2019 01:51:10 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: peterz@infradead.org, adrian.hunter@intel.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, acme@redhat.com, mingo@kernel.org, alexander.shishkin@linux.intel.com, kan.liang@linux.intel.com, ak@linux.intel.com, jolsa@kernel.org, hpa@zytor.com Reply-To: kan.liang@linux.intel.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, peterz@infradead.org, adrian.hunter@intel.com, acme@redhat.com, mingo@kernel.org, tglx@linutronix.de, ak@linux.intel.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, hpa@zytor.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools x86 uapi asm: Sync the pt_regs.h copy with the kernel sources Git-Commit-ID: 0ceb5499a8001e5ddac2c8bd7b45eb4c643469ad X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 0ceb5499a8001e5ddac2c8bd7b45eb4c643469ad Gitweb: https://git.kernel.org/tip/0ceb5499a8001e5ddac2c8bd7b45eb4c643469ad Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 13 May 2019 13:35:38 -0400 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 15 May 2019 16:36:46 -0300 tools x86 uapi asm: Sync the pt_regs.h copy with the kernel sources To get the changes in: 878068ea270e ("perf/x86: Support outputting XMM registers") That will be used in a followup patch to allow users to ask for some or all of those registers to be collected in certain contatexts. This silences the following perf build warning: Warning: Kernel ABI header at 'tools/arch/x86/include/uapi/asm/perf_regs.h' differs from latest version at 'arch/x86/include/uapi/asm/perf_regs.h' diff -u tools/arch/x86/include/uapi/asm/perf_regs.h arch/x86/include/uapi/asm/perf_regs.h Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Andi Kleen Cc: Jiri Olsa Cc: Kan Liang Cc: Namhyung Kim Cc: Peter Zijlstra Link: https://lkml.kernel.org/n/tip-6pjnnrzqt3x3n2cd6br3wk7k@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/arch/x86/include/uapi/asm/perf_regs.h | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/tools/arch/x86/include/uapi/asm/perf_regs.h b/tools/arch/x86/include/uapi/asm/perf_regs.h index f3329cabce5c..ac67bbea10ca 100644 --- a/tools/arch/x86/include/uapi/asm/perf_regs.h +++ b/tools/arch/x86/include/uapi/asm/perf_regs.h @@ -27,8 +27,29 @@ enum perf_event_x86_regs { PERF_REG_X86_R13, PERF_REG_X86_R14, PERF_REG_X86_R15, - + /* These are the limits for the GPRs. */ PERF_REG_X86_32_MAX = PERF_REG_X86_GS + 1, PERF_REG_X86_64_MAX = PERF_REG_X86_R15 + 1, + + /* These all need two bits set because they are 128bit */ + PERF_REG_X86_XMM0 = 32, + PERF_REG_X86_XMM1 = 34, + PERF_REG_X86_XMM2 = 36, + PERF_REG_X86_XMM3 = 38, + PERF_REG_X86_XMM4 = 40, + PERF_REG_X86_XMM5 = 42, + PERF_REG_X86_XMM6 = 44, + PERF_REG_X86_XMM7 = 46, + PERF_REG_X86_XMM8 = 48, + PERF_REG_X86_XMM9 = 50, + PERF_REG_X86_XMM10 = 52, + PERF_REG_X86_XMM11 = 54, + PERF_REG_X86_XMM12 = 56, + PERF_REG_X86_XMM13 = 58, + PERF_REG_X86_XMM14 = 60, + PERF_REG_X86_XMM15 = 62, + + /* These include both GPRs and XMMX registers */ + PERF_REG_X86_XMM_MAX = PERF_REG_X86_XMM15 + 2, }; #endif /* _ASM_X86_PERF_REGS_H */