Skip to content

Commit 4b8e8cf

Browse files
kinkekinke
committed
Clean up legacy lit substitutions
1 parent 69d636a commit 4b8e8cf

12 files changed

+18
-24
lines changed

‎tests/PGO/allstatementtypes.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
// See boundscheck.d for boundschecking instrumenation tests.
77

88
// RUN: %ldc -boundscheck=off -c -output-ll -fprofile-instr-generate="hoihoihoi" -of=%t.ll %s \
9-
// RUN: && FileCheck %allow-deprecated-dag-overlap %s --check-prefix=PROFGEN < %t.ll
9+
// RUN: && FileCheck -allow-deprecated-dag-overlap %s --check-prefix=PROFGEN < %t.ll
1010

1111
// PROFGEN-DAG: @[[FILENAME:.+]] ={{.*}} constant{{.*}} c"hoihoihoi\00"
1212

1313
// RUN: %ldc -boundscheck=off -fprofile-instr-generate=%t.profraw -run %s \
1414
// RUN: && %profdata merge %t.profraw -o %t.profdata \
1515
// RUN: && %ldc -boundscheck=off -c -output-ll -of=%t2.ll -fprofile-instr-use=%t.profdata %s \
16-
// RUN: && FileCheck %allow-deprecated-dag-overlap %s -check-prefix=PROFUSE < %t2.ll
16+
// RUN: && FileCheck -allow-deprecated-dag-overlap %s -check-prefix=PROFUSE < %t2.ll
1717

1818
extern(C): // simplify name mangling for simpler string matching
1919

‎tests/PGO/branching_switch.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// REQUIRES: PGO_RT
44

55
// RUN: %ldc -c -output-ll -fprofile-instr-generate -of=%t.ll %s \
6-
// RUN: && FileCheck %allow-deprecated-dag-overlap %s --check-prefix=PROFGEN < %t.ll
6+
// RUN: && FileCheck -allow-deprecated-dag-overlap %s --check-prefix=PROFGEN < %t.ll
77

88
// RUN: %ldc -fprofile-instr-generate=%t.profraw -run %s \
99
// RUN: && %profdata merge %t.profraw -o %t.profdata \
1010
// RUN: && %ldc -boundscheck=off -c -output-ll -of=%t2.ll -fprofile-instr-use=%t.profdata %s \
11-
// RUN: && FileCheck %allow-deprecated-dag-overlap %s -check-prefix=PROFUSE < %t2.ll
11+
// RUN: && FileCheck -allow-deprecated-dag-overlap %s -check-prefix=PROFUSE < %t2.ll
1212

1313
extern(C): // simplify name mangling for simpler string matching
1414

‎tests/PGO/break.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// REQUIRES: PGO_RT
44

55
// RUN: %ldc -c -output-ll -fprofile-instr-generate -of=%t.ll %s \
6-
// RUN: && FileCheck %allow-deprecated-dag-overlap %s --check-prefix=PROFGEN < %t.ll
6+
// RUN: && FileCheck -allow-deprecated-dag-overlap %s --check-prefix=PROFGEN < %t.ll
77

88
// RUN: %ldc -fprofile-instr-generate=%t.profraw -run %s \
99
// RUN: && %profdata merge %t.profraw -o %t.profdata \
1010
// RUN: && %ldc -boundscheck=off -c -output-ll -of=%t2.ll -fprofile-instr-use=%t.profdata %s \
11-
// RUN: && FileCheck %allow-deprecated-dag-overlap %s -check-prefix=PROFUSE < %t2.ll
11+
// RUN: && FileCheck -allow-deprecated-dag-overlap %s -check-prefix=PROFUSE < %t2.ll
1212

1313
extern(C): // simplify name mangling for simpler string matching
1414

‎tests/PGO/functions.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
// REQUIRES: PGO_RT
77

88
// RUN: %ldc -c -output-ll -fprofile-instr-generate -of=%t.ll %s \
9-
// RUN: && FileCheck %allow-deprecated-dag-overlap %s --check-prefix=PROFGEN < %t.ll
9+
// RUN: && FileCheck -allow-deprecated-dag-overlap %s --check-prefix=PROFGEN < %t.ll
1010

1111
// RUN: %ldc -fprofile-instr-generate=%t.profraw -run %s \
1212
// RUN: && %profdata merge %t.profraw -o %t.profdata \
1313
// RUN: && %ldc -c -output-ll -of=%t2.ll -fprofile-instr-use=%t.profdata %s \
14-
// RUN: && FileCheck %allow-deprecated-dag-overlap %s -check-prefix=PROFUSE < %t2.ll
14+
// RUN: && FileCheck -allow-deprecated-dag-overlap %s -check-prefix=PROFUSE < %t2.ll
1515

1616
// PROFGEN-DAG: @[[SMPL:__(llvm_profile_counters|profc).*simplefunction[A-Za-z0-9]*]] ={{.*}} [2 x i64] zeroinitializer
1717
// PROFGEN-DAG: @[[TMPL:__(llvm_profile_counters|profc).*templatefunc[A-Za-z0-9]*]] ={{.*}} [2 x i64] zeroinitializer

‎tests/PGO/hash.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
// RUN: %ldc -d-version=ProfData -fprofile-instr-generate=%t.profraw -run %s \
88
// RUN: && %profdata merge %t.profraw -o %t.profdata \
99
// RUN: && %ldc -d-version=ProfData -c -output-ll -of=%t2.ll -fprofile-instr-use=%t.profdata %s \
10-
// RUN: && FileCheck %allow-deprecated-dag-overlap %s -check-prefix=PROFDATA < %t2.ll \
10+
// RUN: && FileCheck -allow-deprecated-dag-overlap %s -check-prefix=PROFDATA < %t2.ll \
1111
// RUN: && %ldc -wi -c -output-ll -of=%t3.ll -fprofile-instr-use=%t.profdata %s \
12-
// RUN: && FileCheck %allow-deprecated-dag-overlap %s -check-prefix=NODATA < %t3.ll
12+
// RUN: && FileCheck -allow-deprecated-dag-overlap %s -check-prefix=NODATA < %t3.ll
1313

