Skip to content
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

Rename makeCsPoppyBlocks2 to makeCsPoppyBlocks #38

Merged
merged 1 commit into from
Mar 30, 2019
Merged

Rename makeCsPoppyBlocks2 to makeCsPoppyBlocks #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bench/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ benchMakeCsPoppyBlocks = do
let files = ("data/" ++) <$> (".ib" `isSuffixOf`) `filter` entries
return (mkBenchmark <$> files)
where mkBenchmark filename = env (mmapFromForeignRegion filename) $ \(v :: DVS.Vector Word64) -> bgroup filename
[ bench "makeCsPoppyBlocks2" (whnf makeCsPoppyBlocks2 v)
[ bench "makeCsPoppyBlocks" (whnf makeCsPoppyBlocks v)
]

benchMakeCsPoppyLayerM :: IO [Benchmark]
Expand All @@ -117,7 +117,7 @@ benchMakeCsPoppyLayerM = do
]
mkEnv filename = do
!v <- mmapFromForeignRegion filename
return (makeCsPoppyBlocks2 v)
return (makeCsPoppyBlocks v)

benchGenCsSamples :: IO [Benchmark]
benchGenCsSamples = do
Expand All @@ -129,7 +129,7 @@ benchGenCsSamples = do
]
mkEnv filename = do
!v <- mmapFromForeignRegion filename
let !blocks = makeCsPoppyBlocks2 v
let !blocks = makeCsPoppyBlocks v
let !layerM = makeCsPoppyLayerM blocks
return (getCsiTotal (CsInterleaved (lastOrZero layerM)), v)

Expand Down
2 changes: 1 addition & 1 deletion src/HaskellWorks/Data/RankSelect/CsPoppy.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ makeCsPoppy v = CsPoppy
, csPoppyLayerM = layerM
, csPoppyLayerS = layerS
}
where blocks = makeCsPoppyBlocks2 v
where blocks = makeCsPoppyBlocks v
layerM = makeCsPoppyLayerM2 blocks
layerMPopCount = getCsiTotal (CsInterleaved (lastOrZero layerM))
layerS = genCsSamples layerMPopCount v
Expand Down
6 changes: 3 additions & 3 deletions src/HaskellWorks/Data/RankSelect/CsPoppy/Internal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module HaskellWorks.Data.RankSelect.CsPoppy.Internal
, putCsiC
, indexOrZero
, lastOrZero
, makeCsPoppyBlocks2
, makeCsPoppyBlocks
, makeCsPoppyLayerM
, makeCsPoppyLayerM2
, genCsSamples
Expand Down Expand Up @@ -85,8 +85,8 @@ putCsiC v (CsInterleaved i) = CsInterleaved (((v .&. 0x3ff) .<. 52) .|. (i
instance Show CsInterleaved where
showsPrec _ i = shows (getCsiX i, getCsiA i, getCsiB i, getCsiC i)

makeCsPoppyBlocks2 :: DVS.Vector Word64 -> DVS.Vector Word64
makeCsPoppyBlocks2 v = DVS.constructN (((DVS.length v + 8 - 1) `div` 8) + 1) genBlocks
makeCsPoppyBlocks :: DVS.Vector Word64 -> DVS.Vector Word64
makeCsPoppyBlocks v = DVS.constructN (((DVS.length v + 8 - 1) `div` 8) + 1) genBlocks
where e = DVS.length v
genBlocks :: DVS.Vector Word64 -> Word64
genBlocks u = let i = DVS.length u in if
Expand Down
4 changes: 2 additions & 2 deletions test/HaskellWorks/Data/RankSelect/CsPoppy/InternalSpec.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ spec = describe "HaskellWorks.Data.RankSelect.CsInterleavedSpec" $ do
getCsiA (putCsiA va (CsInterleaved 0)) === (va .&. 0x3ff)
getCsiB (putCsiB vb (CsInterleaved 0)) === (vb .&. 0x3ff)
getCsiC (putCsiC vc (CsInterleaved 0)) === (vc .&. 0x3ff)
describe "makeCsPoppyBlocks2" $ do
describe "makeCsPoppyBlocks" $ do
it "must behave like makeCsPoppyBlocks1" $ requireProperty $ do
xs <- forAll $ G.list (R.linear 0 1000) (G.word64 R.constantBounded)
v <- forAll $ pure $ DVS.fromList xs
a <- forAll $ pure $ makeCsPoppyBlocks2 v
a <- forAll $ pure $ makeCsPoppyBlocks v
e <- forAll $ pure $ makeCsPoppyBlocksRef v
a === e