Skip to content

Reinstate the use of adjacency information for constraint gathering #26779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Aug 22, 2019
Merged

Reinstate the use of adjacency information for constraint gathering #26779

merged 2 commits into from
Aug 22, 2019

Conversation

@DougGregor
Copy link
Member

@DougGregor DougGregor commented Aug 22, 2019

This reinstates the use of direct adjacency information when gathering
constraints, effectively reverting 54bdd7b. One-way constraints get
added but aren't traversed. Fixes the regression tracked by
rdar://problem/54274245.

@DougGregor
[Constraint graph] Reinstate the adjacencies of constraint graph nodes.
cf1732c 
Reinstate the list of adjacencies in each constraint graph node,
effectively reverting
dfdd352. Exclude one-way constraints
from this computation; we'll handle them separately.
@DougGregor
[Constraint graph] Use adjacency info for constraint gathering.
34a7515 
This reinstates the use of direct adjacency information when gathering
constraints, effectively reverting
54bdd7b.
Fixes the regression that commit caused, which is tracked by
rdar://problem/54274245.
@DougGregor
Copy link
Member Author

DougGregor commented Aug 22, 2019

@swift-ci please smoke test

@DougGregor
Copy link
Member Author

DougGregor commented Aug 22, 2019

@swift-ci please test compiler performance

@DougGregor DougGregor merged commit 76fec49 into swiftlang:master Aug 22, 2019
@DougGregor DougGregor deleted the reinstate-adjacencies-based-gather-constraints branch August 22, 2019 20:09
@swift-ci
Copy link
Contributor

swift-ci commented Aug 23, 2019

Summary for master full

Unexpected test results, excluded stats for RxCocoa, Base64CoderSwiftUI, SwifterSwift

Regressions found (see below)

Debug-batch

debug-batch brief

Regressed (1)
name old new delta delta_pct
time.swift-driver.wall 4444.4s 4489.8s 45.4s 1.02% ⛔
Improved (0)
name old new delta delta_pct
Unchanged (delta < 1.0% or delta < 100.0ms) (2)
name old new delta delta_pct
Frontend.NumInstructionsExecuted 43,005,186,815,215 43,224,570,944,030 219,384,128,815 0.51%
LLVM.NumLLVMBytesOutput 1,787,660,072 1,787,670,828 10,756 0.0%

debug-batch detailed