1414
extern(C):
1515

‎tests/PGO/lit.local.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
# Add "PGO_RT" feature, assuming the `profile` compiler-rt library is available
22
config.available_features.add('PGO_RT')
3-
4-
config.substitutions.append( ('%allow-deprecated-dag-overlap ', '-allow-deprecated-dag-overlap ') )

‎tests/PGO/unrolledloopstatement_gh3375.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// RUN: %ldc -fprofile-instr-generate=%t.profraw -run %s
66
// RUN: %profdata merge %t.profraw -o %t.profdata
77
// RUN: %ldc -c -output-ll -of=%t2.ll -fprofile-instr-use=%t.profdata %s
8-
// RUN: FileCheck %allow-deprecated-dag-overlap %s -check-prefix=PROFUSE < %t2.ll
8+
// RUN: FileCheck -allow-deprecated-dag-overlap %s -check-prefix=PROFUSE < %t2.ll
99

1010
alias AliasSeq(TList...) = TList;
1111

‎tests/codegen/attr_targetoptions.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
// RUN: FileCheck %s --check-prefix=COMMON --check-prefix=WITH_FP < %t.ll
55
// RUN: %ldc -c -output-ll -of=%t.ll %s -O2
66
// RUN: FileCheck %s --check-prefix=COMMON --check-prefix=NO_FP < %t.ll
7-
// RUN: %ldc -c -output-ll -of=%t.ll %s -O2 %disable_fp_elim
7+
// RUN: %ldc -c -output-ll -of=%t.ll %s -O2 -frame-pointer=all
88
// RUN: FileCheck %s --check-prefix=COMMON --check-prefix=WITH_FP < %t.ll
9-
// RUN: %ldc -c -output-ll -of=%t.ll %s %enable_fp_elim -mattr=test
9+
// RUN: %ldc -c -output-ll -of=%t.ll %s -frame-pointer=none -mattr=test
1010
// RUN: FileCheck %s --check-prefix=COMMON --check-prefix=NO_FP --check-prefix=ATTR < %t.ll
1111

1212
// COMMON: define{{.*}} @{{.*}}3fooFZv{{.*}} #[[KEYVALUE:[0-9]+]]

‎tests/codegen/exception_stack_trace.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %ldc -g %disable_fp_elim -link-defaultlib-debug %s -of=%t%exe
1+
// RUN: %ldc -g -frame-pointer=all -link-defaultlib-debug %s -of=%t%exe
22
// RUN: %t%exe | FileCheck %s
33

44
void bar()

‎tests/codegen/frame_pointer_x86.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
// RUN: FileCheck %s --check-prefixes=COMMON,FP < %t.s
55
// RUN: %ldc -c -mtriple=x86_64 -output-s -of=%t.s %s -O2
66
// RUN: FileCheck %s --check-prefixes=COMMON,NO_FP < %t.s
7-
// RUN: %ldc -c -mtriple=x86_64 -output-s -of=%t.s %s -O2 %disable_fp_elim
7+
// RUN: %ldc -c -mtriple=x86_64 -output-s -of=%t.s %s -O2 -frame-pointer=all
88
// RUN: FileCheck %s --check-prefixes=COMMON,FP < %t.s
9-
// RUN: %ldc -c -mtriple=x86_64 -output-s -of=%t.s %s %enable_fp_elim
9+
// RUN: %ldc -c -mtriple=x86_64 -output-s -of=%t.s %s -frame-pointer=none
1010
// RUN: FileCheck %s --check-prefixes=COMMON,NO_FP < %t.s
1111

1212
// COMMON-LABEL: _D17frame_pointer_x8613inlineAsmLeafFZv:

‎tests/lit.site.cfg.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,6 @@ if (platform.system() != 'Windows') and lit.util.which('gdb', config.environment
216216

217217
config.substitutions.append( ('%_gdb_dflags', gdb_dflags) )
218218

219-
# Add substitutions for functionality across different LLVM versions
220-
config.substitutions.append( ('%disable_fp_elim', '-frame-pointer=all') )
221-
config.substitutions.append( ('%enable_fp_elim', '-frame-pointer=none') )
222-
223219
if 'LD_LIBRARY_PATH' in os.environ:
224220
libs = []
225221
for lib_path in [s for s in os.environ['LD_LIBRARY_PATH'].split(':') if s]:

‎tests/sanitizers/fuzz_asan.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
// REQUIRES: Fuzzer, ASan
44

5-
// See https://github.com/ldc-developers/ldc/issues/2222 for %disable_fp_elim
5+
// See https://github.com/ldc-developers/ldc/issues/2222 for -frame-pointer=all
66
// See https://github.com/ldc-developers/ldc/pull/4328 for -fsanitize-address-use-after-return=never
7-
// RUN: %ldc -g -fsanitize=address,fuzzer -fsanitize-address-use-after-return=never %disable_fp_elim %s -of=%t%exe
7+
// RUN: %ldc -g -fsanitize=address,fuzzer -fsanitize-address-use-after-return=never -frame-pointer=all %s -of=%t%exe
88
// RUN: not %t%exe 2>&1 | FileCheck %s
99

1010
bool FuzzMe(ubyte* data, size_t dataSize)

0 commit comments

Comments
 (0)