Skip to content

Commit 77e392e

Browse files
committed
[CodeGen] Rename dwarfehprepare -> dwarf-eh-prepare
1 parent 73113f2 commit 77e392e

File tree

9 files changed

+14
-13
lines changed

9 files changed

+14
-13
lines changed

llvm/include/llvm/CodeGen/MachinePassRegistry.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ FUNCTION_ANALYSIS("targetir", TargetIRAnalysis,
3838
#endif
3939
FUNCTION_PASS("callbrprepare", CallBrPreparePass, ())
4040
FUNCTION_PASS("consthoist", ConstantHoistingPass, ())
41-
FUNCTION_PASS("dwarfehprepare", DwarfEHPreparePass, (TM))
41+
FUNCTION_PASS("dwarf-eh-prepare", DwarfEHPreparePass, (TM))
4242
FUNCTION_PASS("ee-instrument", EntryExitInstrumenterPass, (false))
4343
FUNCTION_PASS("expand-large-div-rem", ExpandLargeDivRemPass, ())
4444
FUNCTION_PASS("expand-large-fp-convert", ExpandLargeFpConvertPass, ())

llvm/lib/CodeGen/DwarfEHPrepare.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
using namespace llvm;
4444

45-
#define DEBUG_TYPE "dwarfehprepare"
45+
#define DEBUG_TYPE "dwarf-eh-prepare"
4646

4747
STATISTIC(NumResumesLowered, "Number of resume calls lowered");
4848
STATISTIC(NumCleanupLandingPadsUnreachable,

llvm/lib/Passes/PassRegistry.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ FUNCTION_PASS("dot-dom-only", DomOnlyPrinter())
302302
FUNCTION_PASS("dot-post-dom", PostDomPrinter())
303303
FUNCTION_PASS("dot-post-dom-only", PostDomOnlyPrinter())
304304
FUNCTION_PASS("dse", DSEPass())
305-
FUNCTION_PASS("dwarfehprepare", DwarfEHPreparePass(TM))
305+
FUNCTION_PASS("dwarf-eh-prepare", DwarfEHPreparePass(TM))
306306
FUNCTION_PASS("expand-large-div-rem", ExpandLargeDivRemPass(TM))
307307
FUNCTION_PASS("expand-large-fp-convert", ExpandLargeFpConvertPass(TM))
308308
FUNCTION_PASS("fix-irreducible", FixIrreduciblePass())
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
; RUN: not --crash opt %s -dwarfehprepare -o - 2>&1 | FileCheck %s
1+
; RUN: not --crash opt %s -dwarf-eh-prepare -o - 2>&1 | FileCheck %s
22

33
; CHECK: Trying to construct TargetPassConfig without a target machine. Scheduling a CodeGen pass without a target triple set?

llvm/test/CodeGen/Mips/compactbranches/beqc-bnec-register-constraint.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
; RUN: llc -march=mips -mcpu=mips32r6 -O1 -start-after=dwarfehprepare < %s | FileCheck %s
2-
; RUN: llc -march=mips64 -mcpu=mips64r6 -O1 -start-after=dwarfehprepare < %s | FileCheck %s
1+
; RUN: llc -march=mips -mcpu=mips32r6 -O1 -start-after=dwarf-eh-prepare < %s | FileCheck %s
2+
; RUN: llc -march=mips64 -mcpu=mips64r6 -O1 -start-after=dwarf-eh-prepare < %s | FileCheck %s
33

44

55
; beqc/bnec have the constraint that $rs < $rt && $rs != 0 && $rt != 0

llvm/test/CodeGen/X86/dwarf-eh-prepare-dbg.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
2-
; RUN: opt -S -mtriple=x86_64-linux-gnu -dwarfehprepare < %s | FileCheck %s
3-
; RUN: opt -S -mtriple=x86_64-linux-gnu -passes=dwarfehprepare < %s | FileCheck %s
2+
; RUN: opt -S -mtriple=x86_64-linux-gnu -dwarf-eh-prepare < %s | FileCheck %s
3+
; RUN: opt -S -mtriple=x86_64-linux-gnu -passes=dwarf-eh-prepare < %s | FileCheck %s
44

55
; PR57469: If _Unwind_Resume is defined in the same module and we have debug
66
; info, then the inserted _Unwind_Resume calls also need to have a dummy debug

llvm/test/CodeGen/X86/dwarf-eh-prepare.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
; RUN: opt -mtriple=x86_64-linux-gnu -dwarfehprepare -simplifycfg-require-and-preserve-domtree=1 -run-twice < %s -S | FileCheck %s
2-
; RUN: opt -mtriple=x86_64-linux-gnu -passes=dwarfehprepare -codegen-opt-level=2 -simplifycfg-require-and-preserve-domtree=1 -run-twice < %s -S | FileCheck %s
1+
; RUN: opt -mtriple=x86_64-linux-gnu -dwarf-eh-prepare -simplifycfg-require-and-preserve-domtree=1 -run-twice < %s -S | FileCheck %s
2+
; RUN: opt -mtriple=x86_64-linux-gnu -passes=dwarf-eh-prepare -codegen-opt-level=2 -simplifycfg-require-and-preserve-domtree=1 -run-twice < %s -S | FileCheck %s
33

44
; Check basic functionality of IR-to-IR DWARF EH preparation. This should
55
; eliminate resumes. This pass requires a TargetMachine, so we put it under X86

llvm/test/CodeGen/X86/dwarf_eh_resume.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
; RUN: opt -mtriple=x86_64-linux-gnu -dwarfehprepare -S %s | FileCheck %s
2-
; RUN: opt -mtriple=x86_64-linux-gnu -passes=dwarfehprepare -S %s | FileCheck %s
1+
; RUN: opt -mtriple=x86_64-linux-gnu -dwarf-eh-prepare -S %s | FileCheck %s
2+
; RUN: opt -mtriple=x86_64-linux-gnu -passes=dwarf-eh-prepare -S %s | FileCheck %s
33

44
declare i32 @hoge(...)
55

llvm/tools/opt/opt.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,8 @@ static bool shouldPinPassToLegacyPM(StringRef Pass) {
339339
"nvptx-", "mips-", "lanai-", "hexagon-", "bpf-", "avr-",
340340
"thumb2-", "arm-", "si-", "gcn-", "amdgpu-", "aarch64-",
341341
"amdgcn-", "polly-", "riscv-", "dxil-"};
342-
std::vector<StringRef> PassNameContain = {"ehprepare"};
342+
// TODO: remove "ehprepare"
343+
std::vector<StringRef> PassNameContain = {"-eh-prepare", "ehprepare"};
343344
std::vector<StringRef> PassNameExact = {
344345
"safe-stack",
345346
"cost-model",

0 commit comments

Comments
 (0)