First draft version of Tasking MIL linking with b_lto and prelinking

docs/markdown/Builtin-options.md

@@ -223,7 +223,6 @@ available on all platforms or with all compilers:
 | b_staticpic         | true                 | true, false                                                   | Build static libraries as position independent                                 |
 | b_pie               | false                | true, false                                                   | Build position-independent executables (since 0.49.0)                          |
 | b_vscrt             | from_buildtype       | none, md, mdd, mt, mtd, from_buildtype, static_from_buildtype | VS runtime library to use (since 0.48.0) (static_from_buildtype since 0.56.0)  |
-| b_tasking_mil_link  | false                | true, false                                                   | Use MIL linking for the TASKING VX-tools compiler family (since 1.4.0)         |
 
 The value of `b_sanitize` can be one of: `none`, `address`, `thread`,
 `undefined`, `memory`, `leak`, `address,undefined`, but note that some

docs/markdown/Reference-tables.md

@@ -49,11 +49,7 @@ These are return values of the `get_id` (Compiler family) and
 | armasm    | Microsoft Macro Assembler for ARM and AARCH64 (Since 0.64.0) | |
 | mwasmarm        | Metrowerks Assembler for Embedded ARM | |
 | mwasmeppc       | Metrowerks Assembler for Embedded PowerPC | |
-| cctc            | TASKING VX-toolset for TriCore compiler     | |
-| ccarm           | TASKING VX-toolset for ARM compiler         | |
-| cc51            | TASKING VX-toolset for 8051 compiler        | |
-| ccmcs           | TASKING VX-toolset for MCS compiler         | |
-| ccpcp           | TASKING VX-toolset for PCP compiler         | |
+| tasking         | TASKING VX-toolset     | |
 
 ## Linker ids
 
@@ -85,11 +81,7 @@ These are return values of the `get_linker_id` method in a compiler object.
 | ccomp      | CompCert used as the linker driver          |
 | mwldarm    | The Metrowerks Linker with the ARM interface, used with mwccarm only |
 | mwldeppc   | The Metrowerks Linker with the PowerPC interface, used with mwcceppc only |
-| ltc        | TASKING VX-toolset for TriCore linker       |
-| lkarm      | TASKING VX-toolset for ARM linker           |
-| lk51       | TASKING VX-toolset for 8051 linker          |
-| lmsc       | TASKING VX-toolset for MCS linker           |
-| lpcp       | TASKING VX-toolset for PCP linker           |
+| tasking    | TASKING VX-toolset                          |
 
 For languages that don't have separate dynamic linkers such as C# and Java, the
 `get_linker_id` will return the compiler name.

mesonbuild/backend/backends.py

@@ -24,10 +24,11 @@
 from .. import programs
 from .. import mesonlib
 from .. import mlog
-from ..compilers import LANGUAGES_USING_LDFLAGS, detect
+from ..compilers import LANGUAGES_USING_LDFLAGS, detect, lang_suffixes
 from ..mesonlib import (
     File, MachineChoice, MesonException, OrderedSet,
-    ExecutableSerialisation, classify_unity_sources,
+    ExecutableSerialisation, EnvironmentException,
+    classify_unity_sources, get_compiler_for_source
 )
 from ..options import OptionKey
 
@@ -837,7 +838,7 @@ def canonicalize_filename(fname: str) -> str:
             fname = fname.replace(ch, '_')
         return hashed + fname
 
-    def object_filename_from_source(self, target: build.BuildTarget, source: 'FileOrString', targetdir: T.Optional[str] = None) -> str:
+    def object_filename_from_source(self, target: build.BuildTarget, compiler: Compiler, source: 'FileOrString', targetdir: T.Optional[str] = None) -> str:
         assert isinstance(source, mesonlib.File)
         if isinstance(target, build.CompileTarget):
             return target.sources_map[source]
