Skip to content

Commit

Permalink
Fourth implementation, remove next alloc
Browse files Browse the repository at this point in the history 
❯ time .stack-work/install/x86_64-osx/lts-13.21/8.6.5/bin/bingo-sim 100000
Trials:   100000
Bingos:   3670
Hit rate: 0.0367
    0.08s user 0.01s system 86% cpu 0.101 total
  • Loading branch information
@jez
jez committed May 19, 2019
1 parent 0a04839 commit 4048469
Show file tree
Hide file tree
Showing 5 changed files with 117 additions and 18 deletions.
4 changes: 2 additions & 2 deletions bingo-sim.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ cabal-version: 1.12
--
-- see: https://github.com/sol/hpack
--
-- hash: 3fa6868be54f56e844ce88095718d2f5be4a44d809a636babdeadda66d9faeba
-- hash: 722efc688c7d34bdbe0a8a50324f74bfab1fc251f16b7f108844ae6a3f28e9ab

name: bingo-sim
version: 0.0.3.0
version: 0.0.4.0
synopsis: A small playground to learn about profiling Haskell.

description: This package simulates the probability of scoring a bingo at a particular children's carnival game. I've been using it to learn how profiling in Haskell works.
Expand Down
2 changes: 1 addition & 1 deletion package.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: bingo-sim
version: 0.0.3.0
version: 0.0.4.0
homepage: https://github.com/jez/bingo-sim
author: Jake Zimmerman
maintainer: zimmerman.jake@gmail.com
Expand Down
88 changes: 88 additions & 0 deletions prof/bingo-sim.4.prof
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
Mon May 20 01:37 2019 Time and Allocation Profiling Report (Final)

bingo-sim +RTS -p -RTS 100000

total time = 0.43 secs (431 ticks @ 1000 us, 1 processor)
total alloc = 808,788,160 bytes (excludes profiling overheads)

COST CENTRE MODULE SRC %time %alloc

next BingoSim.Prng src/BingoSim/Prng.hs:(79,1)-(91,40) 50.6 48.5
shuffleBits.withRand BingoSim.Simulation src/BingoSim/Simulation.hs:(125,3)-(128,39) 16.5 31.2
shuffleBits.withRand.bs' BingoSim.Simulation src/BingoSim/Simulation.hs:127:9-45 13.7 6.9
swapBits BingoSim.Simulation src/BingoSim/Simulation.hs:(140,1)-(143,46) 10.0 6.3
shuffleBits BingoSim.Simulation src/BingoSim/Simulation.hs:(121,1)-(128,39) 4.4 0.0
next.result BingoSim.Prng src/BingoSim/Prng.hs:80:7-41 1.9 6.9


individual inherited
COST CENTRE MODULE SRC no. entries %time %alloc %time %alloc

MAIN MAIN <built-in> 193 0 0.0 0.0 100.0 100.0
CAF GHC.Conc.Signal <entire-module> 290 0 0.0 0.0 0.0 0.0
CAF GHC.Float <entire-module> 282 0 0.0 0.0 0.0 0.0
CAF GHC.IO.Encoding <entire-module> 272 0 0.0 0.0 0.0 0.0
CAF GHC.IO.Encoding.Iconv <entire-module> 270 0 0.0 0.0 0.0 0.0
CAF GHC.IO.Handle.FD <entire-module> 261 0 0.0 0.0 0.0 0.0
CAF Text.Printf <entire-module> 224 0 0.0 0.0 0.0 0.0
CAF Text.Read.Lex <entire-module> 222 0 0.0 0.0 0.0 0.0
CAF:col1 BingoSim.Board src/BingoSim/Board.hs:148:1-4 345 0 0.0 0.0 0.0 0.0
col1 BingoSim.Board src/BingoSim/Board.hs:148:1-45 419 1 0.0 0.0 0.0 0.0
CAF:col2 BingoSim.Board src/BingoSim/Board.hs:151:1-4 344 0 0.0 0.0 0.0 0.0
col2 BingoSim.Board src/BingoSim/Board.hs:151:1-45 420 1 0.0 0.0 0.0 0.0
CAF:col3 BingoSim.Board src/BingoSim/Board.hs:154:1-4 343 0 0.0 0.0 0.0 0.0
col3 BingoSim.Board src/BingoSim/Board.hs:154:1-45 421 1 0.0 0.0 0.0 0.0
CAF:col4 BingoSim.Board src/BingoSim/Board.hs:157:1-4 342 0 0.0 0.0 0.0 0.0
col4 BingoSim.Board src/BingoSim/Board.hs:157:1-45 422 1 0.0 0.0 0.0 0.0
CAF:col5 BingoSim.Board src/BingoSim/Board.hs:160:1-4 341 0 0.0 0.0 0.0 0.0
col5 BingoSim.Board src/BingoSim/Board.hs:160:1-45 423 1 0.0 0.0 0.0 0.0
CAF:col6 BingoSim.Board src/BingoSim/Board.hs:163:1-4 339 0 0.0 0.0 0.0 0.0
col6 BingoSim.Board src/BingoSim/Board.hs:163:1-45 424 1 0.0 0.0 0.0 0.0
CAF:dia1 BingoSim.Board src/BingoSim/Board.hs:124:1-4 354 0 0.0 0.0 0.0 0.0
dia1 BingoSim.Board src/BingoSim/Board.hs:124:1-45 411 1 0.0 0.0 0.0 0.0
CAF:dia2 BingoSim.Board src/BingoSim/Board.hs:127:1-4 353 0 0.0 0.0 0.0 0.0
dia2 BingoSim.Board src/BingoSim/Board.hs:127:1-45 412 1 0.0 0.0 0.0 0.0
CAF:lvl1_r64x BingoSim.Simulation <no location info> 311 0 0.0 0.0 0.0 0.0
CAF:lvl3_r64z BingoSim.Simulation <no location info> 312 0 0.0 0.0 0.0 0.0
CAF:lvl5_r64B BingoSim.Simulation <no location info> 313 0 0.0 0.0 0.0 0.0
CAF:lvl6_r64C BingoSim.Simulation <no location info> 314 0 0.0 0.0 0.0 0.0
runSimulation BingoSim.Simulation src/BingoSim/Simulation.hs:(68,1)-(84,41) 394 0 0.0 0.0 0.0 0.0
mkState BingoSim.Prng src/BingoSim/Prng.hs:(56,1)-(58,39) 395 1 0.0 0.0 0.0 0.0
CAF:main1 Main <no location info> 384 0 0.0 0.0 0.0 0.0
main Main app/Main.hs:(10,1)-(12,30) 386 1 0.0 0.0 0.0 0.0
CAF:main4 Main <no location info> 381 0 0.0 0.0 0.0 0.0
CAF:row1 BingoSim.Board src/BingoSim/Board.hs:130:1-4 351 0 0.0 0.0 0.0 0.0
row1 BingoSim.Board src/BingoSim/Board.hs:130:1-45 413 1 0.0 0.0 0.0 0.0
CAF:row2 BingoSim.Board src/BingoSim/Board.hs:133:1-4 350 0 0.0 0.0 0.0 0.0
row2 BingoSim.Board src/BingoSim/Board.hs:133:1-45 414 1 0.0 0.0 0.0 0.0
CAF:row3 BingoSim.Board src/BingoSim/Board.hs:136:1-4 349 0 0.0 0.0 0.0 0.0
row3 BingoSim.Board src/BingoSim/Board.hs:136:1-45 415 1 0.0 0.0 0.0 0.0
CAF:row4 BingoSim.Board src/BingoSim/Board.hs:139:1-4 348 0 0.0 0.0 0.0 0.0
row4 BingoSim.Board src/BingoSim/Board.hs:139:1-45 416 1 0.0 0.0 0.0 0.0
CAF:row5 BingoSim.Board src/BingoSim/Board.hs:142:1-4 347 0 0.0 0.0 0.0 0.0
row5 BingoSim.Board src/BingoSim/Board.hs:142:1-45 417 1 0.0 0.0 0.0 0.0
CAF:row6 BingoSim.Board src/BingoSim/Board.hs:145:1-4 346 0 0.0 0.0 0.0 0.0
row6 BingoSim.Board src/BingoSim/Board.hs:145:1-45 418 1 0.0 0.0 0.0 0.0
main Main app/Main.hs:(10,1)-(12,30) 387 0 0.0 0.0 100.0 100.0
main.\ Main app/Main.hs:11:13-37 388 1 0.0 0.0 100.0 100.0
runSimulation BingoSim.Simulation src/BingoSim/Simulation.hs:(68,1)-(84,41) 389 1 0.7 0.0 100.0 100.0
hasBingo BingoSim.Board src/BingoSim/Board.hs:(82,1)-(96,32) 410 100000 0.5 0.0 0.5 0.0
randomBoard BingoSim.Simulation src/BingoSim/Simulation.hs:(108,1)-(110,35) 390 100000 0.5 0.2 98.8 100.0
shuffleBits BingoSim.Simulation src/BingoSim/Simulation.hs:(121,1)-(128,39) 391 3600000 4.4 0.0 98.4 99.8
next BingoSim.Prng src/BingoSim/Prng.hs:(79,1)-(91,40) 393 3500000 50.6 48.5 93.5 99.8
next.result BingoSim.Prng src/BingoSim/Prng.hs:80:7-41 405 3500000 1.9 6.9 1.9 6.9
shuffleBits.withRand BingoSim.Simulation src/BingoSim/Simulation.hs:(125,3)-(128,39) 396 3500000 16.5 31.2 40.4 44.4
shuffleBits.withRand.bs' BingoSim.Simulation src/BingoSim/Simulation.hs:127:9-45 406 3500000 13.7 6.9 23.7 13.2
swapBits BingoSim.Simulation src/BingoSim/Simulation.hs:(140,1)-(143,46) 408 3500000 10.0 6.3 10.0 6.3
swapBits.x BingoSim.Simulation src/BingoSim/Simulation.hs:142:7-53 409 3182752 0.0 0.0 0.0 0.0
shuffleBits.withRand.i BingoSim.Simulation src/BingoSim/Simulation.hs:126:9-41 404 3500000 0.2 0.0 0.2 0.0
next.s0' BingoSim.Prng src/BingoSim/Prng.hs:87:7-27 403 3499999 0.0 0.0 0.0 0.0
next.s1' BingoSim.Prng src/BingoSim/Prng.hs:86:7-27 402 3499999 0.2 0.0 0.2 0.0
next.s2' BingoSim.Prng src/BingoSim/Prng.hs:84:7-26 399 3499999 0.2 0.0 0.2 0.0
next.s2'' BingoSim.Prng src/BingoSim/Prng.hs:89:7-26 401 3499999 0.0 0.0 0.0 0.0
next.s3' BingoSim.Prng src/BingoSim/Prng.hs:85:7-26 397 3499999 0.2 0.0 0.2 0.0
next.s3'' BingoSim.Prng src/BingoSim/Prng.hs:90:7-31 398 3499999 0.0 0.0 0.0 0.0
next.t BingoSim.Prng src/BingoSim/Prng.hs:82:7-35 400 3499999 0.0 0.0 0.0 0.0
shuffleBits.n' BingoSim.Simulation src/BingoSim/Simulation.hs:124:3-12 392 3500000 0.5 0.0 0.5 0.0
randomBoard.board BingoSim.Simulation src/BingoSim/Simulation.hs:109:7-26 407 100000 0.0 0.0 0.0 0.0
runSimulation.rate BingoSim.Simulation src/BingoSim/Simulation.hs:81:7-58 425 1 0.0 0.0 0.0 0.0
26 changes: 18 additions & 8 deletions src/BingoSim/Prng.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@
-- Haskell. The documentation and comments below come from the original C
-- sources.
--
-- = License
--
-- Written in 2018 by David Blackman and Sebastiano Vigna (vigna@acm.org)
--
-- To the extent possible under law, the author has dedicated all copyright
-- and related and neighboring rights to this software to the public domain
-- worldwide. This software is distributed without any warranty.
--
-- See <http://creativecommons.org/publicdomain/zero/1.0/>.

module BingoSim.Prng
( State
(
-- * Seeding the generator
State
, mkState
-- * Generating random numbers
, next
-- * Jumps
, jump
, longJump
)
Expand Down Expand Up @@ -63,10 +64,19 @@ mkState s0 s1 s2 s3 = State s0 s1 s2 s3
-- For generating just floating-point numbers, xoshiro256+ is even faster.
--
-- >>> let state = mkState 1 2 3 4
-- >>> next state
-- >>> next state (\rand _state' -> rand)
-- 11520
--
-- Note: When porting to Haskell, we've explicitly chosen to make the API of
-- 'next' in CPS-style (i.e., using a callback) to avoid always allocating a
-- tuple for the result.
--
-- If you'd rather just have a tuple, you can pass @(,)@ as the callback:
--
-- >>> next state (,)
-- (11520,mkState 7 0 262146 211106232532992)
next :: State -> (Word64, State)
next (State s0 s1 s2 s3) =
next :: State -> (Word64 -> State -> a) -> a
next (State s0 s1 s2 s3) f =
let result = ((s1 * 5) `rotateL` 7) * 9

t = s1 `unsafeShiftL` 17
Expand All @@ -78,7 +88,7 @@ next (State s0 s1 s2 s3) =

s2'' = s2' `xor` t
s3'' = s3' `rotateL` 45
in (result, State s0' s1' s2'' s3'')
in f result (State s0' s1' s2'' s3'')

-- | This is the jump function for the generator. It is equivalent
-- to 2^128 calls to next(); it can be used to generate 2^128
Expand Down
15 changes: 8 additions & 7 deletions src/BingoSim/Simulation.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,14 @@ shuffleBits
-> Board
-> Int -- ^ @n@: The current bit we're considering swapping or leaving alone (1-indexed).
-> (Board, Prng.State)
shuffleBits gen board 1 = (board, gen)
shuffleBits gen (Board bs) n =
let n' = n - 1
(rand, gen') = next gen
i = rand `mod` (fromIntegral n)
bs' = swapBits bs n' (fromIntegral i)
in shuffleBits gen' (Board bs') n'
shuffleBits gen board 1 = (board, gen)
shuffleBits gen (Board bs) n = next gen withRand
where
n' = n - 1
withRand rand gen' =
let i = rand `mod` (fromIntegral n)
bs' = swapBits bs n' (fromIntegral i)
in shuffleBits gen' (Board bs') n'

-- | Helper for swapping two specific bits.
--
Expand Down

0 comments on commit 4048469

Please sign in to comment.