-
Notifications
You must be signed in to change notification settings - Fork 29
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.
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
Try speeding up weeder with a bloom filter #186
Open
NorfairKing
wants to merge
1
commit into
ocharles:master
Choose a base branch
from
NorfairKing:bloomfilter
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,6 +17,7 @@ import Data.Function ( (&) ) | |
import Data.Set ( Set ) | ||
import qualified Data.Set as Set | ||
import qualified Data.Map.Strict as Map | ||
import qualified Data.BloomFilter.Easy as BloomFilter | ||
|
||
-- ghc | ||
import GHC.Plugins | ||
|
@@ -117,7 +118,9 @@ runWeeder weederConfig@Config{ rootPatterns, typeClassRoots, rootInstances, root | |
-- We only care about dead declarations if they have a span assigned, | ||
-- since they don't show up in the output otherwise | ||
dead = | ||
outputableDeclarations analysis Set.\\ reachableSet | ||
fastSpecialSetDifference | ||
(outputableDeclarations analysis) | ||
reachableSet | ||
|
||
warnings = | ||
Map.unionsWith (++) $ | ||
|
@@ -173,3 +176,17 @@ runWeeder weederConfig@Config{ rootPatterns, typeClassRoots, rootInstances, root | |
displayDeclaration :: Declaration -> String | ||
displayDeclaration d = | ||
moduleNameString ( moduleName ( declModule d ) ) <> "." <> occNameString ( declOccName d ) | ||
|
||
-- | This computes the same as (Set.\\) but is faster by assuming that the set difference will be small. | ||
-- I.e. there will be more non-weeds than weeds. | ||
-- | ||
fastSpecialSetDifference :: Set Declaration -> Set Declaration -> Set Declaration | ||
fastSpecialSetDifference allDecls usedDecls = | ||
let bloom = BloomFilter.easyList 0.05 (Set.toList usedDecls) | ||
-- The elem docs say: | ||
-- @ | ||
-- If the value is present, return True. If the value is not present, there is still some possibility that True will be returned. | ||
-- @ | ||
-- I.e. if some declaration is a weed, it will definitely show up in the result, but also some weeds will show up in the result. | ||
-- So we need to do another set difference afterwards, but with a much smaller set. | ||
in Set.difference (Set.filter (not . (`BloomFilter.elem` bloom)) allDecls) usedDecls | ||
Comment on lines
+186
to
+192
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm about 50% sure I got this backward in some way, so that might be part of the issue as well. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is definitely not fast, and could be why this approach doesn't work.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could be worth trying the
Uniquable
instance ofModule
andOccName
to produce hashes.(or maybe even better: the
Uniquable
instance of the originalName
s we derive the declarations from withnameToDeclaration
)