Merge pull request #2957 from jepler/support-matrix-invoke-make

shared_bindings_matrix: Work from parsed 'make' output

docs/shared_bindings_matrix.py

@@ -24,49 +24,11 @@
 import json
 import os
 import re
+import subprocess
+import sys
 
 
-SUPPORTED_PORTS = ["atmel-samd", "nrf", "stm", "mimxrt10xx"]
+SUPPORTED_PORTS = ['atmel-samd', 'esp32s2', 'litex', 'mimxrt10xx', 'nrf', 'stm']
-
-
-def parse_port_config(contents, chip_keyword=None):
-    """ Compile a dictionary of port-wide module configs, which may
-        be categorized by chipset.
-    """
-    chip_fam = "all"
-    ifeq_found = False
-    port_config_results = {"all": []}
-
-    chip_pattern = ""
-    if chip_keyword:
-        chip_pattern = (
-            re.compile("(?<=ifeq\s\(\$\({}\)\,)(\w+)".format(chip_keyword))
-        )
-
-    for line in contents:
-        if chip_keyword:
-            if not ifeq_found:
-                check_ifeq = chip_pattern.search(line)
-                if check_ifeq:
-                    ifeq_found = True
-                    chip_fam = check_ifeq.group(1)
-                    #print("found chip:", chip_fam)
-                else:
-                    ifeq_found = False
-                    chip_fam = "all"
-            else:
-                if "endif" in line:
-                    ifeq_found = False
-                    chip_fam = "all"
-
-        if "CIRCUITPY_" in line:
-            if chip_fam in port_config_results:
-                port_config_results[chip_fam].append(line.rstrip("\n"))
-            else:
-                port_config_results[chip_fam] = [line.rstrip("\n")]
-
-    #print(port_config_results)
-    return port_config_results
 
 def get_shared_bindings():
     """ Get a list of modules in shared-bindings based on folder names
@@ -117,149 +79,64 @@ def build_module_map():
             "excluded": {}
         }
 
-    #print(base)
     return base
 
+def get_settings_from_makefile(port_dir, board_name):
+    """ Invoke make in a mode which prints the database, then parse it for
+        settings.
 
-def get_excluded_boards(base):
+        This means that the effect of all Makefile directives is taken
-    """ Cycles through each board's `mpconfigboard.mk` file to determine
+        into account, without having to re-encode the logic that sets them
-        if each module is included or not. Boards are selected by existence
+        in this script, something that has proved error-prone
-        in a port listed in `SUPPORTED_PORTS` (e.g. `/port/nrf/feather_52840`)
-
-        Boards are further categorized by their respective chipset (SAMD21,
-        SAMD51, nRF52840, etc.)
     """
-    modules = list(base.keys())
+    contents = subprocess.run(
+            ["make", "-C", port_dir, f"BOARD={board_name}", "-qp", "print-CC"],
+            encoding="utf-8",
+            errors="replace",
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE
+        )
+    # Make signals errors with exit status 2; 0 and 1 are "non-error" statuses
+    if contents.returncode not in (0, 1):
+        error_msg = (
+            f"Invoking '{' '.join(contents.args)}' exited with "
+            f"{contents.returncode}: {contents.stderr}"
+        )
+        raise RuntimeError(error_msg)
 
-    re_board_chip = None
+    settings = {}
-    chip_keyword = None
+    for line in contents.stdout.split('\n'):
-    for port in SUPPORTED_PORTS:
+        m = re.match(r'^([A-Z][A-Z0-9_]*) = (.*)$', line)
-        # each port appears to use its own define for the chipset
+        if m:
-        if port in ["atmel-samd"]:
+            settings[m.group(1)] = m.group(2)
-            re_board_chip = re.compile("CHIP_FAMILY\s=\s(\w+)")
-            chip_keyword = "CHIP_FAMILY"
-        elif port in ["nrf"]:
-            re_board_chip = re.compile(r"MCU_VARIANT\s=\s(\w+)")
-        elif port in ["stm"]:
-            re_board_chip = re.compile(r"MCU_SERIES\s*=\s*(\w+)")
-            chip_keyword = "MCU_SERIES"
 
-        port_dir = "ports/{}".format(port)
+    return settings
 
