Convert buildtype to optimization and debug options by jpakkane · Pull Request #3489 · mesonbuild/meson

jpakkane · 2018-04-27T21:02:31Z

The current setup of a couple of different build types is a bit limiting. Ideally you'd want to toggle the optimization levels and "debugness" independent of each other. Some people might want to do releases with -O2 and others with -O3 for example.

This is a very rudimentary fix showing how a small fraction of this would be done. The full setup would go something like this:

optimization gets its own option, with values as shown in this MR
debug gets a boolean switch
buildtype gets a new value of custom
setting buildtype sets also the value of the other two to match current behaviour
optimization and debug can be set to any value combinations
if the combination exactly matches some current build type, the value of builtype is set to that, otherwise it is set to custom

Comments welcome.

igor-raits · 2018-04-27T21:03:38Z

Flake8 detected 12 issues on 33d0914
Visit https://sideci.com/gh/19784232/pull_requests/3489 to review the issues.

igor-raits · 2018-05-20T00:23:40Z

mesonbuild/compilers/c.py

        return ['/Fo' + target]

+    def get_optimization_args(self, optimization_level):
+        return msvc_optimization_args[optimization_level]


[Flake8]

[F821] undefined name 'msvc_optimization_args'

igor-raits · 2018-05-20T00:23:41Z

mesonbuild/compilers/compilers.py

-                       'minsize': [], # In a future release: ['-C', 'opt-level=s'],
+                       'debugoptimized': ['-C', 'debuginfo=2'],
+                       'release': [],
+                       'minsize': [], 


[Flake8]

[W291] trailing whitespace

igor-raits · 2018-05-20T00:23:41Z

mesonbuild/compilers/c.py

+        return msvc_optimization_args[optimization_level]
+
+    def get_debug_args(self, is_debug):
+        return msvc_debug_args[is_debug]


[Flake8]

[F821] undefined name 'msvc_debug_args'

igor-raits · 2018-05-26T19:02:07Z

Flake8 detected 6 issues on 185b5da
Visit https://sideci.com/gh/19784232/pull_requests/3489 to review the issues.

igor-raits · 2018-06-06T22:41:21Z

Flake8 detected 23 issues on 5ec6b74
Visit https://sideci.com/gh/19784232/pull_requests/3489 to review the issues.

jpakkane · 2018-06-10T22:01:03Z

This PR has very large regression potential. We should probably merge it at the very beginning of the next dev cycle so there is enough time to work out the kinks.

nirbheek · 2018-06-18T05:29:16Z

I'll review this after the release.

igor-raits · 2018-06-18T19:51:23Z

Flake8 detected 10 issues on a5731db
Visit https://sider.review/gh/19784232/pull_requests/3489 to review the issues.

igor-raits · 2018-06-29T20:39:22Z

Flake8 detected 16 issues on d900c31
Visit https://sider.review/gh/19784232/pull_requests/3489 to review the issues.

igor-raits · 2018-07-03T20:51:36Z

mesonbuild/compilers/c.py

+        return msvc_optimization_args[optimization_level]
+
+    def get_debug_args(self, is_debug):
+        return msvc_debug_args[is_debug]


[Flake8]

[F821] undefined name 'msvc_debug_args'

igor-raits · 2018-07-03T20:51:36Z

mesonbuild/compilers/c.py

+            return self.crt_args[crt_val]
+        assert(crt_val == 'from_buildtype')
+        # Match what build type flags used to do.
+        if builtype == 'plain':


[Flake8]

[F821] undefined name 'builtype'

igor-raits · 2018-07-03T20:51:37Z

mesonbuild/compilers/c.py

        return ['/Fo' + target]

+    def get_optimization_args(self, optimization_level):
+        return msvc_optimization_args[optimization_level]


[Flake8]

[F821] undefined name 'msvc_optimization_args'

nirbheek · 2018-08-18T16:17:11Z

I mean, a commit message like "Fix Visual Studio." is not very useful, neither is a commit message like "Fix flake8 errors.". In such PRs, either the commits should be squashed and reorganised into logical steps, or squashed into one commit, otherwise it's just noise. The tests also fail between commits, so it's difficult to do a git bisect inside the merge commit.

jpakkane · 2018-08-18T16:22:39Z

To quote our documentation on this subject:

large branches with many commits should be merged with a merge commit, especially if one of the commits does not pass all tests (which happens in e.g. large and difficult refactorings)

nirbheek · 2018-08-18T16:27:09Z

I know, but in this merge all the commits will fail the tests.

jpakkane · 2018-08-18T16:32:12Z

If you really want me to squash this I can do it. But in my opinion that is worse because you lose all incrementality.

nirbheek · 2018-08-18T16:39:01Z

I think preserving history make sense when you have a series of incremental atomic changes. Doing a part of a change (that breaks other things) is incremental in a "work-in-progress" fashion, but not in an "atomic steps" fashion.

I am not deeply invested in this particular PR being squashed or merged, I just want to clarify my thoughts on the matter about when merge commits are useful.

jpakkane · 2018-08-18T17:39:36Z

Travis failure is unrelated.

A temporary hack while waiting for the merge of mesonbuild#3489

tbodt · 2018-09-22T22:47:58Z

The GDBM wrap is now broken since it has an option named debug. I've made a PR to rename the option to gdbm_debug: mesonbuild/gdbm#2

A temporary hack while waiting for the merge of mesonbuild#3489

Akaricchi mentioned this pull request May 5, 2018

Add b_fast and b_march_native or something similar and make it possible to set them to "if-release" #3524

Open

nirbheek mentioned this pull request May 15, 2018

-O3 optimization level shouldn't be used with unity builds by default #3566

Open

igor-raits reviewed May 20, 2018

View reviewed changes