@@ -868,7 +869,16 @@ def object_filename_from_source(self, target: build.BuildTarget, source: 'FileOr
                 gen_source = os.path.relpath(os.path.join(build_dir, rel_src),
                                              os.path.join(self.environment.get_source_dir(), target.get_subdir()))
         machine = self.environment.machines[target.for_machine]
-        ret = self.canonicalize_filename(gen_source) + '.' + machine.get_object_suffix()
+        object_suffix = machine.get_object_suffix()
+        # For the TASKING compiler, in case of LTO or prelinking the object suffix has to be .mil
+        if compiler.get_id() == 'tasking':
+            if target.get_option(OptionKey('b_lto')) or (isinstance(target, build.StaticLibrary) and target.prelink):
+                if not source.rsplit('.', 1)[1] in lang_suffixes['c']:
+                    if isinstance(target, build.StaticLibrary) and not target.prelink:
+                        raise EnvironmentException('Tried using MIL linking for a static library with a assembly file. This can only be done if the static library is prelinked or disable \'b_lto\'.')
+                else:
+                    object_suffix = 'mil'
+        ret = self.canonicalize_filename(gen_source) + '.' + object_suffix
         if targetdir is not None:
             return os.path.join(targetdir, ret)
         return ret
@@ -924,7 +934,8 @@ def _determine_ext_objs(self, extobj: 'build.ExtractedObjects', proj_dir_to_buil
                     sources.append(_src)
 
         for osrc in sources:
-            objname = self.object_filename_from_source(extobj.target, osrc, targetdir)
+            compiler = get_compiler_for_source(extobj.target.compilers.values(), osrc)
+            objname = self.object_filename_from_source(extobj.target, compiler, osrc, targetdir)
             objpath = os.path.join(proj_dir_to_build_root, objname)
             result.append(objpath)
 

mesonbuild/backend/ninjabackend.py

@@ -734,8 +734,7 @@ def generate_compdb(self) -> None:
                 rules += [f"{rule}{ext}" for rule in [self.compiler_to_pch_rule_name(compiler)]
                           for ext in ['', '_RSP']]
                 # Add custom MIL link rules to get the files compiled by the TASKING compiler family to MIL files included in the database
-                key = OptionKey('b_tasking_mil_link')
-                if key in compiler.base_options:
+                if compiler.get_id() == 'tasking':
                     rule = self.get_compiler_rule_name('tasking_mil_compile', compiler.for_machine)
                     rules.append(rule)
                     rules.append(f'{rule}_RSP')
@@ -1085,19 +1084,11 @@ def generate_target(self, target) -> None:
             # Skip the link stage for this special type of target
             return
         linker, stdlib_args = self.determine_linker_and_stdlib_args(target)
-        # For prelinking and TASKING mil linking there needs to be an additional link target and the object list is modified
+
         if not isinstance(target, build.StaticLibrary):
             final_obj_list = obj_list
         elif target.prelink:
             final_obj_list = self.generate_prelink(target, obj_list)
-        elif 'c' in target.compilers:
-            key = OptionKey('b_tasking_mil_link')
-            if key not in target.get_options() or key not in target.compilers['c'].base_options:
-                final_obj_list = obj_list
-            elif target.get_option(key):
-                final_obj_list = self.generate_mil_link(target, obj_list)
-            else:
-                final_obj_list = obj_list
         else:
             final_obj_list = obj_list
         elem = self.generate_link(target, outname, final_obj_list, linker, pch_objects, stdlib_args=stdlib_args)
@@ -2621,9 +2612,8 @@ def generate_compile_rules(self) -> None:
             for langname, compiler in clist.items():
                 if compiler.get_id() == 'clang':
                     self.generate_llvm_ir_compile_rule(compiler)
-                if OptionKey('b_tasking_mil_link') in compiler.base_options:
+                if compiler.get_id() == 'tasking':
                     self.generate_tasking_mil_compile_rules(compiler)
-                    self.generate_tasking_mil_link_rules(compiler)
                 self.generate_compile_rule_for(langname, compiler)
                 self.generate_pch_rule_for(langname, compiler)
                 for mode in compiler.get_modes():
@@ -3063,12 +3053,7 @@ def generate_single_compile(self, target: build.BuildTarget, src,
             raise AssertionError(f'BUG: broken generated source file handling for {src!r}')
         else:
             raise InvalidArguments(f'Invalid source type: {src!r}')
-        obj_basename = self.object_filename_from_source(target, src)
-        # If mil linking is enabled for the target, then compilation output has to be MIL files instead of object files
-        if compiler.get_language() == 'c':
-            key = OptionKey('b_tasking_mil_link')
-            if key in compiler.base_options and target.get_option(key) and src.rsplit('.', 1)[1] in compilers.lang_suffixes['c']:
-                obj_basename = f'{os.path.splitext(obj_basename)[0]}.mil'
+        obj_basename = self.object_filename_from_source(target, compiler, src)
         rel_obj = os.path.join(self.get_target_private_dir(target), obj_basename)
         dep_file = compiler.depfile_for_object(rel_obj)
 
@@ -3092,9 +3077,12 @@ def generate_single_compile(self, target: build.BuildTarget, src,
         # If TASKING compiler family is used and MIL linking is enabled for the target,
         # then compilation rule name is a special one to output MIL files
         # instead of object files for .c files
-        key = OptionKey('b_tasking_mil_link')
-        if key in compiler.base_options and target.get_option(key) and src.rsplit('.', 1)[1] in compilers.lang_suffixes['c']:
-            compiler_name = self.get_compiler_rule_name('tasking_mil_compile', compiler.for_machine)
+        key = OptionKey('b_lto')
+        if compiler.get_id() == 'tasking':
+            if ((isinstance(target, build.StaticLibrary) and target.prelink) or target.get_option(key)) and src.rsplit('.', 1)[1] in compilers.lang_suffixes['c']:
+                compiler_name = self.get_compiler_rule_name('tasking_mil_compile', compiler.for_machine)
+            else:
+                compiler_name = self.compiler_to_rule_name(compiler)
         else:
             compiler_name = self.compiler_to_rule_name(compiler)
         extra_deps = []
@@ -3473,36 +3461,19 @@ def generate_prelink(self, target, obj_list):
 
         prelinker = target.get_prelinker()
         cmd = prelinker.exelist[:]
-        cmd += prelinker.get_prelink_args(prelink_name, obj_list)
+        obj_list, args = prelinker.get_prelink_args(prelink_name, obj_list)
+        cmd += args
+        if prelinker.get_prelink_append_compile_args():
+            compile_args = self._generate_single_compile_base_args(target, prelinker)
+            compile_args += self._generate_single_compile_target_args(target, prelinker)
+            compile_args = compile_args.compiler.compiler_args(compile_args)
+            cmd += compile_args.to_native()
 
         cmd = self.replace_paths(target, cmd)
         elem.add_item('COMMAND', cmd)
         elem.add_item('description', f'Prelinking {prelink_name}')
         self.add_build(elem)
-        return [prelink_name]
-
-    def generate_mil_link(self, target: build.StaticLibrary, obj_list: T.List[str]) -> T.List[str]:
-        assert isinstance(target, build.StaticLibrary)
-
-        mil_linked_name = os.path.join(self.get_target_private_dir(target), target.name + '-mil_link.o')
-        mil_link_list = []
-        obj_file_list = []
-        for obj in obj_list:
-            if obj.endswith('.mil'):
-                mil_link_list.append(obj)
-            else:
-                obj_file_list.append(obj)
-        obj_file_list.append(mil_linked_name)
-        compiler = get_compiler_for_source(target.compilers.values(), mil_link_list[0][:-3] + '.c')
-        commands = self._generate_single_compile_base_args(target, compiler)
-        commands += self._generate_single_compile_target_args(target, compiler)
-        commands = commands.compiler.compiler_args(commands)
-
-        elem = NinjaBuildElement(self.all_outputs, [mil_linked_name], self.get_compiler_rule_name('tasking_mil_link', compiler.for_machine), mil_link_list)
-        elem.add_item('ARGS', commands)
-        self.add_build(elem)
-
-        return obj_file_list
+        return obj_list
 
     def generate_link(self, target: build.BuildTarget, outname, obj_list, linker: T.Union['Compiler', 'StaticLinker'], extra_args=None, stdlib_args=None):
         extra_args = extra_args if extra_args is not None else []
@@ -3535,9 +3506,6 @@ def generate_link(self, target: build.BuildTarget, outname, obj_list, linker: T.
                                                      linker,
                                                      isinstance(target, build.SharedModule),
                                                      self.environment.get_build_dir())
-        # Add --mil-link if the option is enabled
-        if isinstance(target, build.Executable) and 'c' in target.compilers and OptionKey('b_tasking_mil_link') in target.get_options():
-            commands += target.compilers['c'].get_tasking_mil_link_args(target.get_option(OptionKey('b_tasking_mil_link')))
         # Add -nostdlib if needed; can't be overridden
         commands += self.get_no_stdlib_link_args(target, linker)
         # Add things like /NOLOGO; usually can't be overridden
@@ -3647,6 +3615,9 @@ def generate_link(self, target: build.BuildTarget, outname, obj_list, linker: T.
                             for t in target.link_depends])
         elem = NinjaBuildElement(self.all_outputs, outname, linker_rule, obj_list, implicit_outs=implicit_outs)
         elem.add_dep(dep_targets + custom_target_libraries)
+        if linker.get_id() == 'tasking':
+            if len([x for x in dep_targets + custom_target_libraries if x.endswith('.ma')]) > 0 and not target.get_option(OptionKey('b_lto')):
+                raise MesonException(f'Tried to link the target named \'{target.name}\' with a MIL archive without LTO enabled! This causes the compiler to ignore the archive.')
 
         # Compiler args must be included in TI C28x linker commands.
         if linker.get_id() in {'c2000', 'c6000', 'ti'}:

mesonbuild/backend/vs2010backend.py

@@ -1725,7 +1725,7 @@ def path_normalize_add(path, lis):
                         self.add_preprocessor_defines(lang, inc_cl, file_defines)
                         self.add_include_dirs(lang, inc_cl, file_inc_dirs)
                         ET.SubElement(inc_cl, 'ObjectFileName').text = "$(IntDir)" + \
-                            self.object_filename_from_source(target, s)
+                            self.object_filename_from_source(target, compiler, s)
             for s in gen_src:
                 if path_normalize_add(s, previous_sources):
                     inc_cl = ET.SubElement(inc_src, 'CLCompile', Include=s)
@@ -1739,7 +1739,7 @@ def path_normalize_add(path, lis):
                         self.add_include_dirs(lang, inc_cl, file_inc_dirs)
                         s = File.from_built_file(target.get_subdir(), s)
                         ET.SubElement(inc_cl, 'ObjectFileName').text = "$(IntDir)" + \
-                            self.object_filename_from_source(target, s)
+                            self.object_filename_from_source(target, compiler, s)
             for lang, headers in pch_sources.items():
                 impl = headers[1]
                 if impl and path_normalize_add(impl, previous_sources):

mesonbuild/build.py

@@ -2018,7 +2018,7 @@ def post_init(self) -> None:
             elif ('c' in self.compilers and self.compilers['c'].get_id() in {'mwccarm', 'mwcceppc'} or
                   'cpp' in self.compilers and self.compilers['cpp'].get_id() in {'mwccarm', 'mwcceppc'}):
                 self.suffix = 'nef'
-            elif ('c' in self.compilers and self.compilers['c'].get_id() in {'cctc', 'ccarm', 'cc51', 'ccmcs', 'ccpcp'}):
+            elif ('c' in self.compilers and self.compilers['c'].get_id() == 'tasking'):
                 self.suffix = 'elf'
             else:
                 self.suffix = machine.get_exe_suffix()
@@ -2175,7 +2175,10 @@ def post_init(self) -> None:
                 elif self.rust_crate_type == 'staticlib':
                     self.suffix = 'a'
             else:
-                self.suffix = 'a'
+                if 'c' in self.compilers and self.compilers['c'].get_id() == 'tasking':
+                    self.suffix = 'ma' if self.options.get_value('b_lto') and not self.prelink else 'a'
+                else:
+                    self.suffix = 'a'
         self.filename = self.prefix + self.name + '.' + self.suffix
         self.outputs[0] = self.filename
 

mesonbuild/compilers/c.py

@@ -832,26 +832,13 @@ def get_option_compile_args(self, options: 'KeyedOptionDictType') -> T.List[str]
             args.append('-lang ' + std)
         return args
 
-class _TaskingCCompiler(TaskingCompiler, CCompiler):
+class TaskingCCompiler(TaskingCompiler, CCompiler):
+    id = 'tasking'
+
     def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str, for_machine: MachineChoice,
                  is_cross: bool, info: 'MachineInfo',
                  linker: T.Optional['DynamicLinker'] = None,
                  full_version: T.Optional[str] = None):
         CCompiler.__init__(self, ccache, exelist, version, for_machine, is_cross,
                            info, linker=linker, full_version=full_version)
         TaskingCompiler.__init__(self)
-
-class TaskingTricoreCCompiler(_TaskingCCompiler):
-    id = 'cctc'
-
-class TaskingArmCCompiler(_TaskingCCompiler):
-    id = 'ccarm'
-
-class Tasking8051CCompiler(_TaskingCCompiler):
-    id = 'cc51'
-
-class TaskingMCSCCompiler(_TaskingCCompiler):
-    id = 'ccmcs'
-
-class TaskingPCPCCompiler(_TaskingCCompiler):
-    id = 'ccpcp'

mesonbuild/compilers/compilers.py

@@ -251,7 +251,6 @@ def init_option(self, name: OptionKey) -> options._U:
     OptionKey('b_bitcode'): BaseOption(options.UserBooleanOption, 'Generate and embed bitcode (only macOS/iOS/tvOS)', False),
     OptionKey('b_vscrt'): BaseOption(options.UserComboOption, 'VS run-time library type to use.', 'from_buildtype',
                                      choices=MSCRT_VALS + ['from_buildtype', 'static_from_buildtype']),
-    OptionKey('b_tasking_mil_link'): BaseOption(options.UserBooleanOption, 'Use TASKING compiler families MIL linking feature', False),
 }
 
 base_options = {key: base_opt.init_option(key) for key, base_opt in BASE_OPTIONS.items()}
@@ -433,8 +432,8 @@ class CompileResult(HoldableObject):
     output_name: T.Optional[str] = field(default=None, init=False)
     cached: bool = field(default=False, init=False)
 
-
 class Compiler(HoldableObject, metaclass=abc.ABCMeta):
+
     # Libraries to ignore in find_library() since they are provided by the
     # compiler or the C library. Currently only used for MSVC.
     ignore_libs: T.List[str] = []
@@ -1328,9 +1327,13 @@ def get_feature_args(self, kwargs: DFeatures, build_to_src: str) -> T.List[str]:
         # TODO: using a TypeDict here would improve this
         raise EnvironmentException(f'{self.id} does not implement get_feature_args')
 
-    def get_prelink_args(self, prelink_name: str, obj_list: T.List[str]) -> T.List[str]:
+    def get_prelink_args(self, prelink_name: str, obj_list: T.List[str]) -> T.Tuple[T.List[str], T.List[str]]:
         raise EnvironmentException(f'{self.id} does not know how to do prelinking.')
 
+    def get_prelink_append_compile_args(self) -> bool:
+        """Controls whether compile args have to be used for prelinking or not"""
+        return False
+
     def rsp_file_syntax(self) -> 'RSPFileSyntax':
         """The format of the RSP file that this compiler supports.
 
@@ -1354,13 +1357,6 @@ def get_preprocessor(self) -> Compiler:
     def form_compileropt_key(self, basename: str) -> OptionKey:
         return OptionKey(f'{self.language}_{basename}', machine=self.for_machine)
 
-    def get_tasking_mil_link_args(self, option_enabled: bool) -> T.List[str]:
-        """
-        Argument for enabling TASKING's MIL link feature,
-        for most compilers, this will return nothing.
-        """
-        return []
-
 def get_global_options(lang: str,
                        comp: T.Type[Compiler],
                        for_machine: MachineChoice,