Skip to content

compilers: Add optimization=plain option #10593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jpakkane merged 1 commit into from
Oct 9, 2022
Merged

compilers: Add optimization=plain option #10593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions docs/markdown/Builtin-options.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,28 +67,28 @@ Options that are labeled "per machine" in the table are set per
machine. See the [specifying options per
machine](#specifying-options-per-machine) section for details.

| Option | Default value | Description | Is per machine | Is per subproject |
| ------ | ------------- | ----------- | -------------- | ----------------- |
| Option | Default value | Description | Is per machine | Is per subproject |
| -------------------------------------- | ------------- | ----------- | -------------- | ----------------- |
| auto_features {enabled, disabled, auto} | auto | Override value of all 'auto' features | no | no |
| backend {ninja, vs,<br>vs2010, vs2012, vs2013, vs2015, vs2017, vs2019, vs2022, xcode} | ninja | Backend to use | no | no |
| buildtype {plain, debug,<br>debugoptimized, release, minsize, custom} | debug | Build type to use | no | no |
| debug | true | Enable debug symbols and other information | no | no |
| debug | true | Enable debug symbols and other information | no | no |
| default_library {shared, static, both} | shared | Default library type | no | yes |
| errorlogs | true | Whether to print the logs from failing tests. | no | no |
| install_umask {preserve, 0000-0777} | 022 | Default umask to apply on permissions of installed files | no | no |
| layout {mirror,flat} | mirror | Build directory layout | no | no |
| optimization {0, g, 1, 2, 3, s} | 0 | Optimization level | no | no |
| pkg_config_path {OS separated path} | '' | Additional paths for pkg-config to search before builtin paths | yes | no |
| prefer_static | false | Whether to try static linking before shared linking | no | no |
| cmake_prefix_path | [] | Additional prefixes for cmake to search before builtin paths | yes | no |
| stdsplit | true | Split stdout and stderr in test logs | no | no |
| strip | false | Strip targets on install | no | no |
| unity {on, off, subprojects} | off | Unity build | no | no |
| unity_size {>=2} | 4 | Unity file block size | no | no |
| warning_level {0, 1, 2, 3} | 1 | Set the warning level. From 0 = none to 3 = highest | no | yes |
| werror | false | Treat warnings as errors | no | yes |
| errorlogs | true | Whether to print the logs from failing tests. | no | no |
| install_umask {preserve, 0000-0777} | 022 | Default umask to apply on permissions of installed files | no | no |
| layout {mirror,flat} | mirror | Build directory layout | no | no |
| optimization {plain, 0, g, 1, 2, 3, s} | 0 | Optimization level | no | no |
| pkg_config_path {OS separated path} | '' | Additional paths for pkg-config to search before builtin paths | yes | no |
| prefer_static | false | Whether to try static linking before shared linking | no | no |
| cmake_prefix_path | [] | Additional prefixes for cmake to search before builtin paths | yes | no |
| stdsplit | true | Split stdout and stderr in test logs | no | no |
| strip | false | Strip targets on install | no | no |
| unity {on, off, subprojects} | off | Unity build | no | no |
| unity_size {>=2} | 4 | Unity file block size | no | no |
| warning_level {0, 1, 2, 3} | 1 | Set the warning level. From 0 = none to 3 = highest | no | yes |
| werror | false | Treat warnings as errors | no | yes |
| wrap_mode {default, nofallback,<br>nodownload, forcefallback, nopromote} | default | Wrap mode to use | no | no |
| force_fallback_for | [] | Force fallback for those dependencies | no | no |
| force_fallback_for | [] | Force fallback for those dependencies | no | no |

<a name="build-type-options"></a> For setting optimization levels and
toggling debug, you can either set the `buildtype` option, or you can
Expand All @@ -100,7 +100,7 @@ the two-way mapping:

| buildtype | debug | optimization |
| --------- | ----- | ------------ |
| plain | false | 0 |
| plain | false | plain |
| debug | true | 0 |
| debugoptimized | true | 2 |
| release | false | 3 |
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Configuring-a-build-directory.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ a sample output for a simple project.
default_library shared [shared, static, both] Default library type
install_umask 0022 [preserve, 0000-0777] Default umask to apply on permissions of installed files
layout mirror [mirror, flat] Build directory layout
optimization 3 [0, g, 1, 2, 3, s] Optimization level
optimization 3 [plain, 0, g, 1, 2, 3, s] Optimization level
prefer_static false [true, false] Whether to try static linking before shared linking
strip false [true, false] Strip targets on install
unity off [on, off, subprojects] Unity build
Expand Down
10 changes: 10 additions & 0 deletions docs/markdown/snippets/add_optimization_plain_option.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
## Add `optimization` `plain` option

The `optimization` built-in option now accepts `plain` value,
which will not set any optimization flags. This is now the default
value of the flag for `buildtype=plain`, which is useful for distros,
that set the optimization and hardening flags by other means.

If you are using the value of `get_option('optimization')` in your
Meson scripts, make sure you are not making assumptions about it,
such as that the value can be passed to a compiler in `-O` flag.
7 changes: 5 additions & 2 deletions mesonbuild/backend/xcodebackend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
'objcpp': 'OBJCPLUSPLUS',
'swift': 'SWIFT_'
}
OPT2XCODEOPT = {'0': '0',
OPT2XCODEOPT = {'plain': None,
'0': '0',
'g': '0',
'1': '1',
'2': '2',
Expand Down Expand Up @@ -1561,7 +1562,9 @@ def generate_single_build_target(self, objects_dict, target_name, target):
settings_dict.add_item('EXECUTABLE_SUFFIX', suffix)
settings_dict.add_item('GCC_GENERATE_DEBUGGING_SYMBOLS', BOOL2XCODEBOOL[target.get_option(OptionKey('debug'))])
settings_dict.add_item('GCC_INLINES_ARE_PRIVATE_EXTERN', 'NO')
settings_dict.add_item('GCC_OPTIMIZATION_LEVEL', OPT2XCODEOPT[target.get_option(OptionKey('optimization'))])
opt_flag = OPT2XCODEOPT[target.get_option(OptionKey('optimization'))]
if opt_flag is not None:
settings_dict.add_item('GCC_OPTIMIZATION_LEVEL', opt_flag)
if target.has_pch:
# Xcode uses GCC_PREFIX_HEADER which only allows one file per target/executable. Precompiling various header files and
# applying a particular pch to each source file will require custom scripts (as a build phase) and build flags per each
Expand Down
6 changes: 4 additions & 2 deletions mesonbuild/compilers/compilers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,15 +249,17 @@ class CompileCheckMode(enum.Enum):
'winspool.lib', 'shell32.lib', 'ole32.lib', 'oleaut32.lib',
'uuid.lib', 'comdlg32.lib', 'advapi32.lib'] # type: T.List[str]

clike_optimization_args = {'0': [],
clike_optimization_args = {'plain': [],
'0': [],
'g': [],
'1': ['-O1'],
'2': ['-O2'],
'3': ['-O3'],
's': ['-Os'],
} # type: T.Dict[str, T.List[str]]

cuda_optimization_args = {'0': [],
cuda_optimization_args = {'plain': [],
'0': [],
'g': ['-O0'],
'1': ['-O1'],
'2': ['-O2'],
Expand Down
4 changes: 3 additions & 1 deletion mesonbuild/compilers/cs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
from ..environment import Environment
from ..mesonlib import MachineChoice

cs_optimization_args = {'0': [],
cs_optimization_args = {
'plain': [],
'0': [],
'g': [],
'1': ['-optimize+'],
'2': ['-optimize+'],
Expand Down
6 changes: 4 additions & 2 deletions mesonbuild/compilers/d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,17 @@
}
} # type: T.Dict[str, T.Dict[str, str]]

ldc_optimization_args = {'0': [],
ldc_optimization_args = {'plain': [],
'0': [],
'g': [],
'1': ['-O1'],
'2': ['-O2'],
'3': ['-O3'],
's': ['-Oz'],
} # type: T.Dict[str, T.List[str]]

dmd_optimization_args = {'0': [],
dmd_optimization_args = {'plain': [],
'0': [],
'g': [],
'1': ['-O'],
'2': ['-O'],
Expand Down
2 changes: 2 additions & 0 deletions mesonbuild/compilers/mixins/arm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
} # type: T.Dict[str, T.List[str]]

arm_optimization_args = {
'plain': [],
'0': ['-O0'],
'g': ['-g'],
'1': ['-O1'],
Expand All @@ -61,6 +62,7 @@
} # type: T.Dict[str, T.List[str]]

armclang_optimization_args = {
'plain': [],
'0': [], # Compiler defaults to -O0
'g': ['-g'],
'1': ['-O1'],
Expand Down
1 change: 1 addition & 0 deletions mesonbuild/compilers/mixins/clang.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
} # type: T.Dict[str, T.List[str]]

clang_optimization_args = {
'plain': [],
'0': ['-O0'],
'g': ['-Og'],
'1': ['-O1'],
Expand Down
1 change: 1 addition & 0 deletions mesonbuild/compilers/mixins/compcert.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
} # type: T.Dict[str, T.List[str]]

ccomp_optimization_args = {
'plain': [],
'0': ['-O0'],
'g': ['-O0'],
'1': ['-O1'],
Expand Down
1 change: 1 addition & 0 deletions mesonbuild/compilers/mixins/gnu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
} # type: T.Dict[str, T.List[str]]

gnu_optimization_args = {
'plain': [],
'0': ['-O0'],
'g': ['-Og'],
'1': ['-O1'],
Expand Down
6 changes: 4 additions & 2 deletions mesonbuild/compilers/mixins/intel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ class IntelGnuLikeCompiler(GnuLikeCompiler):
'custom': [],
} # type: T.Dict[str, T.List[str]]

OPTIM_ARGS = {
OPTIM_ARGS: T.Dict[str, T.List[str]] = {
'plain': [],
'0': ['-O0'],
'g': ['-O0'],
'1': ['-O1'],
Expand Down Expand Up @@ -136,7 +137,8 @@ class IntelVisualStudioLikeCompiler(VisualStudioLikeCompiler):
'custom': [],
} # type: T.Dict[str, T.List[str]]

OPTIM_ARGS = {
OPTIM_ARGS: T.Dict[str, T.List[str]] = {
'plain': [],
'0': ['/Od'],
'g': ['/Od'],
'1': ['/O1'],
Expand Down
1 change: 1 addition & 0 deletions mesonbuild/compilers/mixins/ti.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
} # type: T.Dict[str, T.List[str]]

ti_optimization_args = {
'plain': [],
'0': ['-O0'],
'g': ['-Ooff'],
'1': ['-O1'],
Expand Down
1 change: 1 addition & 0 deletions mesonbuild/compilers/mixins/visualstudio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
} # T.Dicst[str, T.Optional[T.List[str]]]

msvc_optimization_args = {
'plain': [],
'0': ['/Od'],
'g': [], # No specific flag to optimize debugging, /Zi or /ZI will create debug information
'1': ['/O1'],
Expand Down
1 change: 1 addition & 0 deletions mesonbuild/compilers/mixins/xc16.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
} # type: T.Dict[str, T.List[str]]

xc16_optimization_args = {
'plain': [],
'0': ['-O0'],
'g': ['-O0'],
'1': ['-O1'],
Expand Down
1 change: 1 addition & 0 deletions mesonbuild/compilers/rust.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@


rust_optimization_args = {
'plain': [],
'0': [],
'g': ['-C', 'opt-level=0'],
'1': ['-C', 'opt-level=1'],
Expand Down
1 change: 1 addition & 0 deletions mesonbuild/compilers/swift.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
from ..mesonlib import MachineChoice

swift_optimization_args = {
'plain': [],
'0': [],
'g': [],
'1': ['-O'],
Expand Down
6 changes: 3 additions & 3 deletions mesonbuild/coredata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ def get_nondefault_buildtype_args(self):
result = []
value = self.options[OptionKey('buildtype')].value
if value == 'plain':
opt = '0'
opt = 'plain'
debug = False
elif value == 'debug':
opt = '0'
Expand All @@ -720,7 +720,7 @@ def get_nondefault_buildtype_args(self):

def _set_others_from_buildtype(self, value: str) -> None:
if value == 'plain':
opt = '0'
opt = 'plain'
debug = False
elif value == 'debug':
opt = '0'
Expand Down Expand Up @@ -1217,7 +1217,7 @@ def add_to_argparse(self, name: str, parser: argparse.ArgumentParser, help_suffi
(OptionKey('errorlogs'), BuiltinOption(UserBooleanOption, "Whether to print the logs from failing tests", True)),
(OptionKey('install_umask'), BuiltinOption(UserUmaskOption, 'Default umask to apply on permissions of installed files', '022')),
(OptionKey('layout'), BuiltinOption(UserComboOption, 'Build directory layout', 'mirror', choices=['mirror', 'flat'])),
(OptionKey('optimization'), BuiltinOption(UserComboOption, 'Optimization level', '0', choices=['0', 'g', '1', '2', '3', 's'])),
(OptionKey('optimization'), BuiltinOption(UserComboOption, 'Optimization level', '0', choices=['plain', '0', 'g', '1', '2', '3', 's'])),
(OptionKey('prefer_static'), BuiltinOption(UserBooleanOption, 'Whether to try static linking before shared linking', False)),
(OptionKey('stdsplit'), BuiltinOption(UserBooleanOption, 'Split stdout and stderr in test logs', True)),
(OptionKey('strip'), BuiltinOption(UserBooleanOption, 'Strip targets on install', False)),
Expand Down
2 changes: 1 addition & 1 deletion test cases/failing/101 number in combo/test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"stdout": [
{ "line": "test cases/failing/101 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for combo option \"Optimization level\" is not one of the choices. Possible choices are (as string): \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." }
{ "line": "test cases/failing/101 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for combo option \"Optimization level\" is not one of the choices. Possible choices are (as string): \"plain\", \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." }
]
}