jpakkane mentioned this pull request May 20, 2018

What should "debug" mean #3596

Open

jpakkane force-pushed the buildtypeseparation branch from 4153d9b to 185b5da Compare May 26, 2018 19:01

jpakkane force-pushed the buildtypeseparation branch from 185b5da to 98d1385 Compare May 26, 2018 19:02

jpakkane force-pushed the buildtypeseparation branch from 13712e8 to 5ec6b74 Compare June 6, 2018 22:40

jpakkane force-pushed the buildtypeseparation branch from 5ec6b74 to 04b9089 Compare June 10, 2018 22:00

jpakkane requested a review from nirbheek June 10, 2018 22:01

jpakkane force-pushed the buildtypeseparation branch from 04b9089 to 250df1d Compare June 10, 2018 22:47

nirbheek self-assigned this Jun 10, 2018

jpakkane force-pushed the buildtypeseparation branch from 250df1d to a5731db Compare June 18, 2018 19:50

jpakkane force-pushed the buildtypeseparation branch from a5731db to d900c31 Compare June 29, 2018 20:38

jpakkane force-pushed the buildtypeseparation branch from d900c31 to 8f96da0 Compare July 3, 2018 20:50

igor-raits reviewed Jul 3, 2018

View reviewed changes

nirbheek modified the milestones: meson-next, 0.48.0 Jul 7, 2018

jpakkane force-pushed the buildtypeseparation branch from 8f96da0 to 8a5bc80 Compare July 11, 2018 19:59

jpakkane added 10 commits August 18, 2018 19:08

Convert D to new format.

67924da

Convert Swift to new format.

0a3494c

Convert C# to new format.

1f879be

Remove command line arguments that might get duplicated in XML entries.

7f6117b

Use safeseh to compile asm.

4bd0239

Fix flake8 errors.

286fe30

Return empty array for msvc debug flags.

72f7613

More explicit library type definition in VS backend.

317a029

Add release note snippet.

2d98f5b

Call it b_vscrt instead for clarity.

ffde7d0

jpakkane force-pushed the buildtypeseparation branch from 7223b27 to ffde7d0 Compare August 18, 2018 16:12

jpakkane merged commit d83f771 into master Aug 18, 2018

jpakkane deleted the buildtypeseparation branch August 18, 2018 17:39

GoaLitiuM mentioned this pull request Aug 19, 2018

Dub method for dependencies #4032

Closed

stianse pushed a commit to pexip/meson that referenced this pull request Aug 30, 2018

HACK: Add buildtype 'debugmedium' to set -O1 -g

b26d280

A temporary hack while waiting for the merge of mesonbuild#3489

havardgraff pushed a commit to pexip/meson that referenced this pull request Oct 15, 2018

HACK: Add buildtype 'debugmedium' to set -O1 -g

92f86b7

A temporary hack while waiting for the merge of mesonbuild#3489

havardgraff added a commit to pexip/meson that referenced this pull request Oct 16, 2018

HACK: Add buildtype 'debugmedium' to set -O1 -g

1cc7d9a

A temporary hack while waiting for the merge of mesonbuild#3489

havardgraff added a commit to pexip/meson that referenced this pull request Oct 19, 2018

HACK: Add buildtype 'debugmedium' to set -O1 -g

91b9235

A temporary hack while waiting for the merge of mesonbuild#3489

stianse pushed a commit to pexip/meson that referenced this pull request Oct 29, 2018

HACK: Add buildtype 'debugmedium' to set -O1 -g

347997a

A temporary hack while waiting for the merge of mesonbuild#3489

stianse pushed a commit to pexip/meson that referenced this pull request Nov 15, 2018

HACK: Add buildtype 'debugmedium' to set -O1 -g

1f1698a

A temporary hack while waiting for the merge of mesonbuild#3489

havardgraff added a commit to pexip/meson that referenced this pull request Jun 25, 2019

HACK: Add buildtype 'debugmedium' to set -O1 -g

581b587

A temporary hack while waiting for the merge of mesonbuild#3489

philippejer mentioned this pull request Jul 19, 2019

ValaCompiler: only emit '--debug' in debug build. #5690

Merged

dcbaker mentioned this pull request Sep 29, 2021

compilers/gnu: set level 0 optimization to '-O0' #9287

Merged

Uh oh!

Conversation

jpakkane commented Apr 27, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

igor-raits commented Apr 27, 2018

Uh oh!

igor-raits May 20, 2018

Choose a reason for hiding this comment

Uh oh!

igor-raits May 20, 2018

Choose a reason for hiding this comment

Uh oh!

igor-raits May 20, 2018

Choose a reason for hiding this comment

Uh oh!

igor-raits commented May 26, 2018

Uh oh!

igor-raits commented Jun 6, 2018

Uh oh!

jpakkane commented Jun 10, 2018

Uh oh!

nirbheek commented Jun 18, 2018

Uh oh!

igor-raits commented Jun 18, 2018

Uh oh!

igor-raits commented Jun 29, 2018

Uh oh!

igor-raits Jul 3, 2018

Choose a reason for hiding this comment

Uh oh!

igor-raits Jul 3, 2018

Choose a reason for hiding this comment

Uh oh!

igor-raits Jul 3, 2018

Choose a reason for hiding this comment

Uh oh!

nirbheek commented Aug 18, 2018

Uh oh!

jpakkane commented Aug 18, 2018

Uh oh!

nirbheek commented Aug 18, 2018

Uh oh!

jpakkane commented Aug 18, 2018

Uh oh!

nirbheek commented Aug 18, 2018

Uh oh!

jpakkane commented Aug 18, 2018

Uh oh!

tbodt commented Sep 22, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

jpakkane commented Apr 27, 2018 •

edited

Loading