From: Markus Metzger <markus.t.metzger@intel.com>
To: gdb-patches@sourceware.org, binutils@sourceware.org
Subject: [PATCH 1/2] gprofng: make cpu identification available to others
Date: Tue, 8 Nov 2022 06:45:29 +0100 [thread overview]
Message-ID: <20221108054530.796968-1-markus.t.metzger@intel.com> (raw)
I ran gprofng.display/display.exp on Fedora 36 x86-64 and I got
UNSUPPORTED: jsynprog
ERROR: comparison of results in mttest failed
UNRESOLVED: mttest
ERROR: comparison of results in mttest failed
UNRESOLVED: mttest
PASS: synprog
PASS: synprog
with and without this patch.
---
gprofng/common/hwcdrv.c | 2 +-
gprofng/common/cpuid.c => include/cpuident.h | 17 +++++++++++++----
2 files changed, 14 insertions(+), 5 deletions(-)
rename gprofng/common/cpuid.c => include/cpuident.h (96%)
diff --git a/gprofng/common/hwcdrv.c b/gprofng/common/hwcdrv.c
index 03c3a71c8e2..115638aa623 100644
--- a/gprofng/common/hwcdrv.c
+++ b/gprofng/common/hwcdrv.c
@@ -32,7 +32,7 @@
/* macros */
#define IS_GLOBAL /* Mark global symbols */
-#include "cpuid.c" /* ftns for identifying a chip */
+#include "cpuident.h" /* ftns for identifying a chip */
static hdrv_pcbe_api_t hdrv_pcbe_core_api;
static hdrv_pcbe_api_t hdrv_pcbe_opteron_api;
diff --git a/gprofng/common/cpuid.c b/include/cpuident.h
similarity index 96%
rename from gprofng/common/cpuid.c
rename to include/cpuident.h
index 211e09aa8ac..7ab6fc1f2b1 100644
--- a/gprofng/common/cpuid.c
+++ b/include/cpuident.h
@@ -18,6 +18,11 @@
Foundation, 51 Franklin Street - Fifth Floor, Boston,
MA 02110-1301, USA. */
+#ifndef _CPUIDENT_H
+#define _CPUIDENT_H
+
+#include <stdint.h>
+
#if defined(__i386__) || defined(__x86_64)
#include <cpuid.h> /* GCC-provided */
#elif defined(__aarch64__)
@@ -85,7 +90,7 @@ typedef struct
#if defined(__i386__) || defined(__x86_64)
-static uint_t
+static unsigned int
cpuid_vendorstr_to_vendorcode (char *vendorstr)
{
if (strcmp (vendorstr, X86_VENDORSTR_Intel) == 0)
@@ -101,8 +106,10 @@ my_cpuid (unsigned int op, cpuid_regs_t *regs)
{
regs->eax = regs->ebx = regs->ecx = regs->edx = 0;
int ret = __get_cpuid (op, ®s->eax, ®s->ebx, ®s->ecx, ®s->edx);
+#ifdef DBG_LT1
TprintfT (DBG_LT1, "my_cpuid: __get_cpuid(0x%x, 0x%x, 0x%x, 0x%x, 0x%x) returns %d\n",
op, regs->eax, regs->ebx, regs->ecx, regs->edx, ret);
+#endif
return ret;
}
#endif
@@ -184,20 +191,22 @@ get_cpuid_info ()
return cpi;
}
-static inline uint_t
+static inline unsigned int
cpuid_getvendor ()
{
return get_cpuid_info ()->cpi_vendor;
}
-static inline uint_t
+static inline unsigned int
cpuid_getfamily ()
{
return get_cpuid_info ()->cpi_family;
}
-static inline uint_t
+static inline unsigned int
cpuid_getmodel ()
{
return get_cpuid_info ()->cpi_model;
}
+
+#endif /* _CPUIDENT_H */
--
2.37.3
Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928
next reply other threads:[~2022-11-08 6:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-08 5:45 Markus Metzger [this message]
2022-11-08 5:45 ` [PATCH 2/2] gdb, btrace: use cpuident.h to implement btrace_this_cpu Markus Metzger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221108054530.796968-1-markus.t.metzger@intel.com \
--to=markus.t.metzger@intel.com \
--cc=binutils@sourceware.org \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).