Regressed (5)
name old new delta delta_pct
Driver.NumDriverPipePolls 67,241 68,320 1,079 1.6% ⛔
Driver.NumDriverPipeReads 56,448 57,548 1,100 1.95% ⛔
Sema.NumConstraintScopes 24,776,995 27,074,763 2,297,768 9.27% ⛔
Sema.NumConstraintsConsideredForEdgeContraction 74,007,882 86,043,667 12,035,785 16.26% ⛔
Sema.NumLeafScopes 16,042,558 17,425,370 1,382,812 8.62% ⛔
Improved (0)
name old new delta delta_pct
Unchanged (delta < 1.0% or delta < 100.0ms) (147)
name old new delta delta_pct
AST.NumASTBytesAllocated 59,485,265,601 59,575,628,765 90,363,164 0.15%
AST.NumDecls 140,002 140,002 0 0.0%
AST.NumDependencies 253,416 253,419 3 0.0%
AST.NumInfixOperators 53,782 53,782 0 0.0%
AST.NumLinkLibraries 0 0 0 0.0%
AST.NumLoadedModules 321,736 321,736 0 0.0%
AST.NumLocalTypeDecls 253 253 0 0.0%
AST.NumLookupInModule 6,089,986 6,090,105 119 0.0%
AST.NumLookupQualifiedInAnyObject 281 281 0 0.0%
AST.NumLookupQualifiedInModule 3,020,625 3,020,968 343 0.01%
AST.NumLookupQualifiedInNominal 7,760,896 7,763,610 2,714 0.03%
AST.NumModuleLookupClassMember 15,754 15,754 0 0.0%
AST.NumModuleLookupValue 41,528,229 41,528,568 339 0.0%
AST.NumObjCMethods 24,701 24,701 0 0.0%
AST.NumPostfixOperators 23 23 0 0.0%
AST.NumPrecedenceGroups 25,668 25,668 0 0.0%
AST.NumPrefixOperators 99 99 0 0.0%
AST.NumReferencedDynamicNames 189 189 0 0.0%
AST.NumReferencedMemberNames 6,322,437 6,322,367 -70 -0.0%
AST.NumReferencedTopLevelNames 477,030 477,030 0 0.0%
AST.NumSourceBuffers 395,556 395,556 0 0.0%
AST.NumSourceLines 4,685,544 4,685,544 0 0.0%
AST.NumSourceLinesPerSecond 3,491,981 3,500,941 8,960 0.26%
AST.NumTotalClangImportedEntities 5,660,765 5,662,894 2,129 0.04%
AST.NumUnqualifiedLookup 3,917,956 3,917,727 -229 -0.01%
Driver.ChildrenMaxRSS 195,192,770,560 195,381,280,768 188,510,208 0.1%
Driver.DriverDepCascadingDynamic 0 0 0 0.0%
Driver.DriverDepCascadingExternal 0 0 0 0.0%
Driver.DriverDepCascadingMember 0 0 0 0.0%
Driver.DriverDepCascadingNominal 0 0 0 0.0%
Driver.DriverDepCascadingTopLevel 0 0 0 0.0%
Driver.DriverDepDynamic 0 0 0 0.0%
Driver.DriverDepExternal 0 0 0 0.0%
Driver.DriverDepMember 0 0 0 0.0%
Driver.DriverDepNominal 0 0 0 0.0%
Driver.DriverDepTopLevel 0 0 0 0.0%
Driver.NumDriverJobsRun 27,904 27,904 0 0.0%
Driver.NumDriverJobsSkipped 0 0 0 0.0%
Driver.NumProcessFailures 0 0 0 0.0%
Frontend.MaxMallocUsage 978,595,977,984 979,997,180,960 1,401,202,976 0.14%
Frontend.NumInstructionsExecuted 43,005,186,815,215 43,224,570,944,030 219,384,128,815 0.51%
Frontend.NumProcessFailures 0 0 0 0.0%
IRModule.NumIRAliases 197,197 197,197 0 0.0%
IRModule.NumIRBasicBlocks 6,800,554 6,800,554 0 0.0%
IRModule.NumIRComdatSymbols 0 0 0 0.0%
IRModule.NumIRFunctions 3,364,031 3,364,031 0 0.0%
IRModule.NumIRGlobals 3,522,317 3,522,317 0 0.0%
IRModule.NumIRIFuncs 0 0 0 0.0%
IRModule.NumIRInsts 86,650,633 86,650,634 1 0.0%
IRModule.NumIRNamedMetaData 134,220 134,220 0 0.0%
IRModule.NumIRValueSymbols 6,231,344 6,231,344 0 0.0%
LLVM.NumLLVMBytesOutput 1,787,660,072 1,787,670,828 10,756 0.0%
Parse.NumFunctionsParsed 267,971 267,971 0 0.0%
Parse.NumIterableDeclContextParsed 714,105 714,054 -51 -0.01%
SILModule.NumSILGenDefaultWitnessTables 0 0 0 0.0%
SILModule.NumSILGenFunctions 1,709,476 1,709,475 -1 -0.0%
SILModule.NumSILGenGlobalVariables 53,884 53,884 0 0.0%
SILModule.NumSILGenVtables 18,576 18,576 0 0.0%
SILModule.NumSILGenWitnessTables 72,169 72,169 0 0.0%
SILModule.NumSILOptDefaultWitnessTables 0 0 0 0.0%
SILModule.NumSILOptFunctions 2,441,630 2,441,630 0 0.0%
SILModule.NumSILOptGlobalVariables 55,508 55,508 0 0.0%
SILModule.NumSILOptVtables 31,332 31,332 0 0.0%
SILModule.NumSILOptWitnessTables 157,752 157,752 0 0.0%
Sema.AccessLevelRequest 12,434,164 12,464,329 30,165 0.24%
Sema.AttachedFunctionBuilderRequest 3 3 0 0.0%
Sema.AttachedPropertyWrapperTypeRequest 515,429 515,429 0 0.0%
Sema.AttachedPropertyWrappersRequest 2,132,747 2,132,747 0 0.0%
Sema.CollectOverriddenDeclsRequest 7,784,705 7,808,958 24,253 0.31%
Sema.CursorInfoRequest 0 0 0 0.0%
Sema.CustomAttrNominalRequest 3 3 0 0.0%
Sema.DefaultAndMaxAccessLevelRequest 54,973 54,973 0 0.0%
Sema.DefaultDefinitionTypeRequest 7,903 7,903 0 0.0%
Sema.DefaultTypeRequest 459,611 459,631 20 0.0%
Sema.EmittedMembersRequest 26,648 26,648 0 0.0%
Sema.EnumRawTypeRequest 22,799 22,799 0 0.0%
Sema.ExistentialConformsToSelfRequest 20,847 20,832 -15 -0.07%
Sema.ExistentialTypeSupportedRequest 16,539 16,539 0 0.0%
Sema.ExtendedNominalRequest 5,928,389 5,934,492 6,103 0.1%
Sema.FunctionBuilderTypeRequest 3 3 0 0.0%
Sema.GetDestructorRequest 27,132 27,132 0 0.0%
Sema.HasDynamicMemberLookupAttributeRequest 0 0 0 0.0%
Sema.InheritedDeclsReferencedRequest 5,701,837 5,709,783 7,946 0.14%
Sema.InheritedTypeRequest 307,042 306,913 -129 -0.04%
Sema.InitKindRequest 106,451 106,451 0 0.0%
Sema.IsAccessorTransparentRequest 315,162 315,162 0 0.0%
Sema.IsDeclApplicableRequest 0 0 0 0.0%
Sema.IsDynamicRequest 1,626,868 1,626,868 0 0.0%
Sema.IsFinalRequest 2,611,800 2,613,708 1,908 0.07%
Sema.IsGetterMutatingRequest 434,048 434,048 0 0.0%
Sema.IsImplicitlyUnwrappedOptionalRequest 2,449,641 2,449,632 -9 -0.0%
Sema.IsObjCRequest 1,564,512 1,564,462 -50 -0.0%
Sema.IsSetterMutatingRequest 347,741 347,741 0 0.0%
Sema.LazyStoragePropertyRequest 2,400 2,400 0 0.0%
Sema.MangleLocalTypeDeclRequest 506 506 0 0.0%
Sema.NamedLazyMemberLoadFailureCount 19,703 19,713 10 0.05%
Sema.NamedLazyMemberLoadSuccessCount 28,520,445 28,593,402 72,957 0.26%
Sema.NominalTypeLookupDirectCount 36,096,231 36,125,612 29,381 0.08%
Sema.NumAccessorBodiesSynthesized 189,252 189,252 0 0.0%
Sema.NumAccessorsSynthesized 289,230 289,230 0 0.0%
Sema.NumConformancesDeserialized 9,061,342 9,078,309 16,967 0.19%
Sema.NumCyclicOneWayComponentsCollapsed 0 0 0 0.0%
Sema.NumDeclsDeserialized 70,972,516 71,094,414 121,898 0.17%
Sema.NumDeclsTypechecked 1,403,505 1,403,505 0 0.0%
Sema.NumDeclsValidated 2,493,275 2,493,254 -21 -0.0%
Sema.NumFunctionsTypechecked 527,252 527,252 0 0.0%
Sema.NumGenericSignatureBuilders 1,357,529 1,358,854 1,325 0.1%
Sema.NumLazyGenericEnvironments 12,857,498 12,881,311 23,813 0.19%
Sema.NumLazyGenericEnvironmentsLoaded 311,515 311,419 -96 -0.03%
Sema.NumLazyIterableDeclContexts 8,516,590 8,524,291 7,701 0.09%
Sema.NumLazyRequirementSignatures 861,892 862,120 228 0.03%
Sema.NumLazyRequirementSignaturesLoaded 570,854 571,058 204 0.04%
Sema.NumTypesDeserialized 20,727,655 20,750,419 22,764 0.11%
Sema.NumTypesValidated 1,706,298 1,706,292 -6 -0.0%
Sema.NumUnloadedLazyIterableDeclContexts 5,198,068 5,197,973 -95 -0.0%
Sema.OpaqueReadOwnershipRequest 273,007 273,007 0 0.0%
Sema.OverriddenDeclsRequest 2,415,965 2,417,580 1,615 0.07%
Sema.PropertyWrapperBackingPropertyInfoRequest 510,305 510,305 0 0.0%
Sema.PropertyWrapperBackingPropertyTypeRequest 515,429 515,429 0 0.0%
Sema.PropertyWrapperMutabilityRequest 612,163 612,163 0 0.0%
Sema.PropertyWrapperTypeInfoRequest 1 1 0 0.0%
Sema.ProtocolRequiresClassRequest 80,664 80,555 -109 -0.14%
Sema.ProvideDefaultImplForRequest 7,784,705 7,808,958 24,253 0.31%
Sema.RangeInfoRequest 0 0 0 0.0%
Sema.RequirementRequest 108,441 108,450 9 0.01%
Sema.RequirementSignatureRequest 657,932 658,023 91 0.01%
Sema.RequiresOpaqueAccessorsRequest 1,311,500 1,311,500 0 0.0%
Sema.RequiresOpaqueModifyCoroutineRequest 264,389 264,389 0 0.0%
Sema.ResilienceExpansionRequest 1,748,114 1,748,106 -8 -0.0%
Sema.ResolveProtocolNameRequest 0 0 0 0.0%
Sema.RootAndResultTypeOfKeypathDynamicMemberRequest 0 0 0 0.0%
Sema.RootTypeOfKeypathDynamicMemberRequest 0 0 0 0.0%
Sema.SelfAccessKindRequest 5,528,272 5,531,341 3,069 0.06%
Sema.SelfBoundsFromWhereClauseRequest 7,529,543 7,542,623 13,080 0.17%
Sema.SetterAccessLevelRequest 149,654 149,654 0 0.0%
Sema.StorageImplInfoRequest 1,182,857 1,182,857 0 0.0%
Sema.StoredPropertiesAndMissingMembersRequest 30,980 30,980 0 0.0%
Sema.StoredPropertiesRequest 314,826 314,826 0 0.0%
Sema.StructuralTypeRequest 0 0 0 0.0%
Sema.SuperclassDeclRequest 441,027 441,060 33 0.01%
Sema.SuperclassTypeRequest 52,020 52,020 0 0.0%
Sema.SynthesizeAccessorRequest 289,230 289,230 0 0.0%
Sema.TypeCheckFunctionBodyUntilRequest 527,252 527,252 0 0.0%
Sema.TypeDeclsFromWhereClauseRequest 28,964 28,964 0 0.0%
Sema.TypeRelationCheckRequest 0 0 0 0.0%
Sema.USRGenerationRequest 8,950,010 8,978,910 28,900 0.32%
Sema.UnderlyingTypeDeclsReferencedRequest 273,720 273,954 234 0.09%