-        port_config_contents = ""
+def lookup_setting(settings, key, default=''):
-        with open(os.path.join(port_dir, "mpconfigport.mk")) as port_config:
+    while True:
-            port_config_contents = port_config.readlines()
+        value = settings.get(key, default)
-        port_config = parse_port_config(port_config_contents, chip_keyword)
+        if not value.startswith('$'):
-
+            break
-        for entry in os.scandir(os.path.join(port_dir, "boards")):
+        key = value[2:-1]
-            if not entry.is_dir():
+    return value
-                continue
-
-            contents = ""
-            board_dir = os.path.join(entry.path, "mpconfigboard.mk")
-            with open(board_dir) as board:
-                contents = board.read()
-
-            board_chip = re_board_chip.search(contents)
-            if not board_chip:
-                board_chip = "Unknown Chip"
-            else:
-                #print(entry.name, board_chip.group(1))
-                board_chip = board_chip.group(1)
-
-            # add port_config results to contents
-            contents += "\n" + "\n".join(port_config["all"])
-            if board_chip in port_config:
-                contents += "\n" + "\n".join(port_config[board_chip])
-
-            check_dependent_modules = dict()
-            for module in modules:
-                board_is_excluded = False
-                # check if board turns off `FULL_BUILD`. if yes, and current
-                # module is marked as `FULL_BUILD`, board is excluded
-                small_build = re.search("CIRCUITPY_FULL_BUILD = 0", contents)
-                if small_build and base[module]["full_build"] == "1":
-                    board_is_excluded = True
-
-                # check if module is specifically disabled for this board
-                re_pattern = r"CIRCUITPY_{}\s=\s(\w)".format(module.upper())
-                find_module = re.search(re_pattern, contents)
-                if not find_module:
-                    if base[module]["default_value"].isdigit():
-                        # check if default inclusion is off ('0'). if the board doesn't
-                        # have it explicitly enabled, its excluded.
-                        if base[module]["default_value"] == "0":
-                            board_is_excluded = True
-                    else:
-                        # this module is dependent on another module. add it
-                        # to the list to check after processing all other modules.
-                        # only need to check exclusion if it isn't already excluded.
-                        if (not board_is_excluded and
-                            base[module]["default_value"] not in [
-                                "None",
-                                "CIRCUITPY_DEFAULT_BUILD"
-                            ]):
-                                check_dependent_modules[module] = base[module]["default_value"]
-                else:
-                    board_is_excluded = find_module.group(1) == "0"
-
-                if board_is_excluded:
-                    if board_chip in base[module]["excluded"]:
-                        base[module]["excluded"][board_chip].append(entry.name)
-                    else:
-                        base[module]["excluded"][board_chip] = [entry.name]
-
-            for module in check_dependent_modules:
-                depend_results = set()
-
-                parents = check_dependent_modules[module].split("CIRCUITPY_")
-                parents = [item.strip(", ").lower() for item in parents if item]
-
-                for parent in parents:
-                    if parent in base:
-                        if (board_chip in base[parent]["excluded"] and
-                            entry.name in base[parent]["excluded"][board_chip]):
-                                depend_results.add(False)
-                        else:
-                            depend_results.add(True)
-
-                # only exclude the module if there were zero parents enabled
-                # as determined by the 'depend_results' set.
-                if not any(depend_results):
-                    if board_chip in base[module]["excluded"]:
-                        base[module]["excluded"][board_chip].append(entry.name)
-                    else:
-                        base[module]["excluded"][board_chip] = [entry.name]
-
-    #print(json.dumps(base, indent=2))
-    return base
-
-
-def support_matrix_excluded_boards():
-    """ Compiles a list of available modules, and which board definitions
-        do not include them.
-    """
-    base = build_module_map()
-
-    return get_excluded_boards(base)
 
 def support_matrix_by_board():
     """ Compiles a list of the available core modules available for each
         board.
     """
     base = build_module_map()
-    base_with_exclusions = get_excluded_boards(base)
 
     boards = dict()
     for port in SUPPORTED_PORTS:
+
         port_dir = "ports/{}/boards".format(port)
         for entry in os.scandir(port_dir):
             if not entry.is_dir():
                 continue
             board_modules = []
 
-            board_name = entry.name
+            settings = get_settings_from_makefile(f'ports/{port}', entry.name)
-            board_contents = ""
+
             with open(os.path.join(entry.path, "mpconfigboard.h")) as get_name:
                 board_contents = get_name.read()
             board_name_re = re.search("(?<=MICROPY_HW_BOARD_NAME)\s+(.+)",
@@ -267,18 +144,15 @@ def support_matrix_by_board():
             if board_name_re:
                 board_name = board_name_re.group(1).strip('"')
 
-            for module in base_with_exclusions.keys():
+            board_modules = []
-                #print(module)
+            for module in base:
-                board_has_module = True
+                key = f'CIRCUITPY_{module.upper()}'
-                if base_with_exclusions[module]["excluded"]:
+                if int(lookup_setting(settings, key, '0')):
-                    for port in base_with_exclusions[module]["excluded"].values():
+                    board_modules.append(base[module]['name'])
-                        #print(port)
-                        if entry.name in port:
-                            board_has_module = False
-
-                if board_has_module:
-                    board_modules.append(base_with_exclusions[module]["name"])
             boards[board_name] = sorted(board_modules)
 
     #print(json.dumps(boards, indent=2))
     return boards
+
+if __name__ == '__main__':
+    print(json.dumps(support_matrix_by_board(), indent=2))