From patchwork Mon Feb 5 16:43:29 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: 1895307 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=j3RdtORw; 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 4TTBzM2Pw4z1yhq for ; Tue, 6 Feb 2024 03:43:57 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7A97C385802A for ; Mon, 5 Feb 2024 16:43:55 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by sourceware.org (Postfix) with ESMTPS id D85593858D1E for ; Mon, 5 Feb 2024 16:43:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D85593858D1E 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 D85593858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::52c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707151418; cv=none; b=djIsYPuz8Pn/USnGe2hr++zkIfGzVZ9sbka1pc8DZuwwluqGKb48TJHfTB2WUocsBRTUoAM816D8sWV6r9Bt9vmuqJv4KVkX3y95HeCQ6q0JGBoZ9+BV14vi7iozURfb0Px3xaGOXZzZCMSgiTr6GcpJZDqEqJYXg0wKZVkX4Zw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707151418; c=relaxed/simple; bh=rs49Q8of1cr4+7JZob2bSd9L7zqoxJvqItK++ILO44I=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=sfirOrLJXeuHL2ronaj5Rc5U+keiPMHRpqbOEQRpwHTNV5rAp+KinNeZenvCv37gMc1fzaw6cYBnD5noB6Ga4qiJjbYoPE8yalq1tBq22o1sMG1Lup1NRjKmtInp56gzoJSq084SJMHm1qt6aHKDbO4PU7DWd8426kwgXzSi88o= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pg1-x52c.google.com with SMTP id 41be03b00d2f7-53fa455cd94so3465209a12.2 for ; Mon, 05 Feb 2024 08:43:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707151412; x=1707756212; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=eqye0uCQEw9hvcQcJhg3qSayH5LWHtnzVl/Zp6P5O+k=; b=j3RdtORwmWifew3B0AwUQtOy5hFbTqSNWHs23GIcmSXpSCJEo0l3zxrIFmPs/PsTOr /7kM2+KqJUno2FLZSt9Zl8dWJCfGYwwWi5gB75n7qA1jN2Uwbhhnf/f2hM29hvrAlNEK W35nTHQKQKyUphmXhA6NG/3E/+PSLBBSGtnL2qyitYcDFJjw0+z4/MWQ+VhpLr5FGVbV 9H6b2Km/CN8YkxouEgWN05YpyPuQwecWdsJL3xFHU0ugVkixBlF5CVdGjjyZoj56Td2m oa0+bTrIjXLq+9ZzBLF7t/R9sBopUEl4XYaRQFEHDRHmMx2qjwQDmaBdM88skDTFUz3K gQaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707151412; x=1707756212; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=eqye0uCQEw9hvcQcJhg3qSayH5LWHtnzVl/Zp6P5O+k=; b=WlHeUpSZKkBm5wfXNLG/7Ejx3+b83angkW8wiKQQZzp+NCvKHrIvXvYqmyXnEXvPHN +B5fdcAjs3mP6lcN/utj2WX5HzFuIPPgfm66+irthQPXjbR8cbJsn65wyXDFKIZ3P16T Temhjas5SRydaxaUv68FCzp+vijho/mUamcBP0Tds9cMsS5etI/SX81iydNiWFrFVo0X NeDTjsMmKMsXhyDW2gHS2vn1oaHrnudgY0O6lgkgm5lXyN/qHKOx/uBQJt6QiI+4XLpm PEyb7Kx/pn8fgEHCUgF2H89yQOU28hd2vFDuSQRLgvxXTum5MloNiLl1e5q53nRujpN6 KmQQ== X-Gm-Message-State: AOJu0Ywqf60B8YniJrP0N3DoWp6q2yfjsT5Xo3kuL2KhY9XzYXKGdN5i ruvS8ZPoiIIXYddn0vjLGKloQaCfbNqOCcvhSjeQVeN0+ROPubGmNNsu1TMG X-Google-Smtp-Source: AGHT+IEww/95wPcdyngb4C1YSRSPm16didFehb8Ir/TNt4uZicm+50LkjnCdIBmPCGLY0TaOhAbEbQ== X-Received: by 2002:a17:90b:1017:b0:296:65c5:d69b with SMTP id gm23-20020a17090b101700b0029665c5d69bmr4611863pjb.6.1707151412281; Mon, 05 Feb 2024 08:43:32 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCVCwBwHj7oiQ0PWH+Uw1j+cHqoZpk0lqUfrzk+UjbVv+FArTvFDihf/nd8VdkSKjPhtXtmib44bb5vPRAtga++TVEqM298E5MzBKbeyzwBkdHZomgil8i4= Received: from gnu-cfl-3.localdomain ([172.56.168.224]) by smtp.gmail.com with ESMTPSA id s30-20020a17090a69a100b002964142cb06sm6067074pjj.11.2024.02.05.08.43.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 08:43:31 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id D91F2740164; Mon, 5 Feb 2024 08:43:29 -0800 (PST) From: "H.J. Lu" To: gcc-patches@gcc.gnu.org Cc: ubizjak@gmail.com, jakub@redhat.com, rep.dot.nop@gmail.com Subject: [PATCH v6] x86-64: Find a scratch register for large model profiling Date: Mon, 5 Feb 2024 08:43:29 -0800 Message-ID: <20240205164329.60300-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3023.8 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 Changes in v6: 1. Use ix86_save_reg and accessible_reg_set in x86_64_select_profile_regnum. 2. Construct a complete reg name in x86_function_profiler. Changes in v5: 1. Add pr113689-3.c. 2. Use %r10 if ix86_profile_before_prologue () return true. 3. Try a callee-saved register which has been saved on stack in the prologue. Changes in v4: 1. Remove pr113689-3.c. 2. Use df_get_live_out. Changes in v3: 1. Remove r10_ok. Changes in v2: 1. Add int_parameter_registers to machine_function to track integer registers used for parameter passing. 2. Update x86_64_select_profile_regnum to try %r10 first and use an caller-saved register, which isn't used for parameter passing. --- 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 caller-saved register which isn't live or a callee-saved register which has been saved on stack in the prologue at entry 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/config/i386/i386.cc | 91 ++++++++++++++++++---- gcc/testsuite/gcc.target/i386/pr113689-1.c | 49 ++++++++++++ gcc/testsuite/gcc.target/i386/pr113689-2.c | 41 ++++++++++ gcc/testsuite/gcc.target/i386/pr113689-3.c | 48 ++++++++++++ 4 files changed, 214 insertions(+), 15 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..08aad32af85 100644 --- a/gcc/config/i386/i386.cc +++ b/gcc/config/i386/i386.cc @@ -22749,6 +22749,48 @@ current_fentry_section (const char **name) return true; } +/* Return a caller-saved register which isn't live or a callee-saved + register which has been saved on stack in the prologue at entry for + profile. */ + +static int +x86_64_select_profile_regnum (bool r11_ok ATTRIBUTE_UNUSED) +{ + /* Use %r10 if the profiler is emitted before the prologue or it isn't + used by DRAP. */ + if (ix86_profile_before_prologue () + || !crtl->drap_reg + || REGNO (crtl->drap_reg) != R10_REG) + return R10_REG; + + /* The profiler is emitted after the prologue. If there is a + caller-saved register which isn't live or a callee-saved + register saved on stack in the prologue, use it. */ + + bitmap reg_live = df_get_live_out (ENTRY_BLOCK_PTR_FOR_FN (cfun)); + + int i; + for (i = 0; i < FIRST_PSEUDO_REGISTER; i++) + if (GENERAL_REGNO_P (i) + && i != R10_REG +#ifdef NO_PROFILE_COUNTERS + && (r11_ok || i != R11_REG) +#else + && i != R11_REG +#endif + && TEST_HARD_REG_BIT (accessible_reg_set, i) + && !fixed_regs[i] + && (ix86_save_reg (i, true, true) + || (call_used_regs[i] + && !REGNO_REG_SET_P (reg_live, 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 +22825,61 @@ 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; + char legacy_reg[4] = { 0 }; + 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]; + if (LEGACY_INT_REGNO_P (scratch)) + { + legacy_reg[0] = 'r'; + legacy_reg[1] = reg[0]; + legacy_reg[2] = reg[1]; + reg = legacy_reg; + } 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, OFFSET FLAT:%s\n" + "\tcall\t%s\n", reg, mcount_name, reg); else - fprintf (file, "1:\tmovabsq\t$%s, %%r10\n\tcall\t*%%r10\n", - mcount_name); + fprintf (file, "1:\tmovabsq\t$%s, %%%s\n\tcall\t*%%%s\n", + mcount_name, reg, reg); break; case CM_LARGE_PIC: #ifdef NO_PROFILE_COUNTERS + scratch = x86_64_select_profile_regnum (false); + reg = hi_reg_name[scratch]; + if (LEGACY_INT_REGNO_P (scratch)) + { + legacy_reg[0] = 'r'; + legacy_reg[1] = reg[0]; + legacy_reg[2] = reg[1]; + reg = legacy_reg; + } 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, 1b[rip]\n", reg); + fprintf (file, "\tadd\t%s, r11\n", 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, r11\n", reg); + fprintf (file, "\tcall\t%s\n", 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\n", reg); + fprintf (file, "\taddq\t%%r11, %%%s\n", 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\n", reg); + fprintf (file, "\tcall\t*%%%s\n", 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..8285c0a07b7 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr113689-1.c @@ -0,0 +1,49 @@ +/* { dg-do run { target { lp64 && fpic } } } */ +/* { dg-options "-O2 -fno-pic -fprofile -mcmodel=large" } */ + +#include + +__attribute__((noipa)) +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)) +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))); + va_list ap; + va_start (ap, z); + double x = va_arg (ap, double); + if (x > 40.0) + __builtin_abort (); + bar (c, d, e, f, g, h, &b[0], __builtin_alloca (z), &z); + va_end (ap); +} + +int +main () +{ + foo (1, 2, 3, 4, 5, 6, 16, 38.0); + 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..2e5579ac546 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr113689-2.c @@ -0,0 +1,41 @@ +/* { dg-do run { target { lp64 && fpic } } } */ +/* { dg-options "-O2 -fpic -fprofile -mcmodel=large" } */ + +__attribute__((noipa)) +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)) +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-3.c b/gcc/testsuite/gcc.target/i386/pr113689-3.c new file mode 100644 index 00000000000..dab75190635 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr113689-3.c @@ -0,0 +1,48 @@ +/* { dg-do run { target { lp64 && fpic } } } */ +/* { dg-options "-O2 -fpic -fprofile -mcmodel=large" } */ + +#include + +__attribute__((noipa)) +void +bar (char *x, char *y, int *z) +{ + x[0] = 42; + y[0] = 42; + if (z[0] != 16) + __builtin_abort (); +} + +__attribute__((noipa)) +void +foo (int a1, int a2, int a3, int a4, int a5, int a6, int z, ...) +{ + typedef char B[32]; + B b __attribute__((aligned (32))); + va_list ap; + va_start (ap, z); + double x = va_arg (ap, double); + if (x > 40.0) + __builtin_abort (); + 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 (); + bar (&b[0], __builtin_alloca (z), &z); + va_end (ap); +} + +int +main () +{ + foo (1, 2, 3, 4, 5, 6, 16, 38.0); + return 0; +}