GitLab

Edward Z. Yang authored Dec 17, 2016 and Edward Z. Yang committed Dec 17, 2016

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>

Edward Z. Yang authored Oct 18, 2016 and Edward Z. Yang committed Dec 17, 2016

GHC will make use of this to do more accurate shadowing computation,
because now we can tell if something is ABI-compatible, even if the 'id'
matches.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>

Edward Z. Yang authored Oct 18, 2016 and Edward Z. Yang committed Dec 17, 2016

This is similar to what we do in Distribution.Simple.Build;
preparatory commit so we can read out the ABI hashes of
our dependencies from installedPkgs.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>

Bump directory upper bound

Edward Z. Yang authored Dec 12, 2016 and Edward Z. Yang committed Dec 13, 2016

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>

Edward Z. Yang authored Dec 12, 2016 and Edward Z. Yang committed Dec 13, 2016

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>

Edward Z. Yang authored Dec 12, 2016 and Edward Z. Yang committed Dec 13, 2016

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>

Edward Z. Yang authored Dec 12, 2016 and Edward Z. Yang committed Dec 13, 2016

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>

Edward Z. Yang authored Dec 12, 2016 and Edward Z. Yang committed Dec 13, 2016

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>

Edward Z. Yang authored Dec 12, 2016 and Edward Z. Yang committed Dec 13, 2016

This is probably too much info for big instantiations, but it's
better than nothing.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>

Edward Z. Yang authored Dec 12, 2016 and Edward Z. Yang committed Dec 13, 2016

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>

[ci skip]

First create then rename symlinks to fix #4156

[ci skip]

Update 'bootstrap.sh'.

Revert "Solver: Add missing call to 'simplifyVar'."

[ci skip]

Ben Gamari authored Dec 06, 2016 and Mikhail Glushenkov committed Dec 07, 2016

(cherry picked from commit e0bf43c3)

Nix integration

This reverts commit adc1fe96.

Migrate ConflictSet qpn ↦ ConflictSet

Print final conflict set when search is exhaustive

Before this change, the behavior in the exhaustive case was to filter
the log up until the first error with the final conflict set, leading to
possibly inconsistently filtered error messages.

Now we always use the conflict set from the first error to filter the
the log, and then display the final conflict set as an additional hint.

[ci skip]

[ci skip]

Solver: Fix space leak in 'addlinking' (issue #2899).

Add some missing occurrences of flib in cabal-install.

Solver: Add missing call to 'simplifyVar'.

Solver: Avoid removing goal choices from the tree when applying heuristics.

'simplifyVar' removes flag names from the 'Var' type, so that all flags within a
package are treated as one during backjumping. A more complete fix would involve
creating a 'SimpleVar' type.

The bug caused the conflict counting heuristic to never prefer flag goals. Flag
variables in the tree's goals had the flags' original names, and the flag
variables in the conflict map did not have names, so they could never be equal.

Since this fix changes the goal order, I wanted to test for an unexpected large
negative impact on solver runtime. I ran the solver on all packages on Hackage
individually with GHC 8.0.1 and looked for differences of more than 10% between
master and the branch. There were twelve packages. I reran those packages three
times and found ten with a significant difference in runtime. Here are the
average runtimes. None of them hit the backjump limit.

package                         master (seconds)   branch (seconds)   ratio
clash-ghc                        2.60              3.99               1.54
hack-middleware-clientsession    8.22              2.54               0.31
hackage-server                   1.46              1.85               1.26
hamusic                          5.47              4.55               0.83
haskore-synthesizer             10.13              7.64               0.75
language-gcl                     2.54              2.03               0.80
ms                              36.98              8.02               0.22
pipes-cereal-plus                1.51              1.66               1.10
thorn                            8.28              3.08               0.37
wai-handler-devel                1.72              1.91               1.11

I looked at the diff in the -v3 log for several of them and saw that the solver
was making some flag choices earlier, as expected.

This isn't much of an improvement, but it at least looks like a safe change.