[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 10 commits: Recalculate Performance Test Baseline T9630 #16680

Marge Bot gitlab at gitlab.haskell.org
Mon May 20 19:25:15 UTC 2019



 Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC


Commits:
b46efa2b by David Eichmann at 2019-05-20T18:45:56Z
Recalculate Performance Test Baseline T9630 #16680

Metric Decrease:
    T9630

- - - - -
9ebc9bf8 by Sergei Trofimovich at 2019-05-20T19:25:02Z
powerpc32: fix 64-bit comparison (#16465)

On powerpc32 64-bit comparison code generated dangling
target labels. This caused ghc build failure as:

    $ ./configure --target=powerpc-unknown-linux-gnu && make
    ...
    SCCs aren't in reverse dependent order
    bad blockId n3U

This happened because condIntCode' in PPC codegen generated
label name but did not place the label into `cmp_lo` code block.

The change adds the `cmp_lo` label into the case of negative
comparison.

Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>

- - - - -
82655282 by Sergei Trofimovich at 2019-05-20T19:25:02Z
powerpc32: fix stack allocation code generation

When ghc was built for powerpc32 built failed as:

It's a fallout of commit 3f46cffcc2850e68405a1
("PPC NCG: Refactor stack allocation code") where
word size used to be
    II32/II64
and changed to
    II8/panic "no width for given number of bytes"
    widthFromBytes ((platformWordSize platform) `quot` 8)

The change restores initial behaviour by removing extra division.

Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>

- - - - -
3efbd425 by Takenobu Tani at 2019-05-20T19:25:03Z
users-guide: Fix directive errors on 8.10

The following sections are not displayed due to a directive error:

  * -Wunused-record-wildcards
  * -Wredundant-record-wildcards

I changed the location of the `since` directive.

[skip ci]

- - - - -
6cb43dc5 by Kirill Elagin at 2019-05-20T19:25:04Z
users-guide: Fix -rtsopts default
- - - - -
c47fabcb by Javran Cheng at 2019-05-20T19:25:05Z
Fix doc for Data.Function.fix.

Doc-only change.

- - - - -
55bfaccf by Shayne Fletcher at 2019-05-20T19:25:07Z
Update resolver for for happy 1.19.10

- - - - -
cc2c8bed by Alp Mestanogullari at 2019-05-20T19:25:10Z
distrib/configure.ac.in: remove mention to 'settings', since settings.in is gone

Otherwise, when `./configure`ing a GHC bindist, produced by either Make or
Hadrian, we would try to generate the `settings` file from the `settings.in`
template that we used to have around but which has been gone since d37d91e9.
That commit generates the settings file using the build systems instead, but
forgot to remove this mention to the `settings` file.

- - - - -
f2cd499d by Ben Gamari at 2019-05-20T19:25:10Z
gitlab-ci: Allow Windows Hadrian build to fail

Due to #16574.
- - - - -
9a99b644 by Ben Gamari at 2019-05-20T19:25:10Z
Update .gitlab-ci.yml
- - - - -


8 changed files:

- .gitlab-ci.yml
- compiler/nativeGen/PPC/CodeGen.hs
- compiler/nativeGen/PPC/Instr.hs
- distrib/configure.ac.in
- docs/users_guide/phases.rst
- docs/users_guide/using-warnings.rst
- hadrian/stack.yaml
- libraries/base/Data/Function.hs


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -560,6 +560,8 @@ validate-x86_64-linux-fedora27:
   stage: full-build
   variables:
     GHC_VERSION: "8.6.2"
+  # due to #16574 this currently fails
+  allow_failure: true
   script:
     - |
       python boot


=====================================
compiler/nativeGen/PPC/CodeGen.hs
=====================================
@@ -949,6 +949,7 @@ condIntCode' True cond W64 x y
                  , BCC LE cmp_lo Nothing
                  , CMPL II32 x_lo (RIReg y_lo)
                  , BCC ALWAYS end_lbl Nothing
+                 , NEWBLOCK cmp_lo
                  , CMPL II32 y_lo (RIReg x_lo)
                  , BCC ALWAYS end_lbl Nothing
 


=====================================
compiler/nativeGen/PPC/Instr.hs
=====================================
@@ -98,7 +98,7 @@ ppc_mkStackAllocInstr' platform amount
     , STU fmt r0 (AddrRegReg sp tmp)
     ]
   where
-    fmt = intFormat $ widthFromBytes ((platformWordSize platform) `quot` 8)
+    fmt = intFormat $ widthFromBytes (platformWordSize platform)
     zero = ImmInt 0
     tmp = tmpReg platform
     immAmount = ImmInt amount


=====================================
distrib/configure.ac.in
=====================================
@@ -197,7 +197,7 @@ fi
 FP_SETTINGS
 
 #
-AC_CONFIG_FILES(settings mk/config.mk mk/install.mk)
+AC_CONFIG_FILES(mk/config.mk mk/install.mk)
 AC_OUTPUT
 
 # We get caught by


=====================================
docs/users_guide/phases.rst
=====================================
@@ -937,7 +937,7 @@ for example).
     :type: dynamic
     :category: linking
 
-    :default: all
+    :default: some
 
     This option affects the processing of RTS control options given
     either on the command line or via the :envvar:`GHCRTS` environment


=====================================
docs/users_guide/using-warnings.rst
=====================================
@@ -1545,10 +1545,11 @@ of ``-W(no-)*``.
     :shortdesc: Warn about record wildcard matches when none of the bound variables
       are used.
     :type: dynamic
-    :since: 8.10.1
     :reverse: -Wno-unused-record-wildcards
     :category:
 
+    :since: 8.10.1
+
     .. index::
        single: unused, warning, record wildcards
 
@@ -1566,10 +1567,11 @@ of ``-W(no-)*``.
 .. ghc-flag:: -Wredundant-record-wildcards
     :shortdesc: Warn about record wildcard matches when the wildcard binds no patterns.
     :type: dynamic
-    :since: 8.10.1
     :reverse: -Wno-redundant-record-wildcards
     :category:
 
+    :since: 8.10.1
+
     .. index::
        single: unused, warning, record wildcards
 


=====================================
hadrian/stack.yaml
=====================================
@@ -1,7 +1,7 @@
 # For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration.html
 
 # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
-resolver: lts-13.14
+resolver: lts-13.21
 
 # Local packages, usually specified by relative directory name
 packages:


=====================================
libraries/base/Data/Function.hs
=====================================
@@ -45,7 +45,7 @@ infixl 1 &
 -- 120
 --
 -- Instead of making a recursive call, we introduce a dummy parameter @rec@;
--- when used within 'fix', this parameter then refers to 'fix' argument, hence
+-- when used within 'fix', this parameter then refers to 'fix'’s argument, hence
 -- the recursion is reintroduced.
 fix :: (a -> a) -> a
 fix f = let x = f x in x



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/79488ccac8a5dbc4758339a74da6011c9199fc48...9a99b64469c3d1f271cca9198e21ad85e17c6bd3

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/79488ccac8a5dbc4758339a74da6011c9199fc48...9a99b64469c3d1f271cca9198e21ad85e17c6bd3
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20190520/c5506e17/attachment-0001.html>


More information about the ghc-commits mailing list