[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 10 commits: ts: add compile_artifact, ignore_extension flag

Wed Jan 10 10:15:36 UTC 2024

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

Commits:
c64e175d by doyougnu at 2024-01-10T05:14:34-05:00
ts: add compile_artifact, ignore_extension flag

In b521354216f2821e00d75f088d74081d8b236810 the testsuite gained the
capability to collect generic metrics. But this assumed that the test
was not linking and producing artifacts and we only wanted to track
object files, interface files, or build artifacts from the compiler
build. However, some backends, such as the JS backend, produce artifacts when
compiling, such as the jsexe directory which we want to track.

This patch:

- tweaks the testsuite to collect generic metrics on any build artifact
in the test directory.

- expands the exe_extension function to consider windows and adds the
ignore_extension flag.

- Modifies certain tests to add the ignore_extension flag. Tests such as
heaprof002 expect a .ps file, but on windows without ignore_extensions
the testsuite will look for foo.exe.ps. Hence the flag.

- adds the size_hello_artifact test

- - - - -
94040457 by amesgen at 2024-01-10T05:14:38-05:00
WASM metadata: use correct GHC version

- - - - -
9de8864f by Xiaoyan Ren at 2024-01-10T05:14:41-05:00
Allow SCC declarations in TH (#24081)

- - - - -
43edc75b by Xiaoyan Ren at 2024-01-10T05:14:41-05:00
Fix prettyprinting of SCC pragmas

- - - - -
b51c9f9c by Zubin Duggal at 2024-01-10T05:14:42-05:00
testsuite: Teach testsuite driver about c++ sources

- - - - -
5ada7ad7 by Zubin Duggal at 2024-01-10T05:14:42-05:00
driver: Set -DPROFILING when compiling C++ sources with profiling

Earlier, we used to pass all preprocessor flags to the c++ compiler.
This meant that -DPROFILING was passed to the c++ compiler because
it was a part of C++ flags
However, this was incorrect and the behaviour was changed in
8ff3134ed4aa323b0199ad683f72165e51a59ab6. See #21291.

But that commit exposed this bug where -DPROFILING was no longer being passed
when compiling c++ sources.

The fix is to explicitly include -DPROFILING in `opt_cxx` when profiling is
enabled to ensure we pass the correct options for the way to both C and C++
compilers

Fixes #24286

- - - - -
8423fc2f by Zubin Duggal at 2024-01-10T05:14:42-05:00
testsuite: rename objcpp -> objcxx

To avoid confusion with C Pre Processsor

- - - - -
61b96c0a by Simon Peyton Jones at 2024-01-10T05:14:42-05:00
Make TYPE and CONSTRAINT not-apart

Issue #24279 showed up a bug in the logic in GHC.Core.Unify.unify_ty
which is supposed to make TYPE and CONSTRAINT be not-apart.

Easily fixed.

- - - - -
82c17964 by Zubin Duggal at 2024-01-10T05:14:43-05:00
ci: Fix typo in mk_ghcup_metadata.py

There was a missing colon in the fix to #24268 in 989bf8e53c08eb22de716901b914b3607bc8dd08

- - - - -
b6d46b08 by Zubin Duggal at 2024-01-10T05:14:43-05:00
release-ci: remove release-x86_64-linux-deb11-release+boot_nonmoving_gc job

There is no reason to have this release build or distribute this variation.
This configuration is for testing purposes only.

- - - - -

30 changed files:

- .gitlab/generate-ci/gen_ci.hs
- .gitlab/jobs.yaml
- .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py
- compiler/GHC/Builtin/Names/TH.hs
- compiler/GHC/CmmToAsm/Wasm/Asm.hs
- compiler/GHC/Core/Unify.hs
- compiler/GHC/Driver/Session.hs
- compiler/GHC/HsToCore/Quote.hs
- compiler/GHC/Platform/Ways.hs
- compiler/GHC/ThToHs.hs
- compiler/GHC/Types/SourceText.hs
- libraries/template-haskell/Language/Haskell/TH/Lib/Internal.hs
- libraries/template-haskell/Language/Haskell/TH/Ppr.hs
- libraries/template-haskell/Language/Haskell/TH/Syntax.hs
- libraries/template-haskell/changelog.md
- testsuite/driver/testglobals.py
- testsuite/driver/testlib.py
- testsuite/tests/driver/Makefile
- + testsuite/tests/driver/T24286.cpp
- testsuite/tests/driver/all.T
- testsuite/tests/driver/objc/all.T
- testsuite/tests/driver/objc/objcpp-hi.mm → testsuite/tests/driver/objc/objcxx-hi.mm
- testsuite/tests/driver/objc/objcpp-hi.stdout → testsuite/tests/driver/objc/objcxx-hi.stdout
- testsuite/tests/hpc/function/test.T
- testsuite/tests/hpc/function2/test.T
- testsuite/tests/hpc/simple/test.T
- testsuite/tests/perf/size/all.T
- + testsuite/tests/perf/size/size_hello_artifact.hs
- testsuite/tests/profiling/should_run/all.T
- + testsuite/tests/th/should_compile/T24081/Main.hs

The diff was not included because it is too large.

View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d674013407774f2a94213459c47b626fdd3d4265...b6d46b084bdd3fcaa020428abd5edb94e6a5f96a

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d674013407774f2a94213459c47b626fdd3d4265...b6d46b084bdd3fcaa020428abd5edb94e6a5f96a
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/20240110/13f21634/attachment.html>