Skip to content

Commit ebd9cd8

Browse files
swift-ciswift-ci
authored
Merge pull request #16975 from compnerd/interpreter
2 parents 72975a3 + f17030d commit ebd9cd8

18 files changed

+26
-26
lines changed

‎test/Driver/pipe_round_robin.swift.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
// different (eg. thousands of reads per poll).
2323
//
2424
// RUN: %target-build-swift -j 4 -module-name manyfuncs -typecheck -stats-output-dir %t/stats -Xfrontend -debug-time-function-bodies %t/manyfuncs/*.swift
25-
// RUN: %utils/process-stats-dir.py --evaluate 'abs(float(NumDriverPipeReads) / float(NumDriverPipePolls)) < 3.0' %t/stats
25+
// RUN: %{python} %utils/process-stats-dir.py --evaluate 'abs(float(NumDriverPipeReads) / float(NumDriverPipePolls)) < 3.0' %t/stats
2626

2727
% for i in range(1,1000):
2828
func process_${N}_function_${i}(_ x: Int) -> Int {

‎test/Misc/stats_dir.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %target-swift-frontend -c -o %t/out.o -stats-output-dir %t %s
3-
// RUN: %utils/process-stats-dir.py --set-csv-baseline %t/frontend.csv %t
3+
// RUN: %{python} %utils/process-stats-dir.py --set-csv-baseline %t/frontend.csv %t
44
// RUN: %FileCheck -input-file %t/frontend.csv %s
55
// RUN: %empty-directory(%t)
66
// RUN: %target-swift-frontend -c -o %t/out.o -stats-output-dir %t %s
7-
// RUN: %utils/process-stats-dir.py --set-csv-baseline %t/frontend.csv --exclude-timers %t
7+
// RUN: %{python} %utils/process-stats-dir.py --set-csv-baseline %t/frontend.csv --exclude-timers %t
88
// RUN: %FileCheck -input-file %t/frontend.csv --implicit-check-not '{{time.swift}}' %s
99
// RUN: %empty-directory(%t)
1010
// RUN: %target-swift-frontend -c -o %t/out.o -stats-output-dir %t %s
11-
// RUN: %utils/process-stats-dir.py --set-csv-baseline %t/frontend.csv --select-stat NumSourceLines --select-stat NumIRFunctions --select-stat NumLLVMBytesOutput %t
11+
// RUN: %{python} %utils/process-stats-dir.py --set-csv-baseline %t/frontend.csv --select-stat NumSourceLines --select-stat NumIRFunctions --select-stat NumLLVMBytesOutput %t
1212
// RUN: %FileCheck -input-file %t/frontend.csv %s
1313
// RUN: %empty-directory(%t)
1414
// RUN: %target-swift-frontend -c -wmo -num-threads 4 -o %t/out.o -stats-output-dir %t %s
15-
// RUN: %utils/process-stats-dir.py --set-csv-baseline %t/frontend.csv %t
15+
// RUN: %{python} %utils/process-stats-dir.py --set-csv-baseline %t/frontend.csv %t
1616
// RUN: %FileCheck -input-file %t/frontend.csv %s
1717
// RUN: echo '9000000000 "LLVM.NumLLVMBytesOutput" 1' >>%t/frontend.csv
18-
// RUN: not %utils/process-stats-dir.py --compare-to-csv-baseline %t/frontend.csv %t
18+
// RUN: not %{python} %utils/process-stats-dir.py --compare-to-csv-baseline %t/frontend.csv %t
1919

2020
// RUN: %empty-directory(%t)
2121
// RUN: %target-swiftc_driver -c -o %t/out.o -stats-output-dir %t %s
22-
// RUN: %utils/process-stats-dir.py --set-csv-baseline %t/driver.csv %t
22+
// RUN: %{python} %utils/process-stats-dir.py --set-csv-baseline %t/driver.csv %t
2323
// RUN: %FileCheck -input-file %t/driver.csv %s
24-
// RUN: %utils/process-stats-dir.py --compare-to-csv-baseline %t/driver.csv %t
24+
// RUN: %{python} %utils/process-stats-dir.py --compare-to-csv-baseline %t/driver.csv %t
2525

2626
// RUN: %target-swiftc_driver -c -o %t/out.o -stats-output-dir %t/this/is/not/a/directory %s 2>&1 | %FileCheck -check-prefix=CHECK-NODIR %s
2727

‎test/Misc/stats_dir_failure_count.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// RUN: %empty-directory(%t)
33
// RUN: echo zzz >%t/other.swift
44
// RUN: not %target-swiftc_driver -continue-building-after-errors -D BROKEN -j 2 -typecheck -stats-output-dir %t %s %t/other.swift
5-
// RUN: %utils/process-stats-dir.py --set-csv-baseline %t/stats.csv %t
5+
// RUN: %{python} %utils/process-stats-dir.py --set-csv-baseline %t/stats.csv %t
66
// RUN: %FileCheck -input-file %t/stats.csv -check-prefix=FAILURE %s
77
// FAILURE: {{"Driver.NumProcessFailures" 1$}}
88
// FAILURE: {{"Frontend.NumProcessFailures" 2$}}
@@ -11,7 +11,7 @@
1111
// RUN: %empty-directory(%t)
1212
// RUN: echo 'let x : Int = 1' >%t/other.swift
1313
// RUN: %target-swiftc_driver -j 2 -typecheck -stats-output-dir %t %s %t/other.swift
14-
// RUN: %utils/process-stats-dir.py --set-csv-baseline %t/stats.csv %t
14+
// RUN: %{python} %utils/process-stats-dir.py --set-csv-baseline %t/stats.csv %t
1515
// RUN: %FileCheck -input-file %t/stats.csv -check-prefix=SUCCESS %s
1616
// SUCCESS-NOT: {{"Driver.NumProcessFailures" [1-9]+}}
1717
// SUCCESS-NOT: {{"Frontend.NumProcessFailures" [1-9]+}}

‎test/Misc/stats_dir_long_path_name.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// RUN: cp %s %t/very-long-directory-name-that-contains-over-128-characters-which-is-not-enough-to-be-illegal-on-its-own-but-presents/a-problem-when-combined-with-other-long-path-elements-and-filenames-to-exceed-256-characters-combined-because-yay-arbitrary-limits-amirite.swift
55
// RUN: touch %t/main.swift
66
// RUN: %target-swiftc_driver -o %t/main -module-name main -stats-output-dir %t %t/main.swift %t/very-long-directory-name-that-contains-over-128-characters-which-is-not-enough-to-be-illegal-on-its-own-but-presents/a-problem-when-combined-with-other-long-path-elements-and-filenames-to-exceed-256-characters-combined-because-yay-arbitrary-limits-amirite.swift
7-
// RUN: %utils/process-stats-dir.py --set-csv-baseline %t/frontend.csv %t
7+
// RUN: %{python} %utils/process-stats-dir.py --set-csv-baseline %t/frontend.csv %t
88
// RUN: %FileCheck -input-file %t/frontend.csv %s
99

1010
// CHECK: {{"AST.NumSourceLines" [1-9][0-9]*$}}

‎test/Misc/stats_dir_plausible_maxrss.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %empty-directory(%t)
22
// RUN: touch %t/main.swift
33
// RUN: %target-swiftc_driver -o %t/main -module-name main -stats-output-dir %t %t/main.swift
4-
// RUN: %utils/process-stats-dir.py --set-csv-baseline %t/frontend.csv %t
4+
// RUN: %{python} %utils/process-stats-dir.py --set-csv-baseline %t/frontend.csv %t
55
// RUN: %FileCheck -input-file %t/frontend.csv %s
66

77
// This test checks that we're reporting some number that's "at least 10MB" and

‎test/NameBinding/named_lazy_member_loading_objc_category.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// Check that named-lazy-member-loading reduces the number of Decls deserialized
99
// RUN: %target-swift-frontend -typecheck -I %S/Inputs/NamedLazyMembers -disable-named-lazy-member-loading -stats-output-dir %t/stats-pre %s
1010
// RUN: %target-swift-frontend -typecheck -I %S/Inputs/NamedLazyMembers -stats-output-dir %t/stats-post %s
11-
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumTotalClangImportedEntities < -10' %t/stats-pre %t/stats-post
11+
// RUN: %{python} %utils/process-stats-dir.py --evaluate-delta 'NumTotalClangImportedEntities < -10' %t/stats-pre %t/stats-post
1212

1313
import NamedLazyMembers
1414

‎test/NameBinding/named_lazy_member_loading_objc_interface.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// Check that named-lazy-member-loading reduces the number of Decls deserialized
99
// RUN: %target-swift-frontend -typecheck -I %S/Inputs/NamedLazyMembers -disable-named-lazy-member-loading -stats-output-dir %t/stats-pre -primary-file %s %S/Inputs/NamedLazyMembers/NamedLazyMembersExt.swift
1010
// RUN: %target-swift-frontend -typecheck -I %S/Inputs/NamedLazyMembers -stats-output-dir %t/stats-post -primary-file %s %S/Inputs/NamedLazyMembers/NamedLazyMembersExt.swift
11-
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumTotalClangImportedEntities < -10' %t/stats-pre %t/stats-post
11+
// RUN: %{python} %utils/process-stats-dir.py --evaluate-delta 'NumTotalClangImportedEntities < -10' %t/stats-pre %t/stats-post
1212

1313
import NamedLazyMembers
1414

‎test/NameBinding/named_lazy_member_loading_objc_protocol.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// Check that named-lazy-member-loading reduces the number of Decls deserialized
99
// RUN: %target-swift-frontend -typecheck -I %S/Inputs/NamedLazyMembers -disable-named-lazy-member-loading -stats-output-dir %t/stats-pre %s
1010
// RUN: %target-swift-frontend -typecheck -I %S/Inputs/NamedLazyMembers -stats-output-dir %t/stats-post %s
11-
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumTotalClangImportedEntities < -9' %t/stats-pre %t/stats-post
11+
// RUN: %{python} %utils/process-stats-dir.py --evaluate-delta 'NumTotalClangImportedEntities < -9' %t/stats-pre %t/stats-post
1212

1313
import NamedLazyMembers
1414

‎test/NameBinding/named_lazy_member_loading_swift_class.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Check that named-lazy-member-loading reduces the number of Decls deserialized
77
// RUN: %target-swift-frontend -typecheck -I %t -disable-named-lazy-member-loading -typecheck -stats-output-dir %t/stats-pre %s
88
// RUN: %target-swift-frontend -typecheck -I %t -stats-output-dir %t/stats-post %s
9-
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -10' %t/stats-pre %t/stats-post
9+
// RUN: %{python} %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -10' %t/stats-pre %t/stats-post
1010

1111
import NamedLazyMembers
1212

‎test/NameBinding/named_lazy_member_loading_swift_class_type.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Check that named-lazy-member-loading reduces the number of Decls deserialized
77
// RUN: %target-swift-frontend -typecheck -I %t -disable-named-lazy-member-loading -typecheck -stats-output-dir %t/stats-pre %s
88
// RUN: %target-swift-frontend -typecheck -I %t -stats-output-dir %t/stats-post %s
9-
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -10' %t/stats-pre %t/stats-post
9+
// RUN: %{python} %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -10' %t/stats-pre %t/stats-post
1010

1111
import NamedLazyMembers
1212

‎test/NameBinding/named_lazy_member_loading_swift_derived_class.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Check that named-lazy-member-loading reduces the number of Decls deserialized
77
// RUN: %target-swift-frontend -typecheck -I %t -disable-named-lazy-member-loading -typecheck -stats-output-dir %t/stats-pre %s
88
// RUN: %target-swift-frontend -typecheck -I %t -stats-output-dir %t/stats-post %s
9-
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -10' %t/stats-pre %t/stats-post
9+
// RUN: %{python} %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -10' %t/stats-pre %t/stats-post
1010

1111
import NamedLazyMembers
1212

‎test/NameBinding/named_lazy_member_loading_swift_derived_class_type.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Check that named-lazy-member-loading reduces the number of Decls deserialized
77
// RUN: %target-swift-frontend -typecheck -I %t -disable-named-lazy-member-loading -typecheck -stats-output-dir %t/stats-pre %s
88
// RUN: %target-swift-frontend -typecheck -I %t -stats-output-dir %t/stats-post %s
9-
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -10' %t/stats-pre %t/stats-post
9+
// RUN: %{python} %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -10' %t/stats-pre %t/stats-post
1010

1111
import NamedLazyMembers
1212

‎test/NameBinding/named_lazy_member_loading_swift_enum.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Check that named-lazy-member-loading reduces the number of Decls deserialized
77
// RUN: %target-swift-frontend -typecheck -I %t -disable-named-lazy-member-loading -typecheck -stats-output-dir %t/stats-pre %s
88
// RUN: %target-swift-frontend -typecheck -I %t -stats-output-dir %t/stats-post %s
9-
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -5' %t/stats-pre %t/stats-post
9+
// RUN: %{python} %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -5' %t/stats-pre %t/stats-post
1010

1111
import NamedLazyMembers
1212

‎test/NameBinding/named_lazy_member_loading_swift_proto.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Check that named-lazy-member-loading reduces the number of Decls deserialized
77
// RUN: %target-swift-frontend -typecheck -I %t -disable-named-lazy-member-loading -typecheck -stats-output-dir %t/stats-pre %s
88
// RUN: %target-swift-frontend -typecheck -I %t -stats-output-dir %t/stats-post %s
9-
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -3' %t/stats-pre %t/stats-post
9+
// RUN: %{python} %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -3' %t/stats-pre %t/stats-post
1010

1111
import NamedLazyMembers
1212

‎test/NameBinding/named_lazy_member_loading_swift_struct.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Check that named-lazy-member-loading reduces the number of Decls deserialized
77
// RUN: %target-swift-frontend -typecheck -I %t -disable-named-lazy-member-loading -typecheck -stats-output-dir %t/stats-pre %s
88
// RUN: %target-swift-frontend -typecheck -I %t -stats-output-dir %t/stats-post %s
9-
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -4' %t/stats-pre %t/stats-post
9+
// RUN: %{python} %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -4' %t/stats-pre %t/stats-post
1010

1111
import NamedLazyMembers
1212

‎test/NameBinding/named_lazy_member_loading_swift_struct_ext.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Check that named-lazy-member-loading reduces the number of Decls deserialized
77
// RUN: %target-swift-frontend -typecheck -I %t -disable-named-lazy-member-loading -typecheck -stats-output-dir %t/stats-pre %s
88
// RUN: %target-swift-frontend -typecheck -I %t -stats-output-dir %t/stats-post %s
9-
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -5' %t/stats-pre %t/stats-post
9+
// RUN: %{python} %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -5' %t/stats-pre %t/stats-post
1010

1111
import NamedLazyMembers
1212

‎test/NameBinding/named_lazy_member_loading_swift_struct_ext_mem.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Check that named-lazy-member-loading reduces the number of Decls deserialized
77
// RUN: %target-swift-frontend -typecheck -I %t -disable-named-lazy-member-loading -typecheck -stats-output-dir %t/stats-pre %s
88
// RUN: %target-swift-frontend -typecheck -I %t -stats-output-dir %t/stats-post %s
9-
// RUN: %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -5' %t/stats-pre %t/stats-post
9+
// RUN: %{python} %utils/process-stats-dir.py --evaluate-delta 'NumDeclsDeserialized < -5' %t/stats-pre %t/stats-post
1010

1111
import NamedLazyMembers
1212

‎test/SILOptimizer/hello-world.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: rm -rf %t && mkdir -p %t/stats
22
// RUN: %target-swift-frontend -emit-sil -stats-output-dir %t/stats %s -o /dev/null
3-
// RUN: %utils/process-stats-dir.py --evaluate 'NumSILGenFunctions < 10' %t/stats
4-
// RUN: %utils/process-stats-dir.py --evaluate 'NumSILOptFunctions < 10' %t/stats
3+
// RUN: %{python} %utils/process-stats-dir.py --evaluate 'NumSILGenFunctions < 10' %t/stats
4+
// RUN: %{python} %utils/process-stats-dir.py --evaluate 'NumSILOptFunctions < 10' %t/stats
55

66
print("Hello world")

0 commit comments

Comments
 (0)