From 7f634320a2c39f4f81f631deb844acbaebaced66 Mon Sep 17 00:00:00 2001 From: Herbert Valerio Riedel Date: Sun, 14 Dec 2014 10:33:43 +0100 Subject: [PATCH] Update Haddock submodule to latest `master` tip This also updates the perf-numbers for `haddock.base` and `haddock.Cabal` NB: this switches from `ghc-head` to `master` branch temporarily until GHC 7.10 has been properly branched off. --- testsuite/tests/perf/haddock/all.T | 6 ++++-- utils/haddock | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/testsuite/tests/perf/haddock/all.T b/testsuite/tests/perf/haddock/all.T index 027686e9b9..d7162f5eaf 100644 --- a/testsuite/tests/perf/haddock/all.T +++ b/testsuite/tests/perf/haddock/all.T @@ -5,7 +5,7 @@ test('haddock.base', [unless(in_tree_compiler(), skip) ,stats_num_field('bytes allocated', - [(wordsize(64), 8322584616, 5) + [(wordsize(64), 9503888920, 5) # 2012-08-14: 5920822352 (amd64/Linux) # 2012-09-20: 5829972376 (amd64/Linux) # 2012-10-08: 5902601224 (amd64/Linux) @@ -21,6 +21,7 @@ test('haddock.base', # 2014-09-09: 8354439016 (x86_64/Linux - Applicative/Monad changes, according to Austin) # 2014-09-10: 7901230808 (x86_64/Linux - Applicative/Monad changes, according to Joachim) # 2014-10-07: 8322584616 (x86_64/Linux) + # 2014-12-14: 9503888920 (x86_64/Linux) - Update to Haddock 2.16 ,(platform('i386-unknown-mingw32'), 4202377432, 5) # 2013-02-10: 3358693084 (x86/Windows) # 2013-11-13: 3097751052 (x86/Windows, 64bit machine) @@ -41,7 +42,7 @@ test('haddock.base', test('haddock.Cabal', [unless(in_tree_compiler(), skip) ,stats_num_field('bytes allocated', - [(wordsize(64), 6019839624, 5) + [(wordsize(64), 6387320816, 5) # 2012-08-14: 3255435248 (amd64/Linux) # 2012-08-29: 3324606664 (amd64/Linux, new codegen) # 2012-10-08: 3373401360 (amd64/Linux) @@ -59,6 +60,7 @@ test('haddock.Cabal', # 2014-09-10: 4500376192 (x86_64/Linux - Applicative/Monad changes according to Joachim) # 2014-09-24: 5840893376 (x86_64/Linux - Cabal update) # 2014-10-04: 6019839624 (x86_64/Linux - Burning Bridges, Cabal update) + # 2014-12-14: 6387320816 (x86_64/Linux) - Update to Haddock 2.16 ,(platform('i386-unknown-mingw32'), 3088635556, 5) # 2012-10-30: 1733638168 (x86/Windows) diff --git a/utils/haddock b/utils/haddock index b94ab90343..8cd72a05e8 160000 --- a/utils/haddock +++ b/utils/haddock @@ -1 +1 @@ -Subproject commit b94ab9034367f51b978904d60f2604db10abbd9f +Subproject commit 8cd72a05e857388e3ca184fbef3f04d3bffbc5b4 -- GitLab