OSSA: migrate & organize simplify-cfg tests #38456

atrick · 2021-07-17T03:53:03Z

Migrate all the simplify-cfg tests to OSSA and organize them by functionality for staging and debugging sanity (there were a massive number of disorganized tests for this pass).

This PR also adds some basic support for handling trivial block arguments just so that most tests will pass.

This is work in progress. We still need to enable some of the tests and add more tests for OSSA functionality before completely turning on the pass.

I'm merging incrementally now so anyone can make progress. This has been sitting on a branch for 4 months.

This introduces two temporary testing flags. -enable-ossa-simplifycfg and -enable-ossa-jumpthread-simplifycfg. They allow running simplify-cfg test cases without affecting regular compilation. The flags will be removed as soon as we have enough test coverage to confidently enable these parts of simplify-cfg that are still guarded by the flag.

The following test files still need to be enabled
simplify_bb_args.sil
simplify_cfg_args_ossa_disabled.sil
simplify_cfg_checkcast.sil
simplify_cfg_ossa_disabled.sil

atrick · 2021-07-17T03:54:02Z

@swift-ci test

atrick · 2021-07-17T03:54:08Z

@swift-ci benchmark

swift-ci · 2021-07-17T04:30:56Z

Build failed
Swift Test OS X Platform
Git Sha - e9856fd88d7f3f96249f66f90144a0079a1242c5

swift-ci · 2021-07-17T04:40:40Z

Build failed
Swift Test Linux Platform
Git Sha - e9856fd88d7f3f96249f66f90144a0079a1242c5

swift-ci · 2021-07-17T05:09:12Z

Performance (x86_64): -O

Regression	OLD	NEW	DELTA	RATIO
DictionaryOfAnyHashableStrings_insert	2884	5586	+93.7%	0.52x
ArrayAppendOptionals	1330	2500	+88.0%	0.53x (?)
Set.isDisjoint.Box25	357	508	+42.3%	0.70x (?)
Set.isDisjoint.Int50	268	340	+26.9%	0.79x (?)
DictionaryKeysContainsNative	21	26	+23.8%	0.81x (?)

Improvement	OLD	NEW	DELTA	RATIO
ObjectiveCBridgeStubFromArrayOfNSString2	2850	2660	-6.7%	1.07x (?)

Code size: -O

Performance (x86_64): -Osize

Regression	OLD	NEW	DELTA	RATIO
FlattenListFlatMap	4089	6976	+70.6%	0.59x (?)
NSError	184	206	+12.0%	0.89x (?)

Improvement	OLD	NEW	DELTA	RATIO
NSStringConversion.Rebridge.Long	181	168	-7.2%	1.08x (?)

Code size: -Osize

Performance (x86_64): -Onone

Improvement	OLD	NEW	DELTA	RATIO
StringBuilderWithLongSubstring	4020	3500	-12.9%	1.15x (?)
String.data.LargeUnicode	174	161	-7.5%	1.08x (?)

Code size: -swiftlibs

How to read the data

The tables contain differences in performance which are larger than 8% and differences in code size which are larger than 1%.

If you see any unexpected regressions, you should consider fixing the
regressions before you merge the PR.

Noise: Sometimes the performance results (not code size!) contain false
alarms. Unexpected regressions which are marked with '(?)' are probably noise.
If you see regressions which you cannot explain you can try to run the
benchmarks again. If regressions still show up, please consult with the
performance team (@eeckstein).

Hardware Overview

  Model Name: Mac Pro
  Model Identifier: MacPro6,1
  Processor Name: 12-Core Intel Xeon E5
  Processor Speed: 2.7 GHz
  Number of Processors: 1
  Total Number of Cores: 12
  L2 Cache (per Core): 256 KB
  L3 Cache: 30 MB
  Memory: 64 GB

For switch_enum and dynamic_method_br

This will be gated by a testing flag while tests are staged in.

Support for non-trivial args will be added separately.

as temporary flags to gradually stage in OSSA tests.

DeadEndBlocks is used by low-level OSSA utilities. It needs to be valid whenever OSSA transformations is being done.

For staging in OSSA jump-threading. Currently disabled.

atrick · 2021-07-18T03:25:24Z

@swift-ci test

atrick · 2021-07-18T03:25:31Z

@swift-ci benchmark

swift-ci · 2021-07-18T04:12:25Z

Performance (x86_64): -O

Regression	OLD	NEW	DELTA	RATIO
DictionaryOfAnyHashableStrings_insert	2954	5628	+90.5%	0.52x
Set.isDisjoint.Int25	268	346	+29.1%	0.77x (?)
Set.isDisjoint.Int50	268	338	+26.1%	0.79x (?)
DictionaryKeysContainsNative	21	26	+23.8%	0.81x (?)
ObjectiveCBridgeStubFromNSDateRef	4200	5120	+21.9%	0.82x (?)
DictionaryKeysContainsCocoa	27	31	+14.8%	0.87x (?)
StringRemoveDupes	268	293	+9.3%	0.91x (?)

Improvement	OLD	NEW	DELTA	RATIO
FlattenListLoop	2553	1630	-36.2%	1.57x (?)
FlattenListFlatMap	6731	4372	-35.0%	1.54x (?)

Code size: -O

Performance (x86_64): -Osize

Regression	OLD	NEW	DELTA	RATIO
FlattenListFlatMap	3943	4827	+22.4%	0.82x (?)

Improvement	OLD	NEW	DELTA	RATIO
NSStringConversion.MutableCopy.Rebridge	1173	1077	-8.2%	1.09x (?)
DictionaryKeysContainsCocoa	28	26	-7.1%	1.08x (?)

Code size: -Osize

Performance (x86_64): -Onone

Regression	OLD	NEW	DELTA	RATIO
String.data.LargeUnicode	170	189	+11.2%	0.90x (?)
NSStringConversion.Rebridge.Medium	278	299	+7.6%	0.93x (?)
NSStringConversion.Rebridge.Long	278	299	+7.6%	0.93x (?)

Improvement	OLD	NEW	DELTA	RATIO
StringBuilderLong	1990	1810	-9.0%	1.10x (?)
NSError	738	687	-6.9%	1.07x (?)

Code size: -swiftlibs

How to read the data

The tables contain differences in performance which are larger than 8% and differences in code size which are larger than 1%.

If you see any unexpected regressions, you should consider fixing the
regressions before you merge the PR.

Noise: Sometimes the performance results (not code size!) contain false
alarms. Unexpected regressions which are marked with '(?)' are probably noise.
If you see regressions which you cannot explain you can try to run the
benchmarks again. If regressions still show up, please consult with the
performance team (@eeckstein).

Hardware Overview

  Model Name: Mac Pro
  Model Identifier: MacPro6,1
  Processor Name: 12-Core Intel Xeon E5
  Processor Speed: 2.7 GHz
  Number of Processors: 1
  Total Number of Cores: 12
  L2 Cache (per Core): 256 KB
  L3 Cache: 30 MB
  Memory: 64 GB

And organize the tests by the features/optimizations that they require! <file containing non-OSSA tests> -> <files containing OSSA tests> simplify-cfg-debugonly.sil -> simplify_cfg_checkcast.sil simplify-cfg-stress-test.sil -> simplify_cfg_stress_ossa.sil simplify_cfg_address_phi.sil -> simplify_cfg_simple_jumpthread.sil -> simplify_cfg_dom_jumpthread.sil simplify_cfg_and_combine.sil -> simplify_cfg_and_combine_ossa.sil simplify_cfg_args.sil -> simplify_cfg_args_ossa.sil -> simplify_cfg_args_ossa_disabled.sil simplify_cfg_args_crash.sil -> simplify_bb_args.sil simplify_cfg.sil -> simplify_cfg_ossa.sil -> simplify_cfg_ossa_disabled.sil -> simplify_cfg_tryapply.sil -> simplify_cfg_trivial_jumpthread.sil -> simplify_cfg_simple_jumpthread.sil -> simplify_cfg_checkcast.sil -> simplify_cfg_dom_jumpthread.sil simplify_cfg_jump_thread_crash.sil -> simplify_cfg_dom_jumpthread.sil simplify_cfg_opaque.sil -> <self> simplify_cfg_select_enum.sil -> simplify_cfg_dom_jumpthread.sil simplify_cfg_simple.sil -> simplify_cfg_ossa.sil -> simplify_cfg_simple_jumpthread.sil simplify_cfg_unique_values.sil -> simplify_cfg_dominators.sil simplify_switch_enum_objc.sil -> simplify_switch_enum_objc.sil

atrick · 2021-07-18T04:42:50Z

@swift-ci test

swift-ci · 2021-07-18T05:57:27Z

Build failed
Swift Test OS X Platform
Git Sha - 59ad8c9

swift-ci · 2021-07-18T06:05:36Z

Build failed
Swift Test Linux Platform
Git Sha - 59ad8c9

atrick · 2021-07-18T15:52:37Z

@swift-ci smoke test

atrick · 2021-07-18T16:01:39Z

Filed a priority bug to fix the benchmark regression ASAP, but in parallel with other tasks (it's blocking multiple unrelated PRs)
rdar://80746149 (Fix 90% performance regression in benchmark DictionaryOfAnyHashableStrings_insert)

atrick · 2021-07-18T19:57:16Z

@swift-ci smoke test macOS

atrick · 2021-07-18T19:57:41Z

@swift-ci test windows

atrick requested review from gottesmm, meg-gupta and nate-chandler July 17, 2021 03:53

atrick and others added 12 commits July 17, 2021 18:31

Rename getTerminatorForResultArg to getTerminatorForResult.

f822349

OSSA: Allow BasicBlockUtils getEdgeArgs to create guaranteed phis

9d5b0d5

For switch_enum and dynamic_method_br

OSSA: Support SimplifyCFG tryJumpThreading for testing.

8a45b5f

This will be gated by a testing flag while tests are staged in.

OSSA: SimplifyCFG. Only jump thread for trivial dest block args.

c46acc0

Support for non-trivial args will be added separately.

Add -enable-ossa-simplifycfg and -enable-ossa-jumpthread-simplifycfg

74e928b

as temporary flags to gradually stage in OSSA tests.

Add IsInfiniteJumpThreadingBudget for testing

5493362

SimplifyCFG OSSA support for trivial switch_enum.

e6ec4e4

BasicBlockCloner: support for updating DeadEndBlocks.

8e4c27d

DeadEndBlocks is used by low-level OSSA utilities. It needs to be valid whenever OSSA transformations is being done.

OSSA: SimplifyCFG. Add DeadEndBlocks and pass it to jump-threading.

ca1c46b

SimplifyCFG add tracing

19007a6

simplify_cfg.sil Strip unnecessary options and imports

23599f0

Create simplify_cfg_checkcast_jumpthread.sil test.

073327b

For staging in OSSA jump-threading. Currently disabled.

atrick force-pushed the ossa-jumpthread-test branch from e9856fd to e7fcd68 Compare July 18, 2021 02:37

atrick force-pushed the ossa-jumpthread-test branch from e7fcd68 to 59ad8c9 Compare July 18, 2021 04:40

atrick merged commit ff1f419 into swiftlang:main Jul 18, 2021

atrick deleted the ossa-jumpthread-test branch July 18, 2021 22:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

OSSA: migrate & organize simplify-cfg tests #38456

OSSA: migrate & organize simplify-cfg tests #38456

Uh oh!

atrick commented Jul 17, 2021

Uh oh!

atrick commented Jul 17, 2021

Uh oh!

atrick commented Jul 17, 2021

Uh oh!

swift-ci commented Jul 17, 2021

Uh oh!

swift-ci commented Jul 17, 2021

Uh oh!

swift-ci commented Jul 17, 2021

Uh oh!

atrick commented Jul 18, 2021

Uh oh!

atrick commented Jul 18, 2021

Uh oh!

swift-ci commented Jul 18, 2021

Uh oh!

atrick commented Jul 18, 2021

Uh oh!

swift-ci commented Jul 18, 2021

Uh oh!

swift-ci commented Jul 18, 2021

Uh oh!

atrick commented Jul 18, 2021

Uh oh!

atrick commented Jul 18, 2021

Uh oh!

atrick commented Jul 18, 2021

Uh oh!

atrick commented Jul 18, 2021

Uh oh!

Uh oh!

OSSA: migrate & organize simplify-cfg tests #38456

OSSA: migrate & organize simplify-cfg tests #38456

Uh oh!

Conversation

atrick commented Jul 17, 2021

Uh oh!

atrick commented Jul 17, 2021

Uh oh!

atrick commented Jul 17, 2021

Uh oh!

swift-ci commented Jul 17, 2021

Uh oh!

swift-ci commented Jul 17, 2021

Uh oh!

swift-ci commented Jul 17, 2021

Performance (x86_64): -O

Code size: -O

Performance (x86_64): -Osize

Code size: -Osize

Performance (x86_64): -Onone

Code size: -swiftlibs

Uh oh!

atrick commented Jul 18, 2021

Uh oh!

atrick commented Jul 18, 2021

Uh oh!

swift-ci commented Jul 18, 2021

Performance (x86_64): -O

Code size: -O

Performance (x86_64): -Osize

Code size: -Osize

Performance (x86_64): -Onone

Code size: -swiftlibs

Uh oh!

atrick commented Jul 18, 2021

Uh oh!

swift-ci commented Jul 18, 2021

Uh oh!

swift-ci commented Jul 18, 2021

Uh oh!

atrick commented Jul 18, 2021

Uh oh!

atrick commented Jul 18, 2021

Uh oh!

atrick commented Jul 18, 2021

Uh oh!

atrick commented Jul 18, 2021

Uh oh!

Uh oh!