[llvm-branch-commits] [clang] [Clang][CodeGen] Move AllocToken pass to backend LTO phases (PR #169360)

[Marco Elver via llvm-branch-commits]

https://github.com/melver updated https://github.com/llvm/llvm-project/pull/169360

>From 3c13dc3871b39304144d2ac3da7498d3d8cec495 Mon Sep 17 00:00:00 2001
From: Marco Elver <elver at google.com>
Date: Mon, 24 Nov 2025 17:44:32 +0100
Subject: [PATCH 1/3] fix formatting

Created using spr 1.3.8-beta.1
---
 clang/lib/Driver/ToolChains/CommonArgs.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
index e889061ee619a..8ea84c72b6a2e 100644
--- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -1393,11 +1393,11 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args,
     CmdArgs.push_back(Args.MakeArgString(Twine(PluginOptPrefix) +
                                          "-lto-alloc-token-mode=" + Mode));
     if (Args.hasArg(options::OPT_fsanitize_alloc_token_fast_abi))
-      CmdArgs.push_back(Args.MakeArgString(Twine(PluginOptPrefix) +
-                                           "-alloc-token-fast-abi"));
+      CmdArgs.push_back(
+          Args.MakeArgString(Twine(PluginOptPrefix) + "-alloc-token-fast-abi"));
     if (Args.hasArg(options::OPT_fsanitize_alloc_token_extended))
-      CmdArgs.push_back(Args.MakeArgString(Twine(PluginOptPrefix) +
-                                           "-alloc-token-extended"));
+      CmdArgs.push_back(
+          Args.MakeArgString(Twine(PluginOptPrefix) + "-alloc-token-extended"));
     if (Arg *A = Args.getLastArg(options::OPT_falloc_token_max_EQ))
       CmdArgs.push_back(Args.MakeArgString(
           Twine(PluginOptPrefix) + "-alloc-token-max=" + A->getValue()));

>From 6b9019feb927c575af2c84ec98e79c1c40e6f95a Mon Sep 17 00:00:00 2001
From: Marco Elver <elver at google.com>
Date: Wed, 26 Nov 2025 18:04:08 +0100
Subject: [PATCH 2/3] fix test

Created using spr 1.3.8-beta.1
---
 clang/test/CodeGen/distributed-thin-lto/memprof-pgho.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clang/test/CodeGen/distributed-thin-lto/memprof-pgho.cpp b/clang/test/CodeGen/distributed-thin-lto/memprof-pgho.cpp
index 148d51eefe07e..0578bdb3761dd 100644
--- a/clang/test/CodeGen/distributed-thin-lto/memprof-pgho.cpp
+++ b/clang/test/CodeGen/distributed-thin-lto/memprof-pgho.cpp
@@ -4,12 +4,12 @@
 // RUN: split-file %s %t
 // RUN: llvm-profdata merge %t/memprof.yaml -o %t/use.memprofdata
 //
-// RUN: %clangxx -O2 -flto=thin -g -fmemory-profile-use=%t/use.memprofdata %t/src.cpp -c -o %t.o
+// RUN: %clangxx --target=x86_64-linux-gnu -O2 -flto=thin -g -fmemory-profile-use=%t/use.memprofdata %t/src.cpp -c -o %t.o
 // RUN: llvm-lto2 run %t.o -thinlto-distributed-indexes -supports-hot-cold-new -r=%t.o,main,plx -r=%t.o,_Z3foov,plx -r=%t.o,_Znam, -o %t.out
 // RUN: %clang_cc1 -O1 -x ir %t.o -fthinlto-index=%t.o.thinlto.bc -mllvm -optimize-hot-cold-new -emit-llvm -o - 2>&1 | FileCheck %s --check-prefixes=CHECK,DEFAULT
 // RUN: %clang_cc1 -O2 -x ir %t.o -fthinlto-index=%t.o.thinlto.bc -mllvm -optimize-hot-cold-new -emit-llvm -o - 2>&1 | FileCheck %s --check-prefixes=CHECK,DEFAULT
 //
-// RUN: %clangxx -O2 -flto=thin -g -fsanitize=alloc-token -falloc-token-max=32 -fmemory-profile-use=%t/use.memprofdata %t/src.cpp -c -o %t.o
+// RUN: %clangxx --target=x86_64-linux-gnu -O2 -flto=thin -g -fsanitize=alloc-token -falloc-token-max=32 -fmemory-profile-use=%t/use.memprofdata %t/src.cpp -c -o %t.o
 // RUN: llvm-lto2 run %t.o -thinlto-distributed-indexes -supports-hot-cold-new -r=%t.o,main,plx -r=%t.o,_Z3foov,plx -r=%t.o,_Znam, -o %t.out
 // RUN: %clang_cc1 -O1 -x ir %t.o -fsanitize=alloc-token -fthinlto-index=%t.o.thinlto.bc -mllvm -optimize-hot-cold-new -emit-llvm -o - 2>&1 | FileCheck %s --check-prefixes=CHECK,ALLOCTOKEN
 // RUN: %clang_cc1 -O2 -x ir %t.o -fsanitize=alloc-token -fthinlto-index=%t.o.thinlto.bc -mllvm -optimize-hot-cold-new -emit-llvm -o - 2>&1 | FileCheck %s --check-prefixes=CHECK,ALLOCTOKEN

>From 20ca813dbb903def50058a6b2b2b1885ca38abf0 Mon Sep 17 00:00:00 2001
From: Marco Elver <elver at google.com>
Date: Wed, 26 Nov 2025 18:54:52 +0100
Subject: [PATCH 3/3] fix test

Created using spr 1.3.8-beta.1
---
 clang/test/CodeGen/distributed-thin-lto/memprof-pgho.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/clang/test/CodeGen/distributed-thin-lto/memprof-pgho.cpp b/clang/test/CodeGen/distributed-thin-lto/memprof-pgho.cpp
index 0578bdb3761dd..ed05962846aff 100644
--- a/clang/test/CodeGen/distributed-thin-lto/memprof-pgho.cpp
+++ b/clang/test/CodeGen/distributed-thin-lto/memprof-pgho.cpp
@@ -6,13 +6,13 @@
 //
 // RUN: %clangxx --target=x86_64-linux-gnu -O2 -flto=thin -g -fmemory-profile-use=%t/use.memprofdata %t/src.cpp -c -o %t.o
 // RUN: llvm-lto2 run %t.o -thinlto-distributed-indexes -supports-hot-cold-new -r=%t.o,main,plx -r=%t.o,_Z3foov,plx -r=%t.o,_Znam, -o %t.out
-// RUN: %clang_cc1 -O1 -x ir %t.o -fthinlto-index=%t.o.thinlto.bc -mllvm -optimize-hot-cold-new -emit-llvm -o - 2>&1 | FileCheck %s --check-prefixes=CHECK,DEFAULT
-// RUN: %clang_cc1 -O2 -x ir %t.o -fthinlto-index=%t.o.thinlto.bc -mllvm -optimize-hot-cold-new -emit-llvm -o - 2>&1 | FileCheck %s --check-prefixes=CHECK,DEFAULT
+// RUN: %clang_cc1 -triple x86_64-linux-gnu -O1 -x ir %t.o -fthinlto-index=%t.o.thinlto.bc -mllvm -optimize-hot-cold-new -emit-llvm -o - 2>&1 | FileCheck %s --check-prefixes=CHECK,DEFAULT
+// RUN: %clang_cc1 -triple x86_64-linux-gnu -O2 -x ir %t.o -fthinlto-index=%t.o.thinlto.bc -mllvm -optimize-hot-cold-new -emit-llvm -o - 2>&1 | FileCheck %s --check-prefixes=CHECK,DEFAULT
 //
 // RUN: %clangxx --target=x86_64-linux-gnu -O2 -flto=thin -g -fsanitize=alloc-token -falloc-token-max=32 -fmemory-profile-use=%t/use.memprofdata %t/src.cpp -c -o %t.o
 // RUN: llvm-lto2 run %t.o -thinlto-distributed-indexes -supports-hot-cold-new -r=%t.o,main,plx -r=%t.o,_Z3foov,plx -r=%t.o,_Znam, -o %t.out
-// RUN: %clang_cc1 -O1 -x ir %t.o -fsanitize=alloc-token -fthinlto-index=%t.o.thinlto.bc -mllvm -optimize-hot-cold-new -emit-llvm -o - 2>&1 | FileCheck %s --check-prefixes=CHECK,ALLOCTOKEN
-// RUN: %clang_cc1 -O2 -x ir %t.o -fsanitize=alloc-token -fthinlto-index=%t.o.thinlto.bc -mllvm -optimize-hot-cold-new -emit-llvm -o - 2>&1 | FileCheck %s --check-prefixes=CHECK,ALLOCTOKEN
+// RUN: %clang_cc1 -triple x86_64-linux-gnu -O1 -x ir %t.o -fsanitize=alloc-token -fthinlto-index=%t.o.thinlto.bc -mllvm -optimize-hot-cold-new -emit-llvm -o - 2>&1 | FileCheck %s --check-prefixes=CHECK,ALLOCTOKEN
+// RUN: %clang_cc1 -triple x86_64-linux-gnu -O2 -x ir %t.o -fsanitize=alloc-token -fthinlto-index=%t.o.thinlto.bc -mllvm -optimize-hot-cold-new -emit-llvm -o - 2>&1 | FileCheck %s --check-prefixes=CHECK,ALLOCTOKEN
 
 //--- memprof.yaml
 ---