Skip to content
This repository was archived by the owner on Aug 3, 2024. It is now read-only.

Use new function getNameToInstancesIndex instead of tcRnGetInfo #639

Merged
merged 2 commits into from
Jun 22, 2017

Conversation

duog
Copy link
Contributor

@duog duog commented Jun 20, 2017

This is cherry picked from: #636 (some merge conflicts)

There are some significant performance improvements, and it would be good to get this into the ghc-8.2 release.

This depends on the following commits being merged into the ghc-8.2 branch from ghc-master:
f942f65a525dd972cd96e6ae42922b6a3ce4b2d0
271e0f087b6560f445d7e6bd7f6cecec917e1085
So it will not compile in travis until they are merged and make it into the launchpad repository. I have run the test suite and everything is passing.
My branch of ghc-8.2 with those commits is here. It had some merge conflicts.

Tagging @bgamari for visibility.

I will measure the performance on some packages from hackage and report back.

There is some significant performance improvement in the ghc testsuite.

haddock.base: -23.3%
haddock.Cabal: -16.7%
haddock.compiler: -19.8%
@alexbiehl
Copy link
Member

Nice! Keep me posted for any performance improvements you measure. And thanks @duog!

@alexbiehl
Copy link
Member

@duog Ben just merged your changes to ghc-8.2 branch:

-ghc-github:#ghc- [ghc] ghc-mirror pushed 4 new commits to ghc-8.2: https://git.io/vQLyT
-ghc-github:#ghc- ghc/ghc-8.2 9beb882 Douglas Wilson: Add tcRnGetNameToInstancesIndex...
-ghc-github:#ghc- ghc/ghc-8.2 4f4f05a Douglas Wilson: Improve getNameToInstancesIndex...

I asked Herbert to trigger a new ppa build. This PR will be green soon!

@bgamari
Copy link
Collaborator

bgamari commented Jun 22, 2017 via email

@alexbiehl
Copy link
Member

@duog travis found two nits!

src/Haddock/Interface/AttachInstances.hs:27:1: warning: [-Wunused-imports]
    The import of ‘Control.Monad’ is redundant
      except perhaps to import instances from ‘Control.Monad’
    To import instances alone, use: import Control.Monad()
   |
27 | import Control.Monad
   | ^^^^^^^^^^^^^^^^^^^^
src/Haddock/Interface/AttachInstances.hs:36:1: warning: [-Wunused-imports]
    The import of ‘GhcMonad’ is redundant
      except perhaps to import instances from ‘GhcMonad’
    To import instances alone, use: import GhcMonad()
   |
36 | import GhcMonad (withSession)
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

@alexbiehl
Copy link
Member

@duog I took care of that for you!

@alexbiehl alexbiehl merged commit d5d8cd1 into haskell:master Jun 22, 2017
@alexbiehl
Copy link
Member

Thanks again @duog!

@alexbiehl
Copy link
Member

@bgamari this is done now! Please bump haddock d5d8cd1 :)

@duog
Copy link
Contributor Author

duog commented Jun 22, 2017

Great thanks @alexbiehl

alexbiehl added a commit to alexbiehl/haddock that referenced this pull request Jul 3, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants