From patchwork Thu Feb 1 18:15:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1894153 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=WpkJuzH1; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TQnCV4SPWz23g7 for ; Fri, 2 Feb 2024 05:16:06 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7113938582A1 for ; Thu, 1 Feb 2024 18:16:04 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by sourceware.org (Postfix) with ESMTPS id 2622D3858C62 for ; Thu, 1 Feb 2024 18:15:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2622D3858C62 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2622D3858C62 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::536 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706811337; cv=none; b=W6UtJmUpvlf67eeef8pI+9Flp3g8lCCY7Ujz7TNXYbmVwnmdbc5l3kdlOYaEijwkztgMubbT/ELxIS7fDLhGDA/MsJmZfKTf9bwWZgn8HlS/HirO1FPJ91C9tZaPtKNefhqc7T5k3iN4z9RfzXmuU1kZOBsSqzU4x5tkimLarwU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706811337; c=relaxed/simple; bh=dg7qhvFClm8DebLa+PRaNitx++81HBkECsxT6oO1mSc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=alJ5t3A4e+UhAlA45OPFZeS0eFVjC/hBZNQPpPVXC1Nsu2lt4Ct3GyTAFdXYPLwohhjl9YOSBYSoYpXekfwblvP+xNoe80XqHpDPl8rMJ+zPu0EGoFqhM0oRG83Ds6KtfbVmSs1uSqF6Jv+QHA+EoCSyvGw4Bj3Qzz1JsXY2R18= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pg1-x536.google.com with SMTP id 41be03b00d2f7-5cdbc4334edso1015478a12.3 for ; Thu, 01 Feb 2024 10:15:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706811333; x=1707416133; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=ssY0h0ftdo3QXktiauKT/mQiZzjzVubiuqjblXYENcM=; b=WpkJuzH1gU1KrzEGzeR0/AX/TmF9HWaUglXnvRdtXvHZvWZFWR87nGd6htXrU6mf9K oElcmRPGefFS+xrDKpvMfSDwE7uLQCw91RlGcOUhvs926bMVHtNnet3BYaTpXHAkXWYG b3nSnZlJ4jz+XSfHRAIdHHnWmznY3FHzlt3qjypOKGkSNsRcSI7CJ+yRsag7KF/Diozo +3v0oyuaD5h32B4Boc/1GAhpTmCOub/e/YstNvQucTJstxeKSDrgXBu1lse29Zduk71Q VvE4DYkLtc0nUUGlJieG74qua7X81WwkrTvtBsSD0ojGy2EL8dEZ+nx3Gv59ICUR/O1A gMFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706811333; x=1707416133; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ssY0h0ftdo3QXktiauKT/mQiZzjzVubiuqjblXYENcM=; b=N/DuzWjr0UiUTYD7kLajrqtumC2KBQfHb/AvYUBQCHm+73dv0SIX+/62A5xpRuuk9q un4PLIZuoEHhxUX/ym3P+6wJnU9IQF5QzGAxnFLkQ+E6JWLOR49LzeULuNnj6hTK1FcI 9vH/Hpw/fdwmY77kt+MJrdqjnCPV7I0IDDg6hKriJsms0c476j8s54IJ2U+XCEEBm/gM OoJ8wSY81OGvSoSuYv1ogpxlWfKR6DOYXf6v8QcjaZnQhs9+mXAWr1wDwZ5VySiXirAe 6mqbJrdT0MQVQeI73Q8PgQqLf2iG8nDMt16suDCMcS30PSKWCXHeYx4LTXEUe2ErKgfp KSHQ== X-Gm-Message-State: AOJu0Yz6OL2WQB4khqFBtFWW4s0SY1pmD3NoSwbMEiRlIavZkO6wRB2B l7a3aAsywQ3MT6YyOoL9DlflGTX4ciBIMTHZcNghyf5QuNSwS0mCjEErJT31 X-Google-Smtp-Source: AGHT+IExHOgzbtfAKc3TwfVqyW05WEj+t0Ck8t5kz5O7BRsK2UUtnYxfOG9POThRiKdTG7ab6ruUfg== X-Received: by 2002:a17:90a:6f61:b0:295:ade7:cdf2 with SMTP id d88-20020a17090a6f6100b00295ade7cdf2mr5985205pjk.13.1706811332677; Thu, 01 Feb 2024 10:15:32 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.56.169.51]) by smtp.gmail.com with ESMTPSA id sw8-20020a17090b2c8800b0028df5c748e4sm125011pjb.44.2024.02.01.10.15.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 10:15:32 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 14C1C7400A2 for ; Thu, 1 Feb 2024 10:15:31 -0800 (PST) From: "H.J. Lu" To: gcc-patches@gcc.gnu.org Subject: [PATCH] x86-64: Find a scratch register for large model profiling Date: Thu, 1 Feb 2024 10:15:30 -0800 Message-ID: <20240201181530.99684-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3023.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org 2 scratch registers, %r10 and %r11, are available at function entry for large model profiling. But %r10 may be used by stack realignment and we can't use %r10 in this case. Add x86_64_select_profile_regnum to find a scratch register for large model profiling and sorry if we can't find one. gcc/ PR target/113689 * config/i386/i386.cc (x86_64_select_profile_regnum): New. (x86_function_profiler): Call x86_64_select_profile_regnum to get a scratch register for large model profiling. gcc/testsuite/ PR target/113689 * gcc.target/i386/pr113689-1.c: New file. * gcc.target/i386/pr113689-2.c: Likewise. * gcc.target/i386/pr113689-3.c: Likewise. * gcc.target/i386/pr98482-1.c: Updated. * gcc.target/i386/pr98482-2.c: Likewise. --- gcc/config/i386/i386.cc | 73 +++++++++++++++++----- gcc/testsuite/gcc.target/i386/pr113689-1.c | 41 ++++++++++++ gcc/testsuite/gcc.target/i386/pr113689-2.c | 32 ++++++++++ gcc/testsuite/gcc.target/i386/pr113689-3.c | 24 +++++++ gcc/testsuite/gcc.target/i386/pr98482-1.c | 4 +- gcc/testsuite/gcc.target/i386/pr98482-2.c | 2 +- 6 files changed, 158 insertions(+), 18 deletions(-) create mode 100644 gcc/testsuite/gcc.target/i386/pr113689-1.c create mode 100644 gcc/testsuite/gcc.target/i386/pr113689-2.c create mode 100644 gcc/testsuite/gcc.target/i386/pr113689-3.c diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc index b3e7c74846e..04f88a7162b 100644 --- a/gcc/config/i386/i386.cc +++ b/gcc/config/i386/i386.cc @@ -22749,6 +22749,31 @@ current_fentry_section (const char **name) return true; } +/* Return an unused caller-saved register at entry for profile. */ + +static int +x86_64_select_profile_regnum (bool r11_ok ATTRIBUTE_UNUSED) +{ + int i; + for (i = 0; i < FIRST_PSEUDO_REGISTER; i++) + if (GENERAL_REGNO_P (i) +#ifdef NO_PROFILE_COUNTERS + && (r11_ok || i != R11_REG) +#else + && i != R11_REG +#endif + && (!REX2_INT_REGNO_P (i) || TARGET_APX_EGPR) + && !fixed_regs[i] + && call_used_regs[i] + && !df_regs_ever_live_p (i)) + return i; + + sorry ("No register available for profiling %<-mcmodel=large%s%>", + ix86_cmodel == CM_LARGE_PIC ? " -fPIC" : ""); + + return INVALID_REGNUM; +} + /* Output assembler code to FILE to increment profiler label # LABELNO for profiling a function entry. */ void @@ -22783,42 +22808,60 @@ x86_function_profiler (FILE *file, int labelno ATTRIBUTE_UNUSED) fprintf (file, "\tleaq\t%sP%d(%%rip), %%r11\n", LPREFIX, labelno); #endif + int scratch; + const char *reg_prefix; + const char *reg; + if (!TARGET_PECOFF) { switch (ix86_cmodel) { case CM_LARGE: - /* NB: R10 is caller-saved. Although it can be used as a - static chain register, it is preserved when calling - mcount for nested functions. */ + scratch = x86_64_select_profile_regnum (true); + reg = hi_reg_name[scratch]; + reg_prefix = LEGACY_INT_REGNO_P (scratch) ? "r" : ""; if (ASSEMBLER_DIALECT == ASM_INTEL) - fprintf (file, "1:\tmovabs\tr10, OFFSET FLAT:%s\n" - "\tcall\tr10\n", mcount_name); + fprintf (file, + "1:\tmovabs\t%s%s, OFFSET FLAT:%s\n" + "\tcall\t%s%s\n", + reg_prefix, reg, mcount_name, reg_prefix, reg); else - fprintf (file, "1:\tmovabsq\t$%s, %%r10\n\tcall\t*%%r10\n", - mcount_name); + fprintf (file, + "1:\tmovabsq\t$%s, %%%s%s\n\tcall\t*%%%s%s\n", + mcount_name, reg_prefix, reg, reg_prefix, reg); break; case CM_LARGE_PIC: #ifdef NO_PROFILE_COUNTERS + scratch = x86_64_select_profile_regnum (false); + reg = hi_reg_name[scratch]; + reg_prefix = LEGACY_INT_REGNO_P (scratch) ? "r" : ""; if (ASSEMBLER_DIALECT == ASM_INTEL) { fprintf (file, "1:movabs\tr11, " "OFFSET FLAT:_GLOBAL_OFFSET_TABLE_-1b\n"); - fprintf (file, "\tlea\tr10, 1b[rip]\n"); - fprintf (file, "\tadd\tr10, r11\n"); + fprintf (file, "\tlea\t%s%s, 1b[rip]\n", + reg_prefix, reg); + fprintf (file, "\tadd\t%s%s, r11\n", + reg_prefix, reg); fprintf (file, "\tmovabs\tr11, OFFSET FLAT:%s@PLTOFF\n", mcount_name); - fprintf (file, "\tadd\tr10, r11\n"); - fprintf (file, "\tcall\tr10\n"); + fprintf (file, "\tadd\t%s%s, r11\n", + reg_prefix, reg); + fprintf (file, "\tcall\t%s%s\n", + reg_prefix, reg); break; } fprintf (file, "1:\tmovabsq\t$_GLOBAL_OFFSET_TABLE_-1b, %%r11\n"); - fprintf (file, "\tleaq\t1b(%%rip), %%r10\n"); - fprintf (file, "\taddq\t%%r11, %%r10\n"); + fprintf (file, "\tleaq\t1b(%%rip), %%%s%s\n", + reg_prefix, reg); + fprintf (file, "\taddq\t%%r11, %%%s%s\n", + reg_prefix, reg); fprintf (file, "\tmovabsq\t$%s@PLTOFF, %%r11\n", mcount_name); - fprintf (file, "\taddq\t%%r11, %%r10\n"); - fprintf (file, "\tcall\t*%%r10\n"); + fprintf (file, "\taddq\t%%r11, %%%s%s\n", + reg_prefix, reg); + fprintf (file, "\tcall\t*%%%s%s\n", + reg_prefix, reg); #else sorry ("profiling %<-mcmodel=large%> with PIC is not supported"); #endif diff --git a/gcc/testsuite/gcc.target/i386/pr113689-1.c b/gcc/testsuite/gcc.target/i386/pr113689-1.c new file mode 100644 index 00000000000..97c40d051db --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr113689-1.c @@ -0,0 +1,41 @@ +/* { dg-do run { target { lp64 && fpic } } } */ +/* { dg-options "-O2 -fno-pic -fprofile -mcmodel=large" } */ + +__attribute__((noipa,noclone,noinline)) +void +bar (int a1, int a2, int a3, int a4, int a5, int a6, + char *x, char *y, int *z) +{ + if (a1 != 1) + __builtin_abort (); + if (a2 != 2) + __builtin_abort (); + if (a3 != 3) + __builtin_abort (); + if (a4 != 4) + __builtin_abort (); + if (a5 != 5) + __builtin_abort (); + if (a6 != 6) + __builtin_abort (); + x[0] = 42; + y[0] = 42; + if (z[0] != 16) + __builtin_abort (); +} + +__attribute__((noipa,noclone,noinline)) +void +foo (int c, int d, int e, int f, int g, int h, int z) +{ + typedef char B[32]; + B b __attribute__((aligned (32))); + bar (c, d, e, f, g, h, &b[0], __builtin_alloca (z), &z); +} + +int +main () +{ + foo (1, 2, 3, 4, 5, 6, 16); + return 0; +} diff --git a/gcc/testsuite/gcc.target/i386/pr113689-2.c b/gcc/testsuite/gcc.target/i386/pr113689-2.c new file mode 100644 index 00000000000..b0663b9bfe6 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr113689-2.c @@ -0,0 +1,32 @@ +/* { dg-do run { target { lp64 && fpic } } } */ +/* { dg-options "-O2 -fpic -fprofile -mcmodel=large" } */ + +__attribute__((noipa,noclone,noinline)) +void +bar (int a1, int a2, char *x, char *y, int *z) +{ + if (a1 != 1) + __builtin_abort (); + if (a2 != 2) + __builtin_abort (); + x[0] = 42; + y[0] = 42; + if (z[0] != 16) + __builtin_abort (); +} + +__attribute__((noipa,noclone,noinline)) +void +foo (int c, int d, int e, int f, int g, int h, int z) +{ + typedef char B[32]; + B b __attribute__((aligned (32))); + bar (c, d, &b[0], __builtin_alloca (z), &z); +} + +int +main () +{ + foo (1, 2, 3, 4, 5, 6, 16); + return 0; +} diff --git a/gcc/testsuite/gcc.target/i386/pr113689-3.c b/gcc/testsuite/gcc.target/i386/pr113689-3.c new file mode 100644 index 00000000000..10099fc8d96 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr113689-3.c @@ -0,0 +1,24 @@ +/* { dg-do run { target { lp64 && avx_runtime } } } */ +/* { dg-options "-O2 -fprofile -mcmodel=large -mavx" } */ + +__attribute__((noipa,noclone,noinline)) +_BitInt(511) +foo(_BitInt(7) a, _BitInt(511) b) +{ + ({ + volatile _BitInt(511) d = (-b / a); + if (d != -1) + __builtin_abort(); + d; + }); + return b; +} + +int +main(void) +{ + _BitInt(511) x = foo(5, 5); + if (x != 5) + __builtin_abort(); + return 0; +} diff --git a/gcc/testsuite/gcc.target/i386/pr98482-1.c b/gcc/testsuite/gcc.target/i386/pr98482-1.c index b1d9619275e..ccf068eef5b 100644 --- a/gcc/testsuite/gcc.target/i386/pr98482-1.c +++ b/gcc/testsuite/gcc.target/i386/pr98482-1.c @@ -1,8 +1,8 @@ /* { dg-do compile { target { *-*-linux* && lp64 } } } */ /* { dg-require-effective-target mfentry } */ /* { dg-options "-fprofile -mfentry -O2 -mcmodel=large" } */ -/* { dg-final { scan-assembler "movabsq\t\\\$__fentry__, %r10\n\tcall\t\\*%r10" { target nonpic } } } */ -/* { dg-final { scan-assembler "movabsq\t\\\$__fentry__@PLTOFF, %r11\n\taddq\t%r11, %r10\n\tcall\t\\*%r10" { target { ! nonpic } } } } */ +/* { dg-final { scan-assembler "movabsq\t\\\$__fentry__, %rax\n\tcall\t\\*%rax" { target nonpic } } } */ +/* { dg-final { scan-assembler "movabsq\t\\\$__fentry__@PLTOFF, %r11\n\taddq\t%r11, %rdx\n\tcall\t\\*%rax" { target { ! nonpic } } } } */ void func (void) diff --git a/gcc/testsuite/gcc.target/i386/pr98482-2.c b/gcc/testsuite/gcc.target/i386/pr98482-2.c index 03c62a4b67b..7220445ce7f 100644 --- a/gcc/testsuite/gcc.target/i386/pr98482-2.c +++ b/gcc/testsuite/gcc.target/i386/pr98482-2.c @@ -2,7 +2,7 @@ /* { dg-require-effective-target mfentry } */ /* { dg-require-effective-target fpic } */ /* { dg-options "-fpic -fprofile -mfentry -O2 -mcmodel=large" } */ -/* { dg-final { scan-assembler "movabsq\t\\\$__fentry__@PLTOFF, %r11\n\taddq\t%r11, %r10\n\tcall\t\\*%r10" } } */ +/* { dg-final { scan-assembler "movabsq\t\\\$__fentry__@PLTOFF, %r11\n\taddq\t%r11, %rdx\n\tcall\t\\*%rdx" } } */ void func (void)