Release

release brief

Regressed (0)
name old new delta delta_pct
Improved (0)
name old new delta delta_pct
Unchanged (delta < 1.0% or delta < 100.0ms) (3)
name old new delta delta_pct
Frontend.NumInstructionsExecuted 47,070,511,270,479 47,255,401,709,037 184,890,438,558 0.39%
LLVM.NumLLVMBytesOutput 1,541,591,234 1,541,596,414 5,180 0.0%
time.swift-driver.wall 7506.8s 7533.4s 26.6s 0.35%

release detailed

Regressed (1)
name old new delta delta_pct
Sema.NumConstraintScopes 24,309,822 26,603,733 2,293,911 9.44% ⛔
Improved (0)
name old new delta delta_pct
Unchanged (delta < 1.0% or delta < 100.0ms) (20)
name old new delta delta_pct
AST.NumLoadedModules 30,333 30,333 0 0.0%
AST.NumTotalClangImportedEntities 1,231,537 1,231,537 0 0.0%
IRModule.NumIRBasicBlocks 5,632,953 5,632,945 -8 -0.0%
IRModule.NumIRFunctions 2,856,736 2,856,736 0 0.0%
IRModule.NumIRGlobals 3,026,851 3,026,851 0 0.0%
IRModule.NumIRInsts 53,112,869 53,112,848 -21 -0.0%
IRModule.NumIRValueSymbols 5,526,332 5,526,332 0 0.0%
LLVM.NumLLVMBytesOutput 1,541,591,234 1,541,596,414 5,180 0.0%
SILModule.NumSILGenFunctions 1,191,467 1,191,466 -1 -0.0%
SILModule.NumSILOptFunctions 1,681,840 1,681,840 0 0.0%
Sema.NumConformancesDeserialized 3,930,087 3,930,087 0 0.0%
Sema.NumDeclsDeserialized 10,453,700 10,453,700 0 0.0%
Sema.NumDeclsValidated 1,826,146 1,826,146 0 0.0%
Sema.NumFunctionsTypechecked 530,874 530,874 0 0.0%
Sema.NumGenericSignatureBuilders 302,395 302,395 0 0.0%
Sema.NumLazyGenericEnvironments 2,062,676 2,062,676 0 0.0%
Sema.NumLazyGenericEnvironmentsLoaded 35,748 35,748 0 0.0%
Sema.NumLazyIterableDeclContexts 1,330,132 1,330,132 0 0.0%
Sema.NumTypesDeserialized 5,621,264 5,621,264 0 0.0%
Sema.NumTypesValidated 947,067 947,067 0 0.0%

@DougGregor DougGregor mentioned this pull request Aug 23, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@DougGregor @swift-ci