Skip to content

Commit 74e4694

Browse files
DataCorruptedDataCorrupted
authored
[LTO] enable ObjCARCContractPass only on optimized build (#101114)
\#92331 tried to make `ObjCARCContractPass` by default, but it caused a regression on O0 builds and was reverted. This patch trys to bring that back by: 1. reverts the [revert](1579e9c). 2. `createObjCARCContractPass` only on optimized builds. Tests are updated to refelect the changes. Specifically, all `O0` tests should not include `ObjCARCContractPass` Signed-off-by: Peter Rong <[email protected]>
1 parent 35f55f5 commit 74e4694

File tree

16 files changed

+98
-41
lines changed

16 files changed

+98
-41
lines changed

‎clang/lib/CodeGen/BackendUtil.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -588,12 +588,6 @@ bool EmitAssemblyHelper::AddEmitPasses(legacy::PassManager &CodeGenPasses,
588588
// this also adds codegenerator level optimization passes.
589589
CodeGenFileType CGFT = getCodeGenFileType(Action);
590590

591-
// Add ObjC ARC final-cleanup optimizations. This is done as part of the
592-
// "codegen" passes so that it isn't run multiple times when there is
593-
// inlining happening.
594-
if (CodeGenOpts.OptimizationLevel > 0)
595-
CodeGenPasses.add(createObjCARCContractPass());
596-
597591
if (TM->addPassesToEmitFile(CodeGenPasses, OS, DwoOS, CGFT,
598592
/*DisableVerify=*/!CodeGenOpts.VerifyModule)) {
599593
Diags.Report(diag::err_fe_unable_to_interface_with_target);

‎clang/test/CodeGen/thinlto-distributed-objc-contract-pass.ll

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
; RUN: opt -thinlto-bc -o %t.o %s
2+
3+
; RUN: llvm-lto2 run -thinlto-distributed-indexes %t.o \
4+
; RUN: -o %t2.index \
5+
; RUN: -r=%t.o,_use_arc,px
6+
7+
; RUN: %clang_cc1 -O2 -triple x86_64-apple-darwin \
8+
; RUN: -emit-obj -fthinlto-index=%t.o.thinlto.bc \
9+
; RUN: -o %t.native.o -x ir %t.o
10+
11+
target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
12+
target triple = "x86_64-apple-darwin"
13+
14+
define void @use_arc(ptr %a, ptr %b) {
15+
call void (...) @llvm.objc.clang.arc.use(ptr %a, ptr %b) nounwind
16+
ret void
17+
}
18+
19+
declare void @llvm.objc.clang.arc.use(...) nounwind

‎lld/MachO/LTO.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ static lto::Config createConfig() {
4848
c.CPU = getCPUStr();
4949
c.MAttrs = getMAttrs();
5050
c.DiagHandler = diagnosticHandler;
51-
c.PreCodeGenPassesHook = [](legacy::PassManager &pm) {
52-
pm.add(createObjCARCContractPass());
53-
};
5451

5552
c.AlwaysEmitRegularLTOObj = !config->ltoObjPath.empty();
5653

‎llvm/include/llvm/Analysis/ObjCARCAnalysisUtils.h

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,26 @@ extern bool EnableARCOpts;
4141
/// Test if the given module looks interesting to run ARC optimization
4242
/// on.
4343
inline bool ModuleHasARC(const Module &M) {
44-
return
45-
M.getNamedValue("llvm.objc.retain") ||
46-
M.getNamedValue("llvm.objc.release") ||
47-
M.getNamedValue("llvm.objc.autorelease") ||
48-
M.getNamedValue("llvm.objc.retainAutoreleasedReturnValue") ||
49-
M.getNamedValue("llvm.objc.unsafeClaimAutoreleasedReturnValue") ||
50-
M.getNamedValue("llvm.objc.retainBlock") ||
51-
M.getNamedValue("llvm.objc.autoreleaseReturnValue") ||
52-
M.getNamedValue("llvm.objc.autoreleasePoolPush") ||
53-
M.getNamedValue("llvm.objc.loadWeakRetained") ||
54-
M.getNamedValue("llvm.objc.loadWeak") ||
55-
M.getNamedValue("llvm.objc.destroyWeak") ||
56-
M.getNamedValue("llvm.objc.storeWeak") ||
57-
M.getNamedValue("llvm.objc.initWeak") ||
58-
M.getNamedValue("llvm.objc.moveWeak") ||
59-
M.getNamedValue("llvm.objc.copyWeak") ||
60-
M.getNamedValue("llvm.objc.retainedObject") ||
61-
M.getNamedValue("llvm.objc.unretainedObject") ||
62-
M.getNamedValue("llvm.objc.unretainedPointer") ||
63-
M.getNamedValue("llvm.objc.clang.arc.use");
44+
return M.getNamedValue("llvm.objc.retain") ||
45+
M.getNamedValue("llvm.objc.release") ||
46+
M.getNamedValue("llvm.objc.autorelease") ||
47+
M.getNamedValue("llvm.objc.retainAutoreleasedReturnValue") ||
48+
M.getNamedValue("llvm.objc.unsafeClaimAutoreleasedReturnValue") ||
49+
M.getNamedValue("llvm.objc.retainBlock") ||
50+
M.getNamedValue("llvm.objc.autoreleaseReturnValue") ||
51+
M.getNamedValue("llvm.objc.autoreleasePoolPush") ||
52+
M.getNamedValue("llvm.objc.loadWeakRetained") ||
53+
M.getNamedValue("llvm.objc.loadWeak") ||
54+
M.getNamedValue("llvm.objc.destroyWeak") ||
55+
M.getNamedValue("llvm.objc.storeWeak") ||
56+
M.getNamedValue("llvm.objc.initWeak") ||
57+
M.getNamedValue("llvm.objc.moveWeak") ||
58+
M.getNamedValue("llvm.objc.copyWeak") ||
59+
M.getNamedValue("llvm.objc.retainedObject") ||
60+
M.getNamedValue("llvm.objc.unretainedObject") ||
61+
M.getNamedValue("llvm.objc.unretainedPointer") ||
62+
M.getNamedValue("llvm.objc.clang.arc.noop.use") ||
63+
M.getNamedValue("llvm.objc.clang.arc.use");
6464
}
6565

6666
/// This is a wrapper around getUnderlyingObject which also knows how to

‎llvm/lib/CodeGen/TargetPassConfig.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
#include "llvm/Support/WithColor.h"
4747
#include "llvm/Target/CGPassBuilderOption.h"
4848
#include "llvm/Target/TargetMachine.h"
49+
#include "llvm/Transforms/ObjCARC.h"
4950
#include "llvm/Transforms/Scalar.h"
5051
#include "llvm/Transforms/Utils.h"
5152
#include <cassert>
@@ -943,6 +944,9 @@ void TargetPassConfig::addCodeGenPrepare() {
943944
void TargetPassConfig::addISelPrepare() {
944945
addPreISel();
945946

947+
if (getOptLevel() != CodeGenOptLevel::None)
948+
addPass(createObjCARCContractPass());
949+
946950
// Force codegen to run according to the callgraph.
947951
if (requiresCodeGenSCCOrder())
948952
addPass(new DummyCGSCCPass);

‎llvm/lib/LTO/LTOCodeGenerator.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,6 @@ LTOCodeGenerator::LTOCodeGenerator(LLVMContext &Context)
136136

137137
Config.CodeModel = std::nullopt;
138138
Config.StatsFile = LTOStatsFile;
139-
Config.PreCodeGenPassesHook = [](legacy::PassManager &PM) {
140-
PM.add(createObjCARCContractPass());
141-
};
142-
143139
Config.RunCSIRInstr = LTORunCSIRInstr;
144140
Config.CSIRProfile = LTOCSIRProfile;
145141
}

‎llvm/lib/LTO/ThinLTOCodeGenerator.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -335,10 +335,6 @@ std::unique_ptr<MemoryBuffer> codegenModule(Module &TheModule,
335335
raw_svector_ostream OS(OutputBuffer);
336336
legacy::PassManager PM;
337337

338-
// If the bitcode files contain ARC code and were compiled with optimization,
339-
// the ObjCARCContractPass must be run, so do it unconditionally here.
340-
PM.add(createObjCARCContractPass());
341-
342338
// Setup the codegen now.
343339
if (TM.addPassesToEmitFile(PM, OS, nullptr, CodeGenFileType::ObjectFile,
344340
/* DisableVerify */ true))

‎llvm/lib/Transforms/ObjCARC/ObjCARCContract.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "ProvenanceAnalysis.h"
3232
#include "llvm/ADT/Statistic.h"
3333
#include "llvm/Analysis/AliasAnalysis.h"
34+
#include "llvm/Analysis/BasicAliasAnalysis.h"
3435
#include "llvm/Analysis/ObjCARCUtil.h"
3536
#include "llvm/IR/Dominators.h"
3637
#include "llvm/IR/EHPersonalities.h"
@@ -71,6 +72,9 @@ class ObjCARCContract {
7172
ARCRuntimeEntryPoints EP;
7273
BundledRetainClaimRVs *BundledInsts = nullptr;
7374

75+
/// A flag indicating whether this optimization pass should run.
76+
bool Run;
77+
7478
/// The inline asm string to insert between calls and RetainRV calls to make
7579
/// the optimization work on targets which need it.
7680
const MDString *RVInstMarker;
@@ -527,6 +531,10 @@ bool ObjCARCContract::tryToPeepholeInstruction(
527531
//===----------------------------------------------------------------------===//
528532

529533
bool ObjCARCContract::init(Module &M) {
534+
Run = ModuleHasARC(M);
535+
if (!Run)
536+
return false;
537+
530538
EP.init(&M);
531539

532540
// Initialize RVInstMarker.
@@ -536,6 +544,9 @@ bool ObjCARCContract::init(Module &M) {
536544
}
537545

538546
bool ObjCARCContract::run(Function &F, AAResults *A, DominatorTree *D) {
547+
if (!Run)
548+
return false;
549+
539550
if (!EnableARCOpts)
540551
return false;
541552

@@ -730,6 +741,9 @@ INITIALIZE_PASS_END(ObjCARCContractLegacyPass, "objc-arc-contract",
730741
void ObjCARCContractLegacyPass::getAnalysisUsage(AnalysisUsage &AU) const {
731742
AU.addRequired<AAResultsWrapperPass>();
732743
AU.addRequired<DominatorTreeWrapperPass>();
744+
AU.addPreserved<AAResultsWrapperPass>();
745+
AU.addPreserved<BasicAAWrapperPass>();
746+
AU.addPreserved<DominatorTreeWrapperPass>();
733747
}
734748

735749
Pass *llvm::createObjCARCContractPass() {

‎llvm/test/CodeGen/AArch64/O3-pipeline.ll

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,14 @@
102102
; CHECK-NEXT: Dominator Tree Construction
103103
; CHECK-NEXT: FunctionPass Manager
104104
; CHECK-NEXT: Merge internal globals
105+
; CHECK-NEXT: Dominator Tree Construction
106+
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
107+
; CHECK-NEXT: Function Alias Analysis Results
108+
; CHECK-NEXT: ObjC ARC contraction
105109
; CHECK-NEXT: Prepare callbr
106110
; CHECK-NEXT: Safe Stack instrumentation pass
107111
; CHECK-NEXT: Insert stack protectors
108112
; CHECK-NEXT: Module Verifier
109-
; CHECK-NEXT: Dominator Tree Construction
110113
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
111114
; CHECK-NEXT: Function Alias Analysis Results
112115
; CHECK-NEXT: Natural Loop Information

‎llvm/test/CodeGen/AMDGPU/llc-pipeline.ll

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,9 @@
279279
; GCN-O1-NEXT: AMDGPU Rewrite Undef for PHI
280280
; GCN-O1-NEXT: LCSSA Verifier
281281
; GCN-O1-NEXT: Loop-Closed SSA Form Pass
282+
; GCN-O1-NEXT: Basic Alias Analysis (stateless AA impl)
283+
; GCN-O1-NEXT: Function Alias Analysis Results
284+
; GCN-O1-NEXT: ObjC ARC contraction
282285
; GCN-O1-NEXT: DummyCGSCCPass
283286
; GCN-O1-NEXT: FunctionPass Manager
284287
; GCN-O1-NEXT: Prepare callbr
@@ -571,6 +574,9 @@
571574
; GCN-O1-OPTS-NEXT: AMDGPU Rewrite Undef for PHI
572575
; GCN-O1-OPTS-NEXT: LCSSA Verifier
573576
; GCN-O1-OPTS-NEXT: Loop-Closed SSA Form Pass
577+
; GCN-O1-OPTS-NEXT: Basic Alias Analysis (stateless AA impl)
578+
; GCN-O1-OPTS-NEXT: Function Alias Analysis Results
579+
; GCN-O1-OPTS-NEXT: ObjC ARC contraction
574580
; GCN-O1-OPTS-NEXT: DummyCGSCCPass
575581
; GCN-O1-OPTS-NEXT: FunctionPass Manager
576582
; GCN-O1-OPTS-NEXT: Prepare callbr
@@ -876,6 +882,11 @@
876882
; GCN-O2-NEXT: LCSSA Verifier
877883
; GCN-O2-NEXT: Loop-Closed SSA Form Pass
878884
; GCN-O2-NEXT: Analysis if a function is memory bound
885+
; GCN-O2-NEXT: FunctionPass Manager
886+
; GCN-O2-NEXT: Dominator Tree Construction
887+
; GCN-O2-NEXT: Basic Alias Analysis (stateless AA impl)
888+
; GCN-O2-NEXT: Function Alias Analysis Results
889+
; GCN-O2-NEXT: ObjC ARC contraction
879890
; GCN-O2-NEXT: DummyCGSCCPass
880891
; GCN-O2-NEXT: FunctionPass Manager
881892
; GCN-O2-NEXT: Prepare callbr
@@ -1194,6 +1205,11 @@
11941205
; GCN-O3-NEXT: LCSSA Verifier
11951206
; GCN-O3-NEXT: Loop-Closed SSA Form Pass
11961207
; GCN-O3-NEXT: Analysis if a function is memory bound
1208+
; GCN-O3-NEXT: FunctionPass Manager
1209+
; GCN-O3-NEXT: Dominator Tree Construction
1210+
; GCN-O3-NEXT: Basic Alias Analysis (stateless AA impl)
1211+
; GCN-O3-NEXT: Function Alias Analysis Results
1212+
; GCN-O3-NEXT: ObjC ARC contraction
11971213
; GCN-O3-NEXT: DummyCGSCCPass
11981214
; GCN-O3-NEXT: FunctionPass Manager
11991215
; GCN-O3-NEXT: Prepare callbr

‎llvm/test/CodeGen/ARM/O3-pipeline.ll

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,14 @@
6464
; CHECK-NEXT: Transform predicated vector loops to use MVE tail predication
6565
; CHECK-NEXT: A No-Op Barrier Pass
6666
; CHECK-NEXT: FunctionPass Manager
67+
; CHECK-NEXT: Dominator Tree Construction
68+
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
69+
; CHECK-NEXT: Function Alias Analysis Results
70+
; CHECK-NEXT: ObjC ARC contraction
6771
; CHECK-NEXT: Prepare callbr
6872
; CHECK-NEXT: Safe Stack instrumentation pass
6973
; CHECK-NEXT: Insert stack protectors
7074
; CHECK-NEXT: Module Verifier
71-
; CHECK-NEXT: Dominator Tree Construction
7275
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
7376
; CHECK-NEXT: Function Alias Analysis Results
7477
; CHECK-NEXT: Natural Loop Information

‎llvm/test/CodeGen/LoongArch/opt-pipeline.ll

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@
7070
; LAXX-NEXT: CodeGen Prepare
7171
; LAXX-NEXT: Dominator Tree Construction
7272
; LAXX-NEXT: Exception handling preparation
73+
; LAXX-NEXT: Basic Alias Analysis (stateless AA impl)
74+
; LAXX-NEXT: Function Alias Analysis Results
75+
; LAXX-NEXT: ObjC ARC contraction
7376
; LAXX-NEXT: Prepare callbr
7477
; LAXX-NEXT: Safe Stack instrumentation pass
7578
; LAXX-NEXT: Insert stack protectors

‎llvm/test/CodeGen/M68k/pipeline.ll

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
; CHECK-NEXT: CodeGen Prepare
4141
; CHECK-NEXT: Dominator Tree Construction
4242
; CHECK-NEXT: Exception handling preparation
43+
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
44+
; CHECK-NEXT: Function Alias Analysis Results
45+
; CHECK-NEXT: ObjC ARC contraction
4346
; CHECK-NEXT: Prepare callbr
4447
; CHECK-NEXT: Safe Stack instrumentation pass
4548
; CHECK-NEXT: Insert stack protectors

‎llvm/test/CodeGen/PowerPC/O3-pipeline.ll

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@
8181
; CHECK-NEXT: Lazy Block Frequency Analysis
8282
; CHECK-NEXT: Optimization Remark Emitter
8383
; CHECK-NEXT: Hardware Loop Insertion
84+
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
85+
; CHECK-NEXT: Function Alias Analysis Results
86+
; CHECK-NEXT: ObjC ARC contraction
8487
; CHECK-NEXT: Prepare callbr
8588
; CHECK-NEXT: Safe Stack instrumentation pass
8689
; CHECK-NEXT: Insert stack protectors

‎llvm/test/CodeGen/RISCV/O3-pipeline.ll

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,14 @@
7373
; CHECK-NEXT: Exception handling preparation
7474
; CHECK-NEXT: A No-Op Barrier Pass
7575
; CHECK-NEXT: FunctionPass Manager
76+
; CHECK-NEXT: Dominator Tree Construction
77+
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
78+
; CHECK-NEXT: Function Alias Analysis Results
79+
; CHECK-NEXT: ObjC ARC contraction
7680
; CHECK-NEXT: Prepare callbr
7781
; CHECK-NEXT: Safe Stack instrumentation pass
7882
; CHECK-NEXT: Insert stack protectors
7983
; CHECK-NEXT: Module Verifier
80-
; CHECK-NEXT: Dominator Tree Construction
8184
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
8285
; CHECK-NEXT: Function Alias Analysis Results
8386
; CHECK-NEXT: Natural Loop Information
@@ -194,7 +197,7 @@
194197
; CHECK-NEXT: Machine Optimization Remark Emitter
195198
; CHECK-NEXT: Stack Frame Layout Analysis
196199
; CHECK-NEXT: RISC-V Zcmp move merging pass
197-
; CHECK-NEXT: RISC-V Zcmp Push/Pop optimization pass
200+
; CHECK-NEXT: RISC-V Zcmp Push/Pop optimization pass
198201
; CHECK-NEXT: RISC-V Indirect Branch Tracking
199202
; CHECK-NEXT: RISC-V pseudo instruction expansion pass
200203
; CHECK-NEXT: RISC-V atomic pseudo instruction expansion pass

‎llvm/test/CodeGen/X86/opt-pipeline.ll

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@
7171
; CHECK-NEXT: CodeGen Prepare
7272
; CHECK-NEXT: Dominator Tree Construction
7373
; CHECK-NEXT: Exception handling preparation
74+
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
75+
; CHECK-NEXT: Function Alias Analysis Results
76+
; CHECK-NEXT: ObjC ARC contraction
7477
; CHECK-NEXT: Prepare callbr
7578
; CHECK-NEXT: Safe Stack instrumentation pass
7679
; CHECK-NEXT: Insert stack protectors

0 commit comments

Comments
 (0)