From patchwork Mon Oct 14 21:33:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rong Xu X-Patchwork-Id: 13835516 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1AC3A1D5AC9 for ; Mon, 14 Oct 2024 21:33:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728941636; cv=none; b=NZHgE7y+fU84Ry6cJN0n7LIGeK7x4jhsAvi1qoTi7xAkpMdqY++2Wv+RMepEfNYvXQQfudfs8Flrv0ouNozvodGk4wxXEPGWe5bHFQ3v9IjidlRxwJPexm+B9xuMjTcwXT8prqfzn+EeNkvapL090/ScpSSG0dyH4x5+uUtoE2I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728941636; c=relaxed/simple; bh=zVodnoYgNm1DYBK5hKpuTtqHMKwNmjLuCknrbH33Aow=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=vCiDJ9bsj/HVOVqH6lZ/u2/+FUMh/aiDQasb4oGJcqdA/ywxR0n5JdfznOR2/dMRf9iImEOm6i+r2nACm7dJljdFPkDUESif4ksTtsFa2Pd2YChEnSbHEeD2HAjpoBY8C+WPuIvq0NOTVwliaj8RhDUPiJjGcjmBNFktQaQ+S7s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--xur.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=bJ1WtJXD; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--xur.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="bJ1WtJXD" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6e2e5e376fcso90873117b3.2 for ; Mon, 14 Oct 2024 14:33:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1728941632; x=1729546432; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=bXvfnp7Z+BLB7t8cyHpKNDqx6J3lf8zmPrAsIDA7Ieo=; b=bJ1WtJXDKmMLh4FfKnuiY7sJ9rbAQK+NwWxrBaj/GgsQZzIjF05NPMkt/8RJXarxz0 YwQre2Tnog3MwN+7lHJjuEdX34t0YhUz6uJq4ng/xBtk1EaBfhvnihx48STSOuy++W9A oPDvjoYaDF2zTi/YKWowaeX9uZCFOAIr4KFOcoWQFEMJkNK2hSYkbK9a67Nhc6RgxpSs SJSPlWvDq2v8XSLTqjZkEW9EXUsDwAGvaV8eAOD3xTRq7e3Nx5eo/ARCaFjI59C2FQti 084wYUYtwd7Rm02YB4Q4IBUjx2ySYUmH5OKeyLy0wZgPPnQCX7MUd0At29vku0DF65iW qP9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728941632; x=1729546432; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=bXvfnp7Z+BLB7t8cyHpKNDqx6J3lf8zmPrAsIDA7Ieo=; b=qZ4rwhkLZbLlU8lhXmNQiYVY/OK4CSKsQjc6nnYYUDdM9EHBjA+1lUTN06ZEQsVRMh 3z7q16lipdssoacwrD5k60X5n1aM6jKJTmKzrefUVL7EpF3RXPVjUbsNeB+0Abbh6gM6 r1XiznTeBel6BQYpPaPvZh62bPFtSMg+HhDHu5i+50YV9kFv2VxCt45l/0Xf6vBhlDub mz1blCNvqVbA8mq+Ya1Qz2aFPdr6a3Kwvh3zhSbyePmBsvyPWOZCo/1kixQmpQGd4VD1 /qR998tKbQ6T5FiFLjEBB/8WzCEZFDaqBWNyTSLu7FAyMMiqugDu0zvWDfJHo6aDkYIg WraQ== X-Forwarded-Encrypted: i=1; AJvYcCXNF9OaPLcBkVGTLUHjaAxJ/S3mySUYPxB4Rn3gVQurqoloMvYdWyKap5OpmeKGh9jUOB2DtnGErZjK7rg=@vger.kernel.org X-Gm-Message-State: AOJu0YzByfggYZPSV49bYf8Nz8A7QcV0C8ecI/FKYG/wVxFoTKSM6tXt 71bnQ4aDu5UmceD0VHlusDzTS7PL5Pf1G3/BnmuEC5rODtQRSLXjmg7YKHDJ40KorA== X-Google-Smtp-Source: AGHT+IFQWnw3ZdOqgZWAMJxktqzpq9SRiWxugma9YUkwUzna4spoduXnzDxe4alvNWAtDsGot17nUE8= X-Received: from xur.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:2330]) (user=xur job=sendgmr) by 2002:a05:690c:670e:b0:6e3:19d7:382a with SMTP id 00721157ae682-6e3477c0764mr2100477b3.1.1728941632207; Mon, 14 Oct 2024 14:33:52 -0700 (PDT) Date: Mon, 14 Oct 2024 14:33:38 -0700 In-Reply-To: <20241014213342.1480681-1-xur@google.com> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241014213342.1480681-1-xur@google.com> X-Mailer: git-send-email 2.47.0.rc1.288.g06298d1525-goog Message-ID: <20241014213342.1480681-5-xur@google.com> Subject: [PATCH v4 4/6] AutoFDO: Enable -ffunction-sections for the AutoFDO build From: Rong Xu To: Alice Ryhl , Andrew Morton , Arnd Bergmann , Bill Wendling , Borislav Petkov , Breno Leitao , Brian Gerst , Dave Hansen , David Li , Han Shen , Heiko Carstens , "H. Peter Anvin" , Ingo Molnar , Jann Horn , Jonathan Corbet , Josh Poimboeuf , Juergen Gross , Justin Stitt , Kees Cook , Masahiro Yamada , "Mike Rapoport (IBM)" , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , "Paul E. McKenney" , Peter Zijlstra , Rong Xu , Sami Tolvanen , Thomas Gleixner , Wei Yang , workflows@vger.kernel.org, Miguel Ojeda , Maksim Panchenko Cc: x86@kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev, Sriraman Tallam Enable -ffunction-sections by default for the AutoFDO build. With -ffunction-sections, the compiler places each function in its own section named .text.function_name instead of placing all functions in the .text section. In the AutoFDO build, this allows the linker to utilize profile information to reorganize functions for improved utilization of iCache and iTLB. Co-developed-by: Han Shen Signed-off-by: Han Shen Signed-off-by: Rong Xu Suggested-by: Sriraman Tallam --- include/asm-generic/vmlinux.lds.h | 37 ++++++++++++++++++++++++------- scripts/Makefile.autofdo | 2 +- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 5df589c60401..ace617d1af9b 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -95,18 +95,25 @@ * With LTO_CLANG, the linker also splits sections by default, so we need * these macros to combine the sections during the final link. * + * With LTO_CLANG, the linker also splits sections by default, so we need + * these macros to combine the sections during the final link. + * * RODATA_MAIN is not used because existing code already defines .rodata.x * sections to be brought in with rodata. */ -#if defined(CONFIG_LD_DEAD_CODE_DATA_ELIMINATION) || defined(CONFIG_LTO_CLANG) +#if defined(CONFIG_LD_DEAD_CODE_DATA_ELIMINATION) || defined(CONFIG_LTO_CLANG) || \ +defined(CONFIG_AUTOFDO_CLANG) #define TEXT_MAIN .text .text.[0-9a-zA-Z_]* +#else +#define TEXT_MAIN .text +#endif +#if defined(CONFIG_LD_DEAD_CODE_DATA_ELIMINATION) || defined(CONFIG_LTO_CLANG) #define DATA_MAIN .data .data.[0-9a-zA-Z_]* .data..L* .data..compoundliteral* .data.$__unnamed_* .data.$L* #define SDATA_MAIN .sdata .sdata.[0-9a-zA-Z_]* #define RODATA_MAIN .rodata .rodata.[0-9a-zA-Z_]* .rodata..L* #define BSS_MAIN .bss .bss.[0-9a-zA-Z_]* .bss..L* .bss..compoundliteral* #define SBSS_MAIN .sbss .sbss.[0-9a-zA-Z_]* #else -#define TEXT_MAIN .text #define DATA_MAIN .data #define SDATA_MAIN .sdata #define RODATA_MAIN .rodata @@ -549,6 +556,20 @@ __cpuidle_text_end = .; \ __noinstr_text_end = .; +#ifdef CONFIG_AUTOFDO_CLANG +#define TEXT_HOT \ + __hot_text_start = .; \ + *(.text.hot .text.hot.*) \ + __hot_text_end = .; +#define TEXT_UNLIKELY \ + __unlikely_text_start = .; \ + *(.text.unlikely .text.unlikely.*) \ + __unlikely_text_end = .; +#else +#define TEXT_HOT *(.text.hot .text.hot.*) +#define TEXT_UNLIKELY *(.text.unlikely .text.unlikely.*) +#endif + /* * .text section. Map to function alignment to avoid address changes * during second ld run in second ld pass when generating System.map @@ -557,30 +578,30 @@ * code elimination or function-section is enabled. Match these symbols * first when in these builds. */ -#if defined(CONFIG_LD_DEAD_CODE_DATA_ELIMINATION) || defined(CONFIG_LTO_CLANG) +#if defined(CONFIG_LD_DEAD_CODE_DATA_ELIMINATION) || defined(CONFIG_LTO_CLANG) || \ +defined(CONFIG_AUTOFDO_CLANG) #define TEXT_TEXT \ ALIGN_FUNCTION(); \ *(.text.asan.* .text.tsan.*) \ *(.text.unknown .text.unknown.*) \ - *(.text.unlikely .text.unlikely.*) \ + TEXT_UNLIKELY \ . = ALIGN(PAGE_SIZE); \ - *(.text.hot .text.hot.*) \ + TEXT_HOT \ *(TEXT_MAIN .text.fixup) \ NOINSTR_TEXT \ *(.ref.text) #else #define TEXT_TEXT \ ALIGN_FUNCTION(); \ - *(.text.hot .text.hot.*) \ + TEXT_HOT \ *(TEXT_MAIN .text.fixup) \ - *(.text.unlikely .text.unlikely.*) \ + TEXT_UNLIKELY \ *(.text.unknown .text.unknown.*) \ NOINSTR_TEXT \ *(.ref.text) \ *(.text.asan.* .text.tsan.*) #endif - /* sched.text is aling to function alignment to secure we have same * address even at second ld pass when generating System.map */ #define SCHED_TEXT \ diff --git a/scripts/Makefile.autofdo b/scripts/Makefile.autofdo index 1c9f224bc221..9c9a530ef090 100644 --- a/scripts/Makefile.autofdo +++ b/scripts/Makefile.autofdo @@ -10,7 +10,7 @@ ifndef CONFIG_DEBUG_INFO endif ifdef CLANG_AUTOFDO_PROFILE - CFLAGS_AUTOFDO_CLANG += -fprofile-sample-use=$(CLANG_AUTOFDO_PROFILE) + CFLAGS_AUTOFDO_CLANG += -fprofile-sample-use=$(CLANG_AUTOFDO_PROFILE) -ffunction-sections endif ifdef CONFIG_LTO_CLANG_THIN