Support multi group version match, fix llvm-version string (mlcommons#717)

Author: amd-arsuresh

.github/workflows/test-mlperf-inference-abtf-poc.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, ubuntu-latest, macos-latest, macos-13, windows-latest]
+        os: [ubuntu-24.04, ubuntu-latest, macos-latest, macos-15, windows-latest]
         python-version: [ "3.8", "3.12" ]
         backend: [ "pytorch" ]
         implementation: [ "python" ]

automation/script/module.py

@@ -100,7 +100,7 @@ def __init__(self, action_object, automation_file):
                                              'verify_ssl': {'desc': 'Verify SSL', 'default': False}
                                              }
 
-    ############################################################
+    #################################################################
 
     def run(self, i):
         """
@@ -4501,6 +4501,11 @@ def parse_version(self, i):
 
         if r['match'].lastindex and r['match'].lastindex >= group_number:
             version = r['match'].group(group_number)
+            if i.get(
+                    'group_number_extra') and r['match'].lastindex >= i['group_number_extra']:
+                join_string = i.get('group_join_string', '-')
+                group_number_extra = i['group_number_extra']
+                version += f"{join_string}{r['match'].group(group_number_extra)}"
         else:
             return {'return': 1, 'error': 'Invalid version detection group number. Version was not detected. Last index of match = {}. Given group number = {}'.format(
                 r['match'].lastindex, group_number)}

script/get-llvm/customize.py

@@ -48,8 +48,9 @@ def preprocess(i):
 
 def detect_version(i):
 
-    r = i['automation'].parse_version({'match_text': r'clang version\s+([\w.]+(?:.*?\s([0-9a-f]{7,40}))?)',
+    r = i['automation'].parse_version({'match_text': r'clang version\s+([\w.]+)(?:.*?\s([0-9a-f]{8})[0-9a-f]{0,32})?',
                                        'group_number': 1,
+                                       'group_number_extra': 2,
                                        'env_key': 'MLC_LLVM_CLANG_VERSION',
                                        'which_env': i['env']})
     if r['return'] > 0: