Skip to content

Commit 0740369

Browse files
committed
[Test] Underscored simplify_cfg_simplify_argument.
Use underscores rather than hyphens so that text editors understand the name as a single word.
1 parent 9825b26 commit 0740369

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

lib/SILOptimizer/Analysis/BasicCalleeAnalysis.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ namespace swift::test {
9494
// Dumps:
9595
// - instruction
9696
// - whether it's a deinit barrier
97-
static FunctionTest IsDeinitBarrierTest("is-deinit-barrier", [](auto &function,
97+
static FunctionTest IsDeinitBarrierTest("is_deinit_barrier", [](auto &function,
9898
auto &arguments,
9999
auto &test) {
100100
auto *instruction = arguments.takeInstruction();

test/SILOptimizer/deinit_barrier.sil

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -45,46 +45,46 @@ sil [ossa] @empty_fn_caller_caller : $@convention(thin) () -> () {
4545
// CHECK: [[UNKNOWN:%[^,]+]] = function_ref @unknown
4646
// CHECK: [[UNKNOWN_CALLER:%[^,]+]] = function_ref @unknown_caller
4747
// CHECK-LABEL: end running test 1 of {{[0-9]+}} on call_functions: dump-function
48-
// CHECK-LABEL: begin running test 2 of {{[0-9]+}} on call_functions: is-deinit-barrier
48+
// CHECK-LABEL: begin running test 2 of {{[0-9]+}} on call_functions: is_deinit_barrier
4949
// CHECK: apply [[EMPTY_FN]]
5050
// CHECK: false
51-
// CHECK-LABEL: end running test 2 of {{[0-9]+}} on call_functions: is-deinit-barrier
52-
// CHECK-LABEL: begin running test 3 of {{[0-9]+}} on call_functions: is-deinit-barrier
51+
// CHECK-LABEL: end running test 2 of {{[0-9]+}} on call_functions: is_deinit_barrier
52+
// CHECK-LABEL: begin running test 3 of {{[0-9]+}} on call_functions: is_deinit_barrier
5353
// CHECK: apply [[EMPTY_FN_CALLER]]
5454
// CHECK: false
55-
// CHECK-LABEL: end running test 3 of {{[0-9]+}} on call_functions: is-deinit-barrier
56-
// CHECK-LABEL: begin running test 4 of {{[0-9]+}} on call_functions: is-deinit-barrier
55+
// CHECK-LABEL: end running test 3 of {{[0-9]+}} on call_functions: is_deinit_barrier
56+
// CHECK-LABEL: begin running test 4 of {{[0-9]+}} on call_functions: is_deinit_barrier
5757
// CHECK: apply [[EMPTY_FN_CALLER_CALLER]]
5858
// CHECK: false
59-
// CHECK-LABEL: end running test 4 of {{[0-9]+}} on call_functions: is-deinit-barrier
60-
// CHECK-LABEL: begin running test 5 of {{[0-9]+}} on call_functions: is-deinit-barrier
59+
// CHECK-LABEL: end running test 4 of {{[0-9]+}} on call_functions: is_deinit_barrier
60+
// CHECK-LABEL: begin running test 5 of {{[0-9]+}} on call_functions: is_deinit_barrier
6161
// CHECK: apply [[UNKNOWN]]
6262
// CHECK: true
63-
// CHECK-LABEL: end running test 5 of {{[0-9]+}} on call_functions: is-deinit-barrier
64-
// CHECK-LABEL: begin running test 6 of {{[0-9]+}} on call_functions: is-deinit-barrier
63+
// CHECK-LABEL: end running test 5 of {{[0-9]+}} on call_functions: is_deinit_barrier
64+
// CHECK-LABEL: begin running test 6 of {{[0-9]+}} on call_functions: is_deinit_barrier
6565
// CHECK: apply [[UNKNOWN_CALLER]]
6666
// CHECK: true
67-
// CHECK-LABEL: end running test 6 of {{[0-9]+}} on call_functions: is-deinit-barrier
67+
// CHECK-LABEL: end running test 6 of {{[0-9]+}} on call_functions: is_deinit_barrier
6868
sil [ossa] @call_functions : $@convention(thin) () -> () {
6969
entry:
7070
specify_test "dump-function"
71-
specify_test "is-deinit-barrier @instruction[1]"
71+
specify_test "is_deinit_barrier @instruction[1]"
7272
%empty_fn = function_ref @empty_fn : $@convention(thin) () -> ()
7373
apply %empty_fn() : $@convention(thin) () -> ()
7474

75-
specify_test "is-deinit-barrier @instruction[3]"
75+
specify_test "is_deinit_barrier @instruction[3]"
7676
%empty_fn_caller = function_ref @empty_fn_caller : $@convention(thin) () -> ()
7777
apply %empty_fn_caller() : $@convention(thin) () -> ()
7878

79-
specify_test "is-deinit-barrier @instruction[5]"
79+
specify_test "is_deinit_barrier @instruction[5]"
8080
%empty_fn_caller_caller = function_ref @empty_fn_caller_caller : $@convention(thin) () -> ()
8181
apply %empty_fn_caller_caller() : $@convention(thin) () -> ()
8282

83-
specify_test "is-deinit-barrier @instruction[7]"
83+
specify_test "is_deinit_barrier @instruction[7]"
8484
%unknown = function_ref @unknown : $@convention(thin) () -> ()
8585
apply %unknown() : $@convention(thin) () -> ()
8686

87-
specify_test "is-deinit-barrier @instruction[9]"
87+
specify_test "is_deinit_barrier @instruction[9]"
8888
%unknown_caller = function_ref @unknown_caller : $@convention(thin) () -> ()
8989
apply %unknown_caller() : $@convention(thin) () -> ()
9090

@@ -97,58 +97,58 @@ actor A {}
9797
sil @getA : $() -> (@owned A)
9898
sil @borrowA : $@yield_once @convention(thin) () -> @yields @guaranteed A
9999

100-
// CHECK-LABEL: begin running test 1 of {{[0-9]+}} on test_hop_to_executor: is-deinit-barrier
100+
// CHECK-LABEL: begin running test 1 of {{[0-9]+}} on test_hop_to_executor: is_deinit_barrier
101101
// CHECK: hop_to_executor
102102
// CHECK: true
103-
// CHECK-LABEL: end running test 1 of {{[0-9]+}} on test_hop_to_executor: is-deinit-barrier
103+
// CHECK-LABEL: end running test 1 of {{[0-9]+}} on test_hop_to_executor: is_deinit_barrier
104104
sil [ossa] @test_hop_to_executor : $@convention(thin) () -> () {
105105
%borrowA = function_ref @borrowA : $@yield_once @convention(thin) () -> @yields @guaranteed A
106106
(%a, %token) = begin_apply %borrowA() : $@yield_once @convention(thin) () -> @yields @guaranteed A
107-
specify_test "is-deinit-barrier @instruction"
107+
specify_test "is_deinit_barrier @instruction"
108108
hop_to_executor %a : $A
109109
end_apply %token as $()
110110
%retval = tuple ()
111111
return %retval : $()
112112
}
113113

114-
// CHECK-LABEL: begin running test 1 of {{[0-9]+}} on test_instructions_1: is-deinit-barrier
114+
// CHECK-LABEL: begin running test 1 of {{[0-9]+}} on test_instructions_1: is_deinit_barrier
115115
// CHECK: debug_step
116116
// CHECK: false
117-
// CHECK-LABEL: end running test 1 of {{[0-9]+}} on test_instructions_1: is-deinit-barrier
118-
// CHECK-LABEL: begin running test 2 of {{[0-9]+}} on test_instructions_1: is-deinit-barrier
117+
// CHECK-LABEL: end running test 1 of {{[0-9]+}} on test_instructions_1: is_deinit_barrier
118+
// CHECK-LABEL: begin running test 2 of {{[0-9]+}} on test_instructions_1: is_deinit_barrier
119119
// CHECK: load [trivial] {{%[^,]+}} : $*Builtin.Int32
120120
// CHECK: true
121-
// CHECK-LABEL: end running test 2 of {{[0-9]+}} on test_instructions_1: is-deinit-barrier
122-
// CHECK-LABEL: begin running test 3 of {{[0-9]+}} on test_instructions_1: is-deinit-barrier
121+
// CHECK-LABEL: end running test 2 of {{[0-9]+}} on test_instructions_1: is_deinit_barrier
122+
// CHECK-LABEL: begin running test 3 of {{[0-9]+}} on test_instructions_1: is_deinit_barrier
123123
// CHECK: load [trivial] {{%[^,]+}} : $*Builtin.Int32
124124
// CHECK: true
125-
// CHECK-LABEL: end running test 3 of {{[0-9]+}} on test_instructions_1: is-deinit-barrier
125+
// CHECK-LABEL: end running test 3 of {{[0-9]+}} on test_instructions_1: is_deinit_barrier
126126
sil [ossa] @test_instructions_1 : $@convention(thin) () -> () {
127127
entry:
128-
specify_test "is-deinit-barrier @instruction"
128+
specify_test "is_deinit_barrier @instruction"
129129
debug_step
130130

131131
%my_errno = global_addr @my_errno : $*Builtin.Int32
132-
specify_test "is-deinit-barrier @instruction"
132+
specify_test "is_deinit_barrier @instruction"
133133
%my_errno_value = load [trivial] %my_errno : $*Int32
134134

135135
%global_var = global_addr @global_var : $*Builtin.Int32
136-
specify_test "is-deinit-barrier @instruction"
136+
specify_test "is_deinit_barrier @instruction"
137137
%global_var_value = load [trivial] %global_var : $*Int32
138138

139139
%retval = tuple ()
140140
return %retval : $()
141141
}
142142

143-
// CHECK-LABEL: begin running test {{.*}} on rdar120656227: is-deinit-barrier
143+
// CHECK-LABEL: begin running test {{.*}} on rdar120656227: is_deinit_barrier
144144
// CHECK: builtin "int_memmove_RawPointer_RawPointer_Int64"
145145
// CHECK: true
146-
// CHECK-LABEL: end running test {{.*}} on rdar120656227: is-deinit-barrier
146+
// CHECK-LABEL: end running test {{.*}} on rdar120656227: is_deinit_barrier
147147
sil [ossa] @rdar120656227 : $@convention(thin) (Builtin.RawPointer, Builtin.RawPointer) -> () {
148148
bb0(%42 : $Builtin.RawPointer, %9 : $Builtin.RawPointer):
149149
%14 = integer_literal $Builtin.Int64, 27
150150
%28 = integer_literal $Builtin.Int1, 1
151-
specify_test "is-deinit-barrier @instruction"
151+
specify_test "is_deinit_barrier @instruction"
152152
%43 = builtin "int_memmove_RawPointer_RawPointer_Int64"(%42 : $Builtin.RawPointer, %9 : $Builtin.RawPointer, %14 : $Builtin.Int64, %28 : $Builtin.Int1) : $()
153153
%68 = tuple ()
154154
return %68 : $()

0 commit comments

Comments
 